102a147c2f1f0543546380cf1e907dcd46735278
[openwrt/openwrt.git] / package / boot / uboot-kirkwood / patches / 120-iconnect.patch
1 --- a/include/configs/iconnect.h
2 +++ b/include/configs/iconnect.h
3 @@ -59,30 +59,29 @@
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 - "ubifsmount ubi:rootfs; " \
17 - "ubifsload 0x800000 ${kernel}; " \
18 + "ubi part ubi; " \
19 + "ubi read 0x800000 kernel; " \
20 "bootm 0x800000"
21
22 #define CONFIG_MTDPARTS \
23 - "mtdparts=orion_nand:" \
24 - "0x80000@0x0(uboot)," \
25 - "0x20000@0x80000(uboot_env)," \
26 - "-@0xa0000(rootfs)\0"
27 + "mtdparts=orion_nand:" \
28 + "0xe0000@0x0(uboot)," \
29 + "0x20000@0xe0000(uboot_env)," \
30 + "0x100000@0x100000(second_stage_uboot)," \
31 + "-@0x200000(ubi)\0"
32
33 #define CONFIG_EXTRA_ENV_SETTINGS \
34 "console=console=ttyS0,115200\0" \
35 "mtdids=nand0=orion_nand\0" \
36 "mtdparts="CONFIG_MTDPARTS \
37 - "kernel=/boot/uImage\0" \
38 - "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
39 + "bootargs_root=\0"
40
41 /*
42 * Ethernet driver configuration
43 --- a/configs/iconnect_defconfig
44 +++ b/configs/iconnect_defconfig
45 @@ -7,6 +7,7 @@ CONFIG_SYS_PROMPT="iconnect => "
46 # CONFIG_CMD_FLASH is not set
47 CONFIG_CMD_USB=y
48 # CONFIG_CMD_SETEXPR is not set
49 +CONFIG_CMD_DHCP=y
50 CONFIG_CMD_MII=y
51 CONFIG_CMD_PING=y
52 CONFIG_CMD_EXT2=y