ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-22 06:57:57 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
d42c9ce326
openwrt/package/boot/uboot-kirkwood/patches/150-goflexhome.patch

36 lines
1.1 KiB
Diff
Raw Normal View History

uboot-kirkwood: bump to upstream 2016.09.01 Bump U-Boot for Kirkwood to upstream 2016.09.01. Local patches cleaned up and reworked. Signed-off-by: Paul Wassi <p.wassi@gmx.at>
2016-10-26 09:14:47 +00:00
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
uboot-kirkwood: update to 2018.03 U-Boot now requires GCC > 5 Catch up with upstream and move some configuration options from the header files to the corresponding defconfig files. Also move some options of patch 010 affecting the whole platform to 010's device only. Signed-off-by: Paul Wassi <p.wassi@gmx.at>
2018-03-13 16:25:20 +00:00
@@ -69,17 +69,15 @@
uboot-kirkwood/goflexhome: update bootargs to use new ubi style Since switching to new ubi(kernel,squashfs,ubifs) layout, the kernel lies in a ubi volume. Dropping the mtd parts because the mtd layout is saved in the device-tree, which is appended to the zImage. Signed-off-by: Alexander Couzens <lynxis@fe80.eu> SVN-Revision: 49016
2016-03-14 17:06:16 +00:00
*/
#define CONFIG_BOOTCOMMAND \
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
- "ubi part root; " \
- "ubifsmount ubi:root; " \
- "ubifsload 0x800000 ${kernel}; " \
uboot-kirkwood: bump to upstream 2016.09.01 Bump U-Boot for Kirkwood to upstream 2016.09.01. Local patches cleaned up and reworked. Signed-off-by: Paul Wassi <p.wassi@gmx.at>
2016-10-26 09:14:47 +00:00
+ "ubi part ubi; " \
+ "ubi read 0x800000 kernel; " \
uboot-kirkwood: update to 2017.09 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>
2017-10-11 17:19:06 +00:00
"bootm 0x800000"
uboot-kirkwood: fix whitespaces remove whitespaces from the patches Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2018-06-18 17:49:16 +00:00
uboot-kirkwood/goflexhome: update bootargs to use new ubi style Since switching to new ubi(kernel,squashfs,ubifs) layout, the kernel lies in a ubi volume. Dropping the mtd parts because the mtd layout is saved in the device-tree, which is appended to the zImage. Signed-off-by: Alexander Couzens <lynxis@fe80.eu> SVN-Revision: 49016
2016-03-14 17:06:16 +00:00
#define CONFIG_EXTRA_ENV_SETTINGS \
"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 \
uboot-kirkwood/goflexhome: update bootargs to use new ubi style Since switching to new ubi(kernel,squashfs,ubifs) layout, the kernel lies in a ubi volume. Dropping the mtd parts because the mtd layout is saved in the device-tree, which is appended to the zImage. Signed-off-by: Alexander Couzens <lynxis@fe80.eu> SVN-Revision: 49016
2016-03-14 17:06:16 +00:00
- "kernel=/boot/uImage\0" \
- "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\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" \
uboot-kirkwood/goflexhome: update bootargs to use new ubi style Since switching to new ubi(kernel,squashfs,ubifs) layout, the kernel lies in a ubi volume. Dropping the mtd parts because the mtd layout is saved in the device-tree, which is appended to the zImage. Signed-off-by: Alexander Couzens <lynxis@fe80.eu> SVN-Revision: 49016
2016-03-14 17:06:16 +00:00
+ "bootargs_root=\0"
uboot-kirkwood: fix whitespaces remove whitespaces from the patches Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2018-06-18 17:49:16 +00:00
uboot-kirkwood/goflexhome: update bootargs to use new ubi style Since switching to new ubi(kernel,squashfs,ubifs) layout, the kernel lies in a ubi volume. Dropping the mtd parts because the mtd layout is saved in the device-tree, which is appended to the zImage. Signed-off-by: Alexander Couzens <lynxis@fe80.eu> SVN-Revision: 49016
2016-03-14 17:06:16 +00:00
/*
* Ethernet Driver configuration
uboot-kirkwood: update to 2018.03 U-Boot now requires GCC > 5 Catch up with upstream and move some configuration options from the header files to the corresponding defconfig files. Also move some options of patch 010 affecting the whole platform to 010's device only. Signed-off-by: Paul Wassi <p.wassi@gmx.at>
2018-03-13 16:25:20 +00:00
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -21,7 +21,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y
CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),255m(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y
Reference in New Issue Copy Permalink