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/goflexhome.h 1 --- a/include/configs/goflexhome.h
2 +++ b/include/configs/goflexhome.h 2 +++ b/include/configs/goflexhome.h
3 @@ -66,17 +66,15 @@ 3 @@ -69,17 +69,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:root; " \ 8 - "ubifsmount ubi:root; " \
9 - "ubifsload 0x800000 ${kernel}; " \ 9 - "ubifsload 0x800000 ${kernel}; " \
10 + "ubi part ubi; " \ 10 + "ubi part ubi; " \
11 + "ubi read 0x800000 kernel; " \ 11 + "ubi read 0x800000 kernel; " \
12 "bootm 0x800000" 12 "bootm 0x800000"
13   13
14 #define CONFIG_EXTRA_ENV_SETTINGS \ 14 #define CONFIG_EXTRA_ENV_SETTINGS \
15 "console=console=ttyS0,115200\0" \ 15 "console=console=ttyS0,115200\0" \
16 "mtdids=nand0=orion_nand\0" \ 16 "mtdids=nand0=orion_nand\0" \
17 - "mtdparts="CONFIG_MTDPARTS_DEFAULT \ 17 - "mtdparts="CONFIG_MTDPARTS_DEFAULT \
18 - "kernel=/boot/uImage\0" \ 18 - "kernel=/boot/uImage\0" \
19 - "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0" 19 - "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
20 + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \ 20 + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
21 + "bootargs_root=\0" 21 + "bootargs_root=\0"
22   22
23 /* 23 /*
24 * Ethernet Driver configuration 24 * Ethernet Driver configuration
25 --- a/configs/goflexhome_defconfig 25 --- a/configs/goflexhome_defconfig
26 +++ b/configs/goflexhome_defconfig 26 +++ b/configs/goflexhome_defconfig
27 @@ -23,7 +23,7 @@ CONFIG_CMD_EXT4=y 27 @@ -21,7 +21,7 @@ CONFIG_CMD_EXT4=y
-   28 CONFIG_CMD_FAT=y
28 CONFIG_CMD_JFFS2=y 29 CONFIG_CMD_JFFS2=y
29 CONFIG_CMD_MTDPARTS=y -  
30 CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" 30 CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
31 -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)" 31 -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)"
32 +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),255m(ubi)" 32 +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),255m(ubi)"
33 CONFIG_CMD_UBI=y 33 CONFIG_CMD_UBI=y
34 CONFIG_ISO_PARTITION=y 34 CONFIG_ISO_PARTITION=y
35 CONFIG_OF_CONTROL=y 35 CONFIG_ENV_IS_IN_NAND=y