uboot-kirkwood: update to 2014.04
[openwrt/staging/wigyori.git] / package / boot / uboot-kirkwood / patches / 130-ib62x0.patch
1 --- a/boards.cfg
2 +++ b/boards.cfg
3 @@ -198,6 +198,7 @@ Active arm arm926ejs kirkw
4 Active arm arm926ejs kirkwood Marvell openrd openrd_client openrd:BOARD_IS_OPENRD_CLIENT -
5 Active arm arm926ejs kirkwood Marvell openrd openrd_ultimate openrd:BOARD_IS_OPENRD_ULTIMATE -
6 Active arm arm926ejs kirkwood raidsonic ib62x0 ib62x0 - Luka Perkov <luka@openwrt.org>
7 +Active arm arm926ejs kirkwood raidsonic ib62x0 ib62x0_second_stage ib62x0:SECOND_STAGE Luka Perkov <luka@openwrt.org>
8 Active arm arm926ejs kirkwood Seagate - dockstar - Eric Cooper <ecc@cmu.edu>
9 Active arm arm926ejs kirkwood Seagate dockstar dockstar_second_stage dockstar:SECOND_STAGE Luka Perkov <luka@openwrt.org>
10 Active arm arm926ejs kirkwood Seagate - goflexhome - Suriyan Ramasami <suriyan.r@gmail.com>
11 --- a/include/configs/ib62x0.h
12 +++ b/include/configs/ib62x0.h
13 @@ -91,7 +91,8 @@
14 "mtdparts=orion_nand:" \
15 "0xe0000@0x0(uboot)," \
16 "0x20000@0xe0000(uboot_env)," \
17 - "-@0x100000(root)\0"
18 + "0x100000@0x100000(second_stage_uboot)," \
19 + "-@0x200000(root)\0"
20
21 #define CONFIG_EXTRA_ENV_SETTINGS \
22 "console=console=ttyS0,115200\0" \
23 @@ -99,7 +100,7 @@
24 "mtdparts="CONFIG_MTDPARTS \
25 "kernel=/boot/zImage\0" \
26 "fdt=/boot/ib62x0.dtb\0" \
27 - "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
28 + "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
29
30 /*
31 * Ethernet driver configuration