OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 1... Line 1...
1 --- a/include/configs/ib62x0.h 1 --- a/include/configs/ib62x0.h
2 +++ b/include/configs/ib62x0.h 2 +++ b/include/configs/ib62x0.h
3 @@ -47,21 +47,15 @@ 3 @@ -49,21 +49,15 @@
4 */ 4 */
5 #define CONFIG_BOOTCOMMAND \ 5 #define CONFIG_BOOTCOMMAND \
6 "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ 6 "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
7 - "ubi part root; " \ 7 - "ubi part root; " \
8 - "ubifsmount ubi:rootfs; " \ 8 - "ubifsmount ubi:rootfs; " \
Line 12... Line 12...
12 - "fdt addr 0x700000; fdt resize; fdt chosen; " \ 12 - "fdt addr 0x700000; fdt resize; fdt chosen; " \
13 - "bootz 0x800000 - 0x700000" 13 - "bootz 0x800000 - 0x700000"
14 + "ubi part ubi; " \ 14 + "ubi part ubi; " \
15 + "ubi read 0x800000 kernel; " \ 15 + "ubi read 0x800000 kernel; " \
16 + "bootm 0x800000" 16 + "bootm 0x800000"
17   17
18 #define CONFIG_EXTRA_ENV_SETTINGS \ 18 #define CONFIG_EXTRA_ENV_SETTINGS \
19 "console=console=ttyS0,115200\0" \ 19 "console=console=ttyS0,115200\0" \
20 "mtdids=nand0=orion_nand\0" \ 20 "mtdids=nand0=orion_nand\0" \
21 - "mtdparts="CONFIG_MTDPARTS_DEFAULT \ 21 - "mtdparts="CONFIG_MTDPARTS_DEFAULT \
22 - "kernel=/boot/zImage\0" \ 22 - "kernel=/boot/zImage\0" \
23 - "fdt=/boot/ib62x0.dtb\0" \ 23 - "fdt=/boot/ib62x0.dtb\0" \
24 - "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0" 24 - "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
25 + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \ 25 + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
26 + "bootargs_root=\0" 26 + "bootargs_root=\0"
27   27
28 /* 28 /*
29 * Ethernet driver configuration 29 * Ethernet driver configuration
30 --- a/configs/ib62x0_defconfig 30 --- a/configs/ib62x0_defconfig
31 +++ b/configs/ib62x0_defconfig 31 +++ b/configs/ib62x0_defconfig
32 @@ -21,7 +21,7 @@ CONFIG_CMD_PING=y 32 @@ -19,7 +19,7 @@ CONFIG_CMD_PING=y
-   33 CONFIG_CMD_EXT2=y
33 CONFIG_CMD_FAT=y 34 CONFIG_CMD_FAT=y
34 CONFIG_CMD_JFFS2=y 35 CONFIG_CMD_JFFS2=y
35 CONFIG_CMD_MTDPARTS=y -  
36 -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),-@0x100000(root)" 36 -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),-@0x100000(root)"
37 +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)" 37 +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
38 CONFIG_CMD_UBI=y 38 CONFIG_CMD_UBI=y
39 CONFIG_ISO_PARTITION=y 39 CONFIG_ISO_PARTITION=y
40 CONFIG_OF_CONTROL=y 40 CONFIG_ENV_IS_IN_NAND=y