48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
--- a/include/configs/iconnect.h
|
|
+++ b/include/configs/iconnect.h
|
|
@@ -66,30 +66,35 @@
|
|
#define CONFIG_ENV_IS_NOWHERE
|
|
#endif
|
|
#define CONFIG_ENV_SIZE 0x20000
|
|
-#define CONFIG_ENV_OFFSET 0x80000
|
|
+#define CONFIG_ENV_OFFSET 0xe0000
|
|
|
|
/*
|
|
* Default environment variables
|
|
*/
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
|
|
- "ubi part rootfs; " \
|
|
+ "ubi part root; " \
|
|
"ubifsmount ubi:rootfs; " \
|
|
"ubifsload 0x800000 ${kernel}; " \
|
|
- "bootm 0x800000"
|
|
+ "ubifsload 0x700000 ${fdt}; " \
|
|
+ "ubifsumount; " \
|
|
+ "fdt addr 0x700000; fdt resize; fdt chosen; " \
|
|
+ "bootz 0x800000 - 0x700000"
|
|
|
|
#define CONFIG_MTDPARTS \
|
|
- "mtdparts=orion_nand:" \
|
|
- "0x80000@0x0(uboot)," \
|
|
- "0x20000@0x80000(uboot_env)," \
|
|
- "-@0xa0000(rootfs)\0"
|
|
+ "mtdparts=orion_nand:" \
|
|
+ "0xe0000@0x0(uboot)," \
|
|
+ "0x20000@0xe0000(uboot_env)," \
|
|
+ "0x100000@0x100000(second_stage_uboot)," \
|
|
+ "-@0x200000(root)\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=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
|
|
+ "kernel=/boot/zImage\0" \
|
|
+ "fdt=/boot/iconnect.dtb\0" \
|
|
+ "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
|
|
|
|
/*
|
|
* Ethernet driver configuration
|