aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-kirkwood/patches/150-goflexhome.patch
diff options
context:
space:
mode:
authorPaul Wassi <p.wassi@gmx.at>2018-03-13 17:25:20 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-03-20 21:45:27 +0100
commitf21cd9640052a733e1759519e3d7ca0f9453653b (patch)
tree5441029a3371926da96ce49ac8a74745f08b139e /package/boot/uboot-kirkwood/patches/150-goflexhome.patch
parent89b8ba96b404d2e412d5573e25348287255671dd (diff)
downloadupstream-f21cd9640052a733e1759519e3d7ca0f9453653b.tar.gz
upstream-f21cd9640052a733e1759519e3d7ca0f9453653b.tar.bz2
upstream-f21cd9640052a733e1759519e3d7ca0f9453653b.zip
uboot-kirkwood: update to 2018.03
U-Boot now requires GCC > 5 Catch up with upstream and move some configuration options from the header files to the corresponding defconfig files. Also move some options of patch 010 affecting the whole platform to 010's device only. Signed-off-by: Paul Wassi <p.wassi@gmx.at>
Diffstat (limited to 'package/boot/uboot-kirkwood/patches/150-goflexhome.patch')
-rw-r--r--package/boot/uboot-kirkwood/patches/150-goflexhome.patch19
1 files changed, 13 insertions, 6 deletions
diff --git a/package/boot/uboot-kirkwood/patches/150-goflexhome.patch b/package/boot/uboot-kirkwood/patches/150-goflexhome.patch
index 88b833072f..186e33a0c4 100644
--- a/package/boot/uboot-kirkwood/patches/150-goflexhome.patch
+++ b/package/boot/uboot-kirkwood/patches/150-goflexhome.patch
@@ -1,6 +1,6 @@
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
-@@ -70,20 +70,18 @@
+@@ -69,17 +69,15 @@
*/
#define CONFIG_BOOTCOMMAND \
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
@@ -11,17 +11,24 @@
+ "ubi read 0x800000 kernel; " \
"bootm 0x800000"
- #define CONFIG_MTDPARTS \
-- "mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)\0"
-+ "mtdparts=orion_nand:1m(uboot),255m(ubi)\0"
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \
"mtdids=nand0=orion_nand\0" \
- "mtdparts="CONFIG_MTDPARTS \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT \
- "kernel=/boot/uImage\0" \
- "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
+ "bootargs_root=\0"
/*
* Ethernet Driver configuration
+--- a/configs/goflexhome_defconfig
++++ b/configs/goflexhome_defconfig
+@@ -21,7 +21,7 @@ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_JFFS2=y
+ CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)"
++CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),255m(ubi)"
+ CONFIG_CMD_UBI=y
+ CONFIG_ISO_PARTITION=y
+ CONFIG_ENV_IS_IN_NAND=y