2012-07-14 23:54:20 +00:00
|
|
|
--- a/include/configs/dockstar.h
|
|
|
|
|
+++ b/include/configs/dockstar.h
|
2018-03-13 16:25:20 +00:00
|
|
|
@@ -18,6 +18,7 @@
|
|
|
|
|
#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */
|
2017-03-15 06:37:48 +00:00
|
|
|
#define CONFIG_KW88F6281 1 /* SOC Name */
|
|
|
|
|
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
|
2014-02-15 23:53:07 +00:00
|
|
|
+#define CONFIG_SYS_MVFS
|
2018-06-18 17:49:16 +00:00
|
|
|
|
2014-02-15 23:53:07 +00:00
|
|
|
/*
|
2017-10-11 17:19:06 +00:00
|
|
|
* mv-common.h should be defined after CMD configs since it used them
|
2018-03-13 16:25:20 +00:00
|
|
|
@@ -36,27 +37,22 @@
|
2016-10-26 09:14:47 +00:00
|
|
|
* it has to be rounded to sector size
|
2014-02-15 23:53:07 +00:00
|
|
|
*/
|
2016-10-26 09:14:47 +00:00
|
|
|
#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 */
|
2018-06-18 17:49:16 +00:00
|
|
|
|
2014-02-15 23:53:07 +00:00
|
|
|
/*
|
2012-07-14 23:54:20 +00:00
|
|
|
* Default environment variables
|
|
|
|
|
*/
|
|
|
|
|
#define CONFIG_BOOTCOMMAND \
|
2014-02-15 23:53:07 +00:00
|
|
|
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
|
2012-07-14 23:54:20 +00:00
|
|
|
- "ubi part root; " \
|
2014-02-15 23:53:07 +00:00
|
|
|
- "ubifsmount ubi:root; " \
|
2012-07-14 23:54:20 +00:00
|
|
|
- "ubifsload 0x800000 ${kernel}; " \
|
|
|
|
|
- "ubifsload 0x1100000 ${initrd}; " \
|
|
|
|
|
- "bootm 0x800000 0x1100000"
|
2016-10-26 09:14:47 +00:00
|
|
|
+ "ubi part ubi; " \
|
|
|
|
|
+ "ubi read 0x800000 kernel; " \
|
2016-10-25 07:57:25 +00:00
|
|
|
+ "bootm 0x800000"
|
2018-06-18 17:49:16 +00:00
|
|
|
|
2012-07-14 23:54:20 +00:00
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
|
|
|
- "console=console=ttyS0,115200\0" \
|
|
|
|
|
- "mtdids=nand0=orion_nand\0" \
|
2018-03-13 16:25:20 +00:00
|
|
|
- "mtdparts="CONFIG_MTDPARTS_DEFAULT \
|
2012-07-14 23:54:20 +00:00
|
|
|
- "kernel=/boot/uImage\0" \
|
|
|
|
|
- "initrd=/boot/uInitrd\0" \
|
|
|
|
|
- "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
|
2014-02-15 23:53:07 +00:00
|
|
|
+ "console=console=ttyS0,115200\0" \
|
|
|
|
|
+ "mtdids=nand0=orion_nand\0" \
|
uboot-kirkwood: fix malformed boot configuration
With current uboot default configuration the bootloader will
fail to start the OpenWrt firmware with the following error:
-----
unexpected character 'b' at the end of partition
Error initializing mtdparts!
incorrect device type in ubi
Partition ubi not found!
Error, no UBI device/partition selected!
Wrong Image Format for bootm command
Error occured, error code = 112
-----
If the uboot configuration is examined with printenv
I can see that mdtparts line (on a nsa310) is wrong:
-----
mtdparts=mtdparts=orion_nand:0x0c0000(uboot),
0x80000(uboot_env),0x7ec0000(ubi)bootargs_root=
----
The "bootargs_root=" that was appended to it should not be there.
Fix the issue by adding a \0 line terminator at the end of affected lines,
mimicking what is also done by uboot upstream.
This issue was detected and confirmed on a nsa310, nsa325 and
a pogoplug v4, but it's not hardware-specific, so apply the same fix
to other devices as well.
Note that the issue is with the uboot's integrated boot configuration,
which is not used unless the uboot configuration in flash is unavailable
(erased or corrupted), which happens only on first time installation,
or if the user deletes the uboot configuration when upgrading uboot.
People just upgrading from an older uboot without erasing their previous
uboot configuration stored in flash would not have noticed this issue.
Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2018-06-26 19:48:09 +00:00
|
|
|
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
|
2016-03-14 17:06:11 +00:00
|
|
|
+ "bootargs_root=\0"
|
2018-06-18 17:49:16 +00:00
|
|
|
|
2012-07-14 23:54:20 +00:00
|
|
|
/*
|
2016-10-26 09:14:47 +00:00
|
|
|
* Ethernet Driver configuration
|
2018-03-13 16:25:20 +00:00
|
|
|
--- a/configs/dockstar_defconfig
|
|
|
|
|
+++ b/configs/dockstar_defconfig
|
|
|
|
|
@@ -16,7 +16,7 @@ CONFIG_CMD_PING=y
|
|
|
|
|
CONFIG_CMD_EXT2=y
|
|
|
|
|
CONFIG_CMD_FAT=y
|
|
|
|
|
CONFIG_CMD_JFFS2=y
|
|
|
|
|
-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),-(root)"
|
|
|
|
|
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
|
|
|
|
|
CONFIG_CMD_UBI=y
|
|
|
|
|
CONFIG_ISO_PARTITION=y
|
|
|
|
|
CONFIG_ENV_IS_IN_NAND=y
|