uboot-kirkwood: update to 2018.03
[openwrt/openwrt.git] / package / boot / uboot-kirkwood / patches / 150-goflexhome.patch
1 --- a/include/configs/goflexhome.h
2 +++ b/include/configs/goflexhome.h
3 @@ -69,17 +69,15 @@
4 */
5 #define CONFIG_BOOTCOMMAND \
6 "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
7 - "ubi part root; " \
8 - "ubifsmount ubi:root; " \
9 - "ubifsload 0x800000 ${kernel}; " \
10 + "ubi part ubi; " \
11 + "ubi read 0x800000 kernel; " \
12 "bootm 0x800000"
13
14 #define CONFIG_EXTRA_ENV_SETTINGS \
15 "console=console=ttyS0,115200\0" \
16 "mtdids=nand0=orion_nand\0" \
17 "mtdparts="CONFIG_MTDPARTS_DEFAULT \
18 - "kernel=/boot/uImage\0" \
19 - "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
20 + "bootargs_root=\0"
21
22 /*
23 * Ethernet Driver configuration
24 --- a/configs/goflexhome_defconfig
25 +++ b/configs/goflexhome_defconfig
26 @@ -21,7 +21,7 @@ CONFIG_CMD_EXT4=y
27 CONFIG_CMD_FAT=y
28 CONFIG_CMD_JFFS2=y
29 CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
30 -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)"
31 +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),255m(ubi)"
32 CONFIG_CMD_UBI=y
33 CONFIG_ISO_PARTITION=y
34 CONFIG_ENV_IS_IN_NAND=y