[package] uboot-kirkwood: update to 2013.10
[openwrt/svn-archive/archive.git] / package / boot / uboot-kirkwood / patches / 120-iconnect.patch
1 --- a/include/configs/iconnect.h
2 +++ b/include/configs/iconnect.h
3 @@ -65,30 +65,35 @@
4 #define CONFIG_ENV_IS_NOWHERE
5 #endif
6 #define CONFIG_ENV_SIZE 0x20000
7 -#define CONFIG_ENV_OFFSET 0x80000
8 +#define CONFIG_ENV_OFFSET 0xe0000
9
10 /*
11 * Default environment variables
12 */
13 #define CONFIG_BOOTCOMMAND \
14 "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
15 - "ubi part rootfs; " \
16 + "ubi part root; " \
17 "ubifsmount ubi:rootfs; " \
18 "ubifsload 0x800000 ${kernel}; " \
19 - "bootm 0x800000"
20 + "ubifsload 0x700000 ${fdt}; " \
21 + "ubifsumount; " \
22 + "fdt addr 0x700000; fdt resize; fdt chosen; " \
23 + "bootz 0x800000 - 0x700000"
24
25 #define CONFIG_MTDPARTS \
26 - "mtdparts=orion_nand:" \
27 - "0x80000@0x0(uboot)," \
28 - "0x20000@0x80000(uboot_env)," \
29 - "-@0xa0000(rootfs)\0"
30 + "mtdparts=orion_nand:" \
31 + "0xe0000@0x0(uboot)," \
32 + "0x20000@0xe0000(uboot_env)," \
33 + "0x100000@0x100000(second_stage_uboot)," \
34 + "-@0x200000(root)\0"
35
36 #define CONFIG_EXTRA_ENV_SETTINGS \
37 "console=console=ttyS0,115200\0" \
38 "mtdids=nand0=orion_nand\0" \
39 "mtdparts="CONFIG_MTDPARTS \
40 - "kernel=/boot/uImage\0" \
41 - "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
42 + "kernel=/boot/zImage\0" \
43 + "fdt=/boot/iconnect.dtb\0" \
44 + "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
45
46 /*
47 * Ethernet driver configuration
48 --- a/boards.cfg
49 +++ b/boards.cfg
50 @@ -164,6 +164,7 @@ Active arm arm926ejs kirkw
51 Active arm arm926ejs kirkwood cloudengines - pogo_e02 - Dave Purdy <david.c.purdy@gmail.com>
52 Active arm arm926ejs kirkwood d-link - dns325 - Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
53 Active arm arm926ejs kirkwood iomega - iconnect - Luka Perkov <luka@openwrt.org>
54 +Active arm arm926ejs kirkwood iomega iconnect iconnect_second_stage iconnect:SECOND_STAGE Luka Perkov <luka@openwrt.org>
55 Active arm arm926ejs kirkwood karo tk71 tk71 - -
56 Active arm arm926ejs kirkwood keymile km_arm km_kirkwood km_kirkwood:KM_KIRKWOOD Valentin Longchamp <valentin.longchamp@keymile.com>
57 Active arm arm926ejs kirkwood keymile km_arm km_kirkwood_pci km_kirkwood:KM_KIRKWOOD_PCI Valentin Longchamp <valentin.longchamp@keymile.com>