diff options
author | Luka Perkov <luka@openwrt.org> | 2014-02-15 23:53:07 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-02-15 23:53:07 +0000 |
commit | 8cc29e4be3b5892308d39fbd14cf789f12836671 (patch) | |
tree | 77e9e427768ed68201c2ae322a906c729b3cccda /package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-use-device-tree-and-update-config.patch | |
parent | bf883b3ca2e1a46e6c66b7e24907fc5d8c0e4238 (diff) | |
download | upstream-8cc29e4be3b5892308d39fbd14cf789f12836671.tar.gz upstream-8cc29e4be3b5892308d39fbd14cf789f12836671.tar.bz2 upstream-8cc29e4be3b5892308d39fbd14cf789f12836671.zip |
[package] uboot-kirkwood: update to 2013.10
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39590 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-use-device-tree-and-update-config.patch')
-rw-r--r-- | package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-use-device-tree-and-update-config.patch | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-use-device-tree-and-update-config.patch b/package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-use-device-tree-and-update-config.patch new file mode 100644 index 0000000000..de8023689e --- /dev/null +++ b/package/boot/uboot-kirkwood/patches/0001-kirkwood-ib62x0-use-device-tree-and-update-config.patch @@ -0,0 +1,89 @@ +From 2701517a2bbf17544b408738438b0dd17718d4dd Mon Sep 17 00:00:00 2001 +From: Luka Perkov <luka@openwrt.org> +Date: Wed, 14 Nov 2012 23:32:55 +0100 +Subject: [PATCH] kirkwood: ib62x0: use device tree and update config + +Signed-off-by: Luka Perkov <luka@openwrt.org> +CC: Prafulla Wadaskar <prafulla@marvell.com> +--- +v1->v2: + + * keep CONFIG_MACH_TYPE define for backwards compatibility +--- +http://patchwork.ozlabs.org/patch/287388/ +Acked-By: Prafulla Wadaskar <prafulla@marvell.com> +--- + include/configs/ib62x0.h | 38 +++++++++++++++++++++++--------------- + 1 file changed, 23 insertions(+), 15 deletions(-) + +--- a/include/configs/ib62x0.h ++++ b/include/configs/ib62x0.h +@@ -28,6 +28,11 @@ + #define CONFIG_MACH_TYPE MACH_TYPE_NAS6210 + + /* ++ * Enable device tree support ++ */ ++#define CONFIG_OF_LIBFDT ++ ++/* + * Compression configuration + */ + #define CONFIG_BZIP2 +@@ -41,6 +46,7 @@ + #define CONFIG_SYS_MVFS + #include <config_cmd_default.h> + #define CONFIG_CMD_ENV ++#define CONFIG_CMD_BOOTZ + #define CONFIG_CMD_IDE + #define CONFIG_CMD_MII + #define CONFIG_CMD_NAND +@@ -66,7 +72,7 @@ + #define CONFIG_ENV_IS_NOWHERE + #endif + #define CONFIG_ENV_SIZE 0x20000 +-#define CONFIG_ENV_OFFSET 0x80000 ++#define CONFIG_ENV_OFFSET 0xe0000 + + /* + * Default environment variables +@@ -74,24 +80,26 @@ + #define CONFIG_BOOTCOMMAND \ + "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ + "ubi part root; " \ +- "ubifsmount ubi:root; " \ ++ "ubifsmount ubi:rootfs; " \ + "ubifsload 0x800000 ${kernel}; " \ +- "ubifsload 0x1100000 ${initrd}; " \ +- "bootm 0x800000 0x1100000" +- +-#define CONFIG_MTDPARTS \ +- "mtdparts=orion_nand:" \ +- "0x80000@0x0(uboot)," \ +- "0x20000@0x80000(uboot_env)," \ +- "-@0xa0000(root)\0" ++ "ubifsload 0x700000 ${fdt}; " \ ++ "ubifsumount; " \ ++ "fdt addr 0x700000; fdt resize; fdt chosen; " \ ++ "bootz 0x800000 - 0x700000" ++ ++#define CONFIG_MTDPARTS \ ++ "mtdparts=orion_nand:" \ ++ "0xe0000@0x0(uboot)," \ ++ "0x20000@0xe0000(uboot_env)," \ ++ "-@0x100000(root)\0" + +-#define CONFIG_EXTRA_ENV_SETTINGS \ ++#define CONFIG_EXTRA_ENV_SETTINGS \ + "console=console=ttyS0,115200\0" \ + "mtdids=nand0=orion_nand\0" \ + "mtdparts="CONFIG_MTDPARTS \ +- "kernel=/boot/uImage\0" \ +- "initrd=/boot/uInitrd\0" \ +- "bootargs_root=ubi.mtd=2 root=ubi0:root rootfstype=ubifs\0" ++ "kernel=/boot/zImage\0" \ ++ "fdt=/boot/ib62x0.dtb\0" \ ++ "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0" + + /* + * Ethernet driver configuration |