mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
777e7c3ff5
Tested on:
* Cloud Engines Pogoplug E02
* RaidSonic ICY BOX IB-NAS62x0
* Iomega Iconnect
Some users are avoiding to replace their bootloader, because of that add
support for second stage u-boot image. Having ubifs capable bootloader is
required in order to boot current OpenWrt trunk.
Sample ib62x0 commands for running second stage bootloader:
tftpboot 0x800000 uboot-kirkwood-ib62x0_second_stage/openwrt-kirkwood-ib62x0_second_stage-u-boot.img
bootm 0x800000
Sample ib62x0 commands for flashing second stage bootloader:
tftpboot 0x800000 uboot-kirkwood-ib62x0_second_stage/openwrt-kirkwood-ib62x0_second_stage-u-boot.img
nand erase 0x100000 0x100000 ; nand write 0x800000 0x100000 0x${filesize}
nand read 0x800000 0x100000 0x100000 ; bootm 0x800000
While at it include parallel build support, use alphabetic order of the boards
and introduce common OpenWrt configuration.
Signed-off-by: Luka Perkov <luka@openwrt.org>
Tested-by (on ib62x0): Luka Perkov <luka@openwrt.org>
Tested-by (on dockstar): Alexander Couzens <lynxis@fe80.eu>
Tested-by (on iconnect): Wojciech Dubowik <wojciech.dubowik@neratec.com>
CC: Felix Kaechele <heffer@fedoraproject.org>
CC: Wojciech Dubowik <wojciech.dubowik@neratec.com>
CC: Alexander Couzens <lynxis@fe80.eu>
CC: Daniel Engberg <daniel.engberg@pyret.net>
CC: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 39590
58 lines
3.4 KiB
Diff
58 lines
3.4 KiB
Diff
--- a/include/configs/iconnect.h
|
|
+++ b/include/configs/iconnect.h
|
|
@@ -65,30 +65,35 @@
|
|
#define CONFIG_ENV_IS_NOWHERE
|
|
#endif
|
|
#define CONFIG_ENV_SIZE 0x20000
|
|
-#define CONFIG_ENV_OFFSET 0x80000
|
|
+#define CONFIG_ENV_OFFSET 0xe0000
|
|
|
|
/*
|
|
* Default environment variables
|
|
*/
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
|
|
- "ubi part rootfs; " \
|
|
+ "ubi part root; " \
|
|
"ubifsmount ubi:rootfs; " \
|
|
"ubifsload 0x800000 ${kernel}; " \
|
|
- "bootm 0x800000"
|
|
+ "ubifsload 0x700000 ${fdt}; " \
|
|
+ "ubifsumount; " \
|
|
+ "fdt addr 0x700000; fdt resize; fdt chosen; " \
|
|
+ "bootz 0x800000 - 0x700000"
|
|
|
|
#define CONFIG_MTDPARTS \
|
|
- "mtdparts=orion_nand:" \
|
|
- "0x80000@0x0(uboot)," \
|
|
- "0x20000@0x80000(uboot_env)," \
|
|
- "-@0xa0000(rootfs)\0"
|
|
+ "mtdparts=orion_nand:" \
|
|
+ "0xe0000@0x0(uboot)," \
|
|
+ "0x20000@0xe0000(uboot_env)," \
|
|
+ "0x100000@0x100000(second_stage_uboot)," \
|
|
+ "-@0x200000(root)\0"
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"console=console=ttyS0,115200\0" \
|
|
"mtdids=nand0=orion_nand\0" \
|
|
"mtdparts="CONFIG_MTDPARTS \
|
|
- "kernel=/boot/uImage\0" \
|
|
- "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
|
|
+ "kernel=/boot/zImage\0" \
|
|
+ "fdt=/boot/iconnect.dtb\0" \
|
|
+ "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
|
|
|
|
/*
|
|
* Ethernet driver configuration
|
|
--- a/boards.cfg
|
|
+++ b/boards.cfg
|
|
@@ -164,6 +164,7 @@ Active arm arm926ejs kirkw
|
|
Active arm arm926ejs kirkwood cloudengines - pogo_e02 - Dave Purdy <david.c.purdy@gmail.com>
|
|
Active arm arm926ejs kirkwood d-link - dns325 - Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
|
|
Active arm arm926ejs kirkwood iomega - iconnect - Luka Perkov <luka@openwrt.org>
|
|
+Active arm arm926ejs kirkwood iomega iconnect iconnect_second_stage iconnect:SECOND_STAGE Luka Perkov <luka@openwrt.org>
|
|
Active arm arm926ejs kirkwood karo tk71 tk71 - -
|
|
Active arm arm926ejs kirkwood keymile km_arm km_kirkwood km_kirkwood:KM_KIRKWOOD Valentin Longchamp <valentin.longchamp@keymile.com>
|
|
Active arm arm926ejs kirkwood keymile km_arm km_kirkwood_pci km_kirkwood:KM_KIRKWOOD_PCI Valentin Longchamp <valentin.longchamp@keymile.com>
|