uboot-kirkwood: refresh patches
[openwrt/openwrt.git] / package / boot / uboot-kirkwood / patches / 140-pogoplug_e02.patch
1 --- a/include/configs/pogo_e02.h
2 +++ b/include/configs/pogo_e02.h
3 @@ -42,17 +42,17 @@
4 * Default environment variables
5 */
6 #define CONFIG_BOOTCOMMAND \
7 - "setenv bootargs $(bootargs_console); " \
8 - "run bootcmd_usb; " \
9 - "bootm 0x00800000 0x01100000"
10 + "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
11 + "ubi part ubi; " \
12 + "ubifsmount ubi:rootfs; " \
13 + "ubi read 0x800000 kernel; " \
14 + "bootm 0x800000"
15
16 #define CONFIG_EXTRA_ENV_SETTINGS \
17 - "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \
18 - "32M(rootfs),-(data)\0"\
19 - "mtdids=nand0=orion_nand\0"\
20 - "bootargs_console=console=ttyS0,115200\0" \
21 - "bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \
22 - "ext2load usb 0:1 0x01100000 /uInitrd\0"
23 + "console=console=ttyS0,115200\0" \
24 + "mtdids=nand0=orion_nand\0" \
25 + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
26 + "bootargs_root=\0"
27
28 /*
29 * Ethernet Driver configuration
30 --- a/configs/pogo_e02_defconfig
31 +++ b/configs/pogo_e02_defconfig
32 @@ -5,7 +5,7 @@ CONFIG_KIRKWOOD=y
33 CONFIG_SYS_TEXT_BASE=0x600000
34 CONFIG_TARGET_POGO_E02=y
35 CONFIG_ENV_SIZE=0x20000
36 -CONFIG_ENV_OFFSET=0x60000
37 +CONFIG_ENV_OFFSET=0xE0000
38 CONFIG_NR_DRAM_BANKS=2
39 CONFIG_IDENT_STRING="\nPogo E02"
40 CONFIG_BOOTDELAY=3
41 @@ -23,6 +23,7 @@ CONFIG_CMD_EXT2=y
42 CONFIG_CMD_FAT=y
43 CONFIG_CMD_JFFS2=y
44 CONFIG_CMD_MTDPARTS=y
45 +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
46 CONFIG_CMD_UBI=y
47 CONFIG_ISO_PARTITION=y
48 CONFIG_OF_CONTROL=y