c95c3165b9
Bump uboot-kirkwood to upstream release 2017.03 Signed-off-by: Paul Wassi <p.wassi@gmx.at>
55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
--- a/include/configs/dockstar.h
|
|
+++ b/include/configs/dockstar.h
|
|
@@ -19,6 +19,7 @@
|
|
#define CONFIG_KW88F6281 1 /* SOC Name */
|
|
#define CONFIG_MACH_DOCKSTAR /* Machine type */
|
|
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
|
|
+#define CONFIG_SYS_MVFS
|
|
|
|
/*
|
|
* Commands configuration
|
|
@@ -45,29 +46,29 @@
|
|
* it has to be rounded to sector size
|
|
*/
|
|
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
|
|
-#define CONFIG_ENV_ADDR 0x80000
|
|
-#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */
|
|
+#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */
|
|
|
|
/*
|
|
* Default environment variables
|
|
*/
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
|
|
- "ubi part root; " \
|
|
- "ubifsmount ubi:root; " \
|
|
- "ubifsload 0x800000 ${kernel}; " \
|
|
- "ubifsload 0x1100000 ${initrd}; " \
|
|
- "bootm 0x800000 0x1100000"
|
|
-
|
|
-#define CONFIG_MTDPARTS "mtdparts=orion_nand:1m(uboot),-(root)\0"
|
|
+ "ubi part ubi; " \
|
|
+ "ubi read 0x800000 kernel; " \
|
|
+ "bootm 0x800000"
|
|
+
|
|
+#define CONFIG_MTDPARTS \
|
|
+ "mtdparts=orion_nand:" \
|
|
+ "0xe0000@0x0(uboot)," \
|
|
+ "0x20000@0xe0000(uboot_env)," \
|
|
+ "0x100000@0x100000(second_stage_uboot)," \
|
|
+ "-@0x200000(ubi)\0"
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
- "console=console=ttyS0,115200\0" \
|
|
- "mtdids=nand0=orion_nand\0" \
|
|
- "mtdparts="CONFIG_MTDPARTS \
|
|
- "kernel=/boot/uImage\0" \
|
|
- "initrd=/boot/uInitrd\0" \
|
|
- "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
|
|
+ "console=console=ttyS0,115200\0" \
|
|
+ "mtdids=nand0=orion_nand\0" \
|
|
+ "mtdparts="CONFIG_MTDPARTS \
|
|
+ "bootargs_root=\0"
|
|
|
|
/*
|
|
* Ethernet Driver configuration
|