c28e41f0d7
Since switching to new ubi(kernel,squashfs,ubifs) layout, the kernel lies in a ubi volume. Dropping the mtd parts because the mtd layout is saved in the device-tree, which is appended to the zImage. Signed-off-by: Alexander Couzens <lynxis@fe80.eu> SVN-Revision: 49016
30 lines
949 B
Diff
30 lines
949 B
Diff
Index: u-boot-2014.10/include/configs/goflexhome.h
|
|
===================================================================
|
|
--- u-boot-2014.10.orig/include/configs/goflexhome.h
|
|
+++ u-boot-2014.10/include/configs/goflexhome.h
|
|
@@ -96,20 +96,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),-(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
|