From 3ed9972f17e2e696c3933ec99440d4422f14474b Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Wed, 20 Feb 2019 02:51:40 +0100
Subject: libre: uboot4extlinux-sunxi: update to 2019.01

After reflashing it (in the postinstall) on a lime2
A20 with EMMC, and rebooting, it booted fine.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 .../0001-parabola-arm-modifications.patch          | 29 +++++++---------------
 libre/uboot4extlinux-sunxi/PKGBUILD                | 10 ++++----
 2 files changed, 14 insertions(+), 25 deletions(-)

(limited to 'libre/uboot4extlinux-sunxi')

diff --git a/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
index 17f067484..83743ad5c 100644
--- a/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
+++ b/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
@@ -1,18 +1,8 @@
 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
-index 94275a7..ed1aac6 100644
+index b01d1c3c84..d28019801d 100644
 --- a/include/configs/sunxi-common.h
 +++ b/include/configs/sunxi-common.h
-@@ -467,6 +467,9 @@ extern int soft_i2c_gpio_scl;
- #define BOOTENV_DEV_NAME_FEL(devtypeu, devtypel, instance) \
- 	"fel "
- 
-+/* Enable Extlinux boot support */
-+#define CONFIG_CMD_PXE
-+#define CONFIG_MENU
- #define BOOT_TARGET_DEVICES(func) \
- 	func(FEL, fel, na) \
- 	BOOT_TARGET_DEVICES_MMC(func) \
-@@ -475,6 +478,7 @@ extern int soft_i2c_gpio_scl;
+@@ -416,6 +416,7 @@ extern int soft_i2c_gpio_scl;
  	BOOT_TARGET_DEVICES_USB(func) \
  	func(PXE, pxe, na) \
  	func(DHCP, dhcp, na)
@@ -20,7 +10,7 @@ index 94275a7..ed1aac6 100644
  
  #ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT
  #define BOOTCMD_SUNXI_COMPAT \
-@@ -492,8 +496,6 @@ extern int soft_i2c_gpio_scl;
+@@ -433,8 +434,6 @@ extern int soft_i2c_gpio_scl;
  #define BOOTCMD_SUNXI_COMPAT
  #endif
  
@@ -29,22 +19,21 @@ index 94275a7..ed1aac6 100644
  #ifdef CONFIG_USB_KEYBOARD
  #define CONSOLE_STDIN_SETTINGS \
  	"preboot=usb start\0" \
-@@ -518,13 +520,13 @@ extern int soft_i2c_gpio_scl;
- 	CONSOLE_STDOUT_SETTINGS
+@@ -498,6 +497,7 @@ extern int soft_i2c_gpio_scl;
+ #endif
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
 +	BOOTENV \
  	CONSOLE_ENV_SETTINGS \
  	MEM_LAYOUT_ENV_SETTINGS \
  	DFU_ALT_INFO_RAM \
- 	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
- 	"console=ttyS0,115200\0" \
+@@ -508,8 +508,7 @@ extern int soft_i2c_gpio_scl;
+ 	"uuid_gpt_esp=" UUID_GPT_ESP "\0" \
+ 	"uuid_gpt_system=" UUID_GPT_SYSTEM "\0" \
+ 	"partitions=" PARTS_DEFAULT "\0" \
 -	BOOTCMD_SUNXI_COMPAT \
 -	BOOTENV
 +	BOOTCMD_SUNXI_COMPAT
  
  #else /* ifndef CONFIG_SPL_BUILD */
  #define CONFIG_EXTRA_ENV_SETTINGS
--- 
-2.8.3
-
diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD
index 5252b57b3..16f895f44 100644
--- a/libre/uboot4extlinux-sunxi/PKGBUILD
+++ b/libre/uboot4extlinux-sunxi/PKGBUILD
@@ -25,18 +25,18 @@ pkgname=('uboot4extlinux-a10-olinuxino-lime'
          'uboot4extlinux-orangepi_one'
          'uboot4extlinux-orangepi_pc'
          'uboot4extlinux-orangepi_plus')
-pkgver=2017.01
-pkgrel=1.2
+pkgver=2019.01
+pkgrel=1
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
-makedepends=('bc' 'dtc' 'python2')
+makedepends=('bc' 'dtc' 'python' 'python2' 'swig')
 backup=(boot/extlinux/extlinux.conf)
 source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         '0001-parabola-arm-modifications.patch'
         'extlinux.conf')
-sha256sums=('6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2'
-            'f5613a2136685fd338b6312806c793ca6a97ad5ae39e02950fd997e000919398'
+sha256sums=('50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22'
+            'd8277b055e60da95286264f4affd8a1105ea9fda26442a25ccbc914f354646f6'
             '34550c6d700c6b4713f490d6d1b4e3ceb78a04072786225084fe6d13e232f105')
 
 boards=('A10-OLinuXino-Lime'
-- 
cgit v1.2.3