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