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/pogo_e02.h 1 --- a/include/configs/pogo_e02.h
2 +++ b/include/configs/pogo_e02.h 2 +++ b/include/configs/pogo_e02.h
3 @@ -42,23 +42,23 @@ 3 @@ -44,23 +44,23 @@
4 #endif 4 #endif
5   5
6 #define CONFIG_ENV_SIZE 0x20000 /* 128k */ 6 #define CONFIG_ENV_SIZE 0x20000 /* 128k */
7 -#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ 7 -#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */
8 +#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */ 8 +#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */
9   9
10 /* 10 /*
11 * Default environment variables 11 * Default environment variables
12 */ 12 */
13 #define CONFIG_BOOTCOMMAND \ 13 #define CONFIG_BOOTCOMMAND \
14 - "setenv bootargs $(bootargs_console); " \ 14 - "setenv bootargs $(bootargs_console); " \
Line 17... Line 17...
17 + "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ 17 + "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
18 + "ubi part ubi; " \ 18 + "ubi part ubi; " \
19 + "ubifsmount ubi:rootfs; " \ 19 + "ubifsmount ubi:rootfs; " \
20 + "ubi read 0x800000 kernel; " \ 20 + "ubi read 0x800000 kernel; " \
21 + "bootm 0x800000" 21 + "bootm 0x800000"
22   22
23 #define CONFIG_EXTRA_ENV_SETTINGS \ 23 #define CONFIG_EXTRA_ENV_SETTINGS \
24 - "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \ 24 - "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \
25 - "32M(rootfs),-(data)\0"\ 25 - "32M(rootfs),-(data)\0"\
26 - "mtdids=nand0=orion_nand\0"\ 26 - "mtdids=nand0=orion_nand\0"\
27 - "bootargs_console=console=ttyS0,115200\0" \ 27 - "bootargs_console=console=ttyS0,115200\0" \
Line 29... Line 29...
29 - "ext2load usb 0:1 0x01100000 /uInitrd\0" 29 - "ext2load usb 0:1 0x01100000 /uInitrd\0"
30 + "console=console=ttyS0,115200\0" \ 30 + "console=console=ttyS0,115200\0" \
31 + "mtdids=nand0=orion_nand\0" \ 31 + "mtdids=nand0=orion_nand\0" \
32 + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \ 32 + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
33 + "bootargs_root=\0" 33 + "bootargs_root=\0"
34   34
35 /* 35 /*
36 * Ethernet Driver configuration 36 * Ethernet Driver configuration
37 --- a/configs/pogo_e02_defconfig 37 --- a/configs/pogo_e02_defconfig
38 +++ b/configs/pogo_e02_defconfig 38 +++ b/configs/pogo_e02_defconfig
39 @@ -18,6 +18,7 @@ CONFIG_CMD_PING=y 39 @@ -16,6 +16,7 @@ CONFIG_CMD_PING=y
-   40 CONFIG_CMD_EXT2=y
40 CONFIG_CMD_FAT=y 41 CONFIG_CMD_FAT=y
41 CONFIG_CMD_JFFS2=y 42 CONFIG_CMD_JFFS2=y
42 CONFIG_CMD_MTDPARTS=y -  
43 +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)" 43 +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
44 CONFIG_CMD_UBI=y 44 CONFIG_CMD_UBI=y
45 CONFIG_ISO_PARTITION=y 45 CONFIG_ISO_PARTITION=y
46 CONFIG_OF_CONTROL=y 46 CONFIG_ENV_IS_IN_NAND=y