07d65de174abf19eb8fda95319112f468b8376dd
[openwrt/openwrt.git] / package / boot / uboot-kirkwood / patches / 110-dockstar.patch
1 --- a/include/configs/dockstar.h
2 +++ b/include/configs/dockstar.h
3 @@ -31,6 +31,7 @@
4 * Commands configuration
5 */
6 #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
7 +#define CONFIG_SYS_MVFS
8 #define CONFIG_CMD_ENV
9 #define CONFIG_CMD_NAND
10 /*
11 @@ -53,29 +54,29 @@
12 * it has to be rounded to sector size
13 */
14 #define CONFIG_ENV_SIZE 0x20000 /* 128k */
15 -#define CONFIG_ENV_ADDR 0x80000
16 -#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */
17 +#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */
18
19 /*
20 * Default environment variables
21 */
22 #define CONFIG_BOOTCOMMAND \
23 "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
24 - "ubi part root; " \
25 - "ubifsmount ubi:root; " \
26 - "ubifsload 0x800000 ${kernel}; " \
27 - "ubifsload 0x1100000 ${initrd}; " \
28 - "bootm 0x800000 0x1100000"
29 + "ubi part ubi; " \
30 + "ubi read 0x800000 kernel; " \
31 + "bootm 0x800000"
32
33 -#define CONFIG_MTDPARTS "mtdparts=orion_nand:1m(uboot),-(root)\0"
34 +#define CONFIG_MTDPARTS \
35 + "mtdparts=orion_nand:" \
36 + "0xe0000@0x0(uboot)," \
37 + "0x20000@0xe0000(uboot_env)," \
38 + "0x100000@0x100000(second_stage_uboot)," \
39 + "-@0x200000(ubi)\0"
40
41 #define CONFIG_EXTRA_ENV_SETTINGS \
42 - "console=console=ttyS0,115200\0" \
43 - "mtdids=nand0=orion_nand\0" \
44 - "mtdparts="CONFIG_MTDPARTS \
45 - "kernel=/boot/uImage\0" \
46 - "initrd=/boot/uInitrd\0" \
47 - "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
48 + "console=console=ttyS0,115200\0" \
49 + "mtdids=nand0=orion_nand\0" \
50 + "mtdparts="CONFIG_MTDPARTS \
51 + "bootargs_root=\0"
52
53 /*
54 * Ethernet Driver configuration