summaryrefslogtreecommitdiff
path: root/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch')
-rw-r--r--libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch31
1 files changed, 18 insertions, 13 deletions
diff --git a/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
index 5b59f18af..4b93c03e9 100644
--- a/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
+++ b/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
@@ -1,27 +1,29 @@
-diff -Nur u-boot-2016.01.orig/include/config_distro_defaults.h u-boot-2016.01/include/config_distro_defaults.h
---- u-boot-2016.01.orig/include/config_distro_defaults.h 2016-01-12 11:06:54.000000000 -0300
-+++ u-boot-2016.01/include/config_distro_defaults.h 2016-02-26 13:23:28.880315683 -0300
-@@ -67,4 +67,7 @@
+diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
+index 766a212..0df77cd 100644
+--- a/include/config_distro_defaults.h
++++ b/include/config_distro_defaults.h
+@@ -57,4 +57,7 @@
#define CONFIG_SUPPORT_RAW_INITRD
- #define CONFIG_SYS_HUSH_PARSER
+ #define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_CMD_PART
+#define CONFIG_PARTITION_UUIDS
+
#endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */
-diff -Nur u-boot-2016.01.orig/include/configs/sunxi-common.h u-boot-2016.01/include/configs/sunxi-common.h
---- u-boot-2016.01.orig/include/configs/sunxi-common.h 2016-01-12 11:06:54.000000000 -0300
-+++ u-boot-2016.01/include/configs/sunxi-common.h 2016-02-26 14:37:41.077919620 -0300
+diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
+index 94275a7..ed1aac6 100644
+--- a/include/configs/sunxi-common.h
++++ b/include/configs/sunxi-common.h
@@ -173,7 +173,7 @@
#define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_MONITOR_LEN (768 << 10) /* 768 KiB */
-#define CONFIG_IDENT_STRING " Allwinner Technology"
+#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre"
+ #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_ENV_OFFSET (544 << 10) /* (8 + 24 + 512) KiB */
- #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
-@@ -449,6 +449,9 @@
+@@ -467,6 +467,9 @@ extern int soft_i2c_gpio_scl;
#define BOOTENV_DEV_NAME_FEL(devtypeu, devtypel, instance) \
"fel "
@@ -31,7 +33,7 @@ diff -Nur u-boot-2016.01.orig/include/configs/sunxi-common.h u-boot-2016.01/incl
#define BOOT_TARGET_DEVICES(func) \
func(FEL, fel, na) \
BOOT_TARGET_DEVICES_MMC(func) \
-@@ -457,6 +460,7 @@
+@@ -475,6 +478,7 @@ extern int soft_i2c_gpio_scl;
BOOT_TARGET_DEVICES_USB(func) \
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
@@ -39,7 +41,7 @@ diff -Nur u-boot-2016.01.orig/include/configs/sunxi-common.h u-boot-2016.01/incl
#ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT
#define BOOTCMD_SUNXI_COMPAT \
-@@ -474,8 +478,6 @@
+@@ -492,8 +496,6 @@ extern int soft_i2c_gpio_scl;
#define BOOTCMD_SUNXI_COMPAT
#endif
@@ -48,7 +50,7 @@ diff -Nur u-boot-2016.01.orig/include/configs/sunxi-common.h u-boot-2016.01/incl
#ifdef CONFIG_USB_KEYBOARD
#define CONSOLE_STDIN_SETTINGS \
"preboot=usb start\0" \
-@@ -500,13 +502,13 @@
+@@ -518,13 +520,13 @@ extern int soft_i2c_gpio_scl;
CONSOLE_STDOUT_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -64,3 +66,6 @@ diff -Nur u-boot-2016.01.orig/include/configs/sunxi-common.h u-boot-2016.01/incl
#else /* ifndef CONFIG_SPL_BUILD */
#define CONFIG_EXTRA_ENV_SETTINGS
+--
+2.8.3
+