mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
67da6a7c5e
Upgrade uboot-kirkwood to upstream release 2017.09 Catch up with upstream and move configuration options from simple defines to Kconfig, as otherwise dependencies would not be resolved and code would not compile. Tested-by: Alberto Bursi <alberto.bursi@outlook.it> Signed-off-by: Paul Wassi <p.wassi@gmx.at>
44 lines
1.2 KiB
Diff
44 lines
1.2 KiB
Diff
--- a/include/configs/pogo_e02.h
|
|
+++ b/include/configs/pogo_e02.h
|
|
@@ -44,23 +44,30 @@
|
|
#endif
|
|
|
|
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
|
|
-#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */
|
|
+#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */
|
|
|
|
/*
|
|
* Default environment variables
|
|
*/
|
|
#define CONFIG_BOOTCOMMAND \
|
|
- "setenv bootargs $(bootargs_console); " \
|
|
- "run bootcmd_usb; " \
|
|
- "bootm 0x00800000 0x01100000"
|
|
+ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
|
|
+ "ubi part ubi; " \
|
|
+ "ubifsmount ubi:rootfs; " \
|
|
+ "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 \
|
|
- "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \
|
|
- "32M(rootfs),-(data)\0"\
|
|
- "mtdids=nand0=orion_nand\0"\
|
|
- "bootargs_console=console=ttyS0,115200\0" \
|
|
- "bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \
|
|
- "ext2load usb 0:1 0x01100000 /uInitrd\0"
|
|
+ "console=console=ttyS0,115200\0" \
|
|
+ "mtdids=nand0=orion_nand\0" \
|
|
+ "mtdparts="CONFIG_MTDPARTS \
|
|
+ "bootargs_root=\0"
|
|
|
|
/*
|
|
* Ethernet Driver configuration
|