705240eeb5
Bump U-Boot for Kirkwood to upstream 2016.09.01. Local patches cleaned up and reworked. Signed-off-by: Paul Wassi <p.wassi@gmx.at>
28 lines
794 B
Diff
28 lines
794 B
Diff
--- a/include/configs/goflexhome.h
|
|
+++ b/include/configs/goflexhome.h
|
|
@@ -87,20 +87,18 @@
|
|
*/
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
|
|
- "ubi part root; " \
|
|
- "ubifsmount ubi:root; " \
|
|
- "ubifsload 0x800000 ${kernel}; " \
|
|
- "bootm 0x800000"
|
|
+ "ubi part ubi; " \
|
|
+ "ubi read 0x800000 kernel; " \
|
|
+ "bootz 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 \
|
|
- "kernel=/boot/uImage\0" \
|
|
- "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
|
|
+ "bootargs_root=\0"
|
|
|
|
/*
|
|
* Ethernet Driver configuration
|