KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uboot-kirkwood: fix malformed boot configuration

Browse source 
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>
This commit is contained in:
Alberto Bursi 2018-06-26 21:48:09 +02:00 committed by Mathias Kresin
parent ccd1dc3d20
commit e13d9cd07f
8 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch
View file

@ -627,7 +627,7 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in
+#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CONFIG_EXTRA_ENV_SETTINGS \
+ "console=console=ttyS0,115200\0" \ + "console=console=ttyS0,115200\0" \
+ "mtdids=nand0=orion_nand\0" \ + "mtdids=nand0=orion_nand\0" \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT \ + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
+ "bootargs_root=\0" + "bootargs_root=\0"
+ +
+/* +/*

2
package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch
View file

@ -613,7 +613,7 @@
+#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CONFIG_EXTRA_ENV_SETTINGS \
+ "console=console=ttyS0,115200\0" \ + "console=console=ttyS0,115200\0" \
+ "mtdids=nand0=orion_nand\0" \ + "mtdids=nand0=orion_nand\0" \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT \ + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
+ "bootargs_root=\0" + "bootargs_root=\0"
+ +
+/* +/*

2
package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch
View file

@ -1212,7 +1212,7 @@
+#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CONFIG_EXTRA_ENV_SETTINGS \
+ "console=console=ttyS0,115200\0" \ + "console=console=ttyS0,115200\0" \
+ "mtdids=nand0=orion_nand\0" \ + "mtdids=nand0=orion_nand\0" \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT \ + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
+ "bootargs_root=\0" + "bootargs_root=\0"
+ +
+/* +/*

2
package/boot/uboot-kirkwood/patches/110-dockstar.patch
View file

@ -39,7 +39,7 @@
- "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0" - "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
+ "console=console=ttyS0,115200\0" \ + "console=console=ttyS0,115200\0" \
+ "mtdids=nand0=orion_nand\0" \ + "mtdids=nand0=orion_nand\0" \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT \ + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
+ "bootargs_root=\0" + "bootargs_root=\0"
/* /*

3
package/boot/uboot-kirkwood/patches/120-iconnect.patch
View file

@ -22,9 +22,10 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \ "console=console=ttyS0,115200\0" \
"mtdids=nand0=orion_nand\0" \ "mtdids=nand0=orion_nand\0" \
"mtdparts="CONFIG_MTDPARTS_DEFAULT \ - "mtdparts="CONFIG_MTDPARTS_DEFAULT \
- "kernel=/boot/uImage\0" \ - "kernel=/boot/uImage\0" \
- "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0" - "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
+ "bootargs_root=\0" + "bootargs_root=\0"
/* /*

3
package/boot/uboot-kirkwood/patches/130-ib62x0.patch
View file

@ -18,10 +18,11 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \ "console=console=ttyS0,115200\0" \
"mtdids=nand0=orion_nand\0" \ "mtdids=nand0=orion_nand\0" \
"mtdparts="CONFIG_MTDPARTS_DEFAULT \ - "mtdparts="CONFIG_MTDPARTS_DEFAULT \
- "kernel=/boot/zImage\0" \ - "kernel=/boot/zImage\0" \
- "fdt=/boot/ib62x0.dtb\0" \ - "fdt=/boot/ib62x0.dtb\0" \
- "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0" - "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
+ "bootargs_root=\0" + "bootargs_root=\0"
/* /*

2
package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
View file

@ -29,7 +29,7 @@
- "ext2load usb 0:1 0x01100000 /uInitrd\0" - "ext2load usb 0:1 0x01100000 /uInitrd\0"
+ "console=console=ttyS0,115200\0" \ + "console=console=ttyS0,115200\0" \
+ "mtdids=nand0=orion_nand\0" \ + "mtdids=nand0=orion_nand\0" \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT \ + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
+ "bootargs_root=\0" + "bootargs_root=\0"
/* /*

3
package/boot/uboot-kirkwood/patches/150-goflexhome.patch
View file

@ -14,9 +14,10 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \ "console=console=ttyS0,115200\0" \
"mtdids=nand0=orion_nand\0" \ "mtdids=nand0=orion_nand\0" \
"mtdparts="CONFIG_MTDPARTS_DEFAULT \ - "mtdparts="CONFIG_MTDPARTS_DEFAULT \
- "kernel=/boot/uImage\0" \ - "kernel=/boot/uImage\0" \
- "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0" - "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
+ "bootargs_root=\0" + "bootargs_root=\0"
/* /*