summaryrefslogtreecommitdiff
path: root/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-02-20 02:51:40 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-02-21 00:45:50 +0100
commit3ed9972f17e2e696c3933ec99440d4422f14474b (patch)
tree64e1dd23acd656c901ef10b486b2e56e815761d2 /libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
parentf4928ca91f9c5bb1a166a059da31d34d4d194b8c (diff)
downloadabslibre-3ed9972f17e2e696c3933ec99440d4422f14474b.tar.gz
abslibre-3ed9972f17e2e696c3933ec99440d4422f14474b.tar.bz2
abslibre-3ed9972f17e2e696c3933ec99440d4422f14474b.zip
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>
Diffstat (limited to 'libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch')
-rw-r--r--libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch29
1 files changed, 9 insertions, 20 deletions
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
-