1 --- a/include/configs/dockstar.h
2 +++ b/include/configs/dockstar.h
5 * Version number information
7 -#define CONFIG_IDENT_STRING "\nSeagate FreeAgent DockStar"
8 +#define CONFIG_IDENT_STRING "Seagate FreeAgent DockStar"
11 - * High Level Configuration Options (easy to change)
12 + * High Level Configuration Options
14 -#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */
15 -#define CONFIG_KW88F6281 1 /* SOC Name */
16 -#define CONFIG_MACH_DOCKSTAR /* Machine type */
17 +#define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */
18 +#define CONFIG_KW88F6281 /* SOC Name */
19 #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
24 +#define CONFIG_MACH_DOCKSTAR
27 * Commands configuration
29 -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
30 +#define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */
31 +#define CONFIG_SYS_MVFS
32 #include <config_cmd_default.h>
33 #define CONFIG_CMD_DHCP
34 #define CONFIG_CMD_ENV
36 #define CONFIG_CMD_NAND
37 #define CONFIG_CMD_PING
38 #define CONFIG_CMD_USB
41 * mv-common.h should be defined after CMD configs since it used them
42 * to enable certain macros
44 #include "mv-common.h"
46 -#undef CONFIG_SYS_PROMPT /* previously defined in mv-common.h */
47 -#define CONFIG_SYS_PROMPT "DockStar> " /* Command Prompt */
48 +#undef CONFIG_SYS_PROMPT
49 +#define CONFIG_SYS_PROMPT "dockstar => "
52 - * Environment variables configurations
53 + * Environment variables configuration
55 #ifdef CONFIG_CMD_NAND
56 -#define CONFIG_ENV_IS_IN_NAND 1
57 -#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */
58 +#define CONFIG_ENV_IS_IN_NAND
59 +#define CONFIG_ENV_SECT_SIZE 0x20000
61 -#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
62 +#define CONFIG_ENV_IS_NOWHERE
65 - * max 4k env size is enough, but in case of nand
66 - * it has to be rounded to sector size
68 -#define CONFIG_ENV_SIZE 0x20000 /* 128k */
69 -#define CONFIG_ENV_ADDR 0x60000
70 -#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */
71 +#define CONFIG_ENV_SIZE 0x20000
72 +#define CONFIG_ENV_OFFSET 0xe0000
75 * Default environment variables
77 #define CONFIG_BOOTCOMMAND \
78 "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
80 - "ubifsmount ubi:root; " \
81 - "ubifsload 0x800000 ${kernel}; " \
82 - "ubifsload 0x1100000 ${initrd}; " \
83 - "bootm 0x800000 0x1100000"
85 -#define CONFIG_MTDPARTS "mtdparts=orion_nand:1m(uboot),-(root)\0"
87 + "ubifsmount ubi:rootfs; " \
88 + "ubifsload 0x800000 ${kernel}; " \
89 + "ubifsload 0x700000 ${fdt}; " \
91 + "fdt addr 0x700000; fdt resize; fdt chosen; " \
92 + "bootz 0x800000 - 0x700000"
94 +#define CONFIG_MTDPARTS \
95 + "mtdparts=orion_nand:" \
96 + "0xe0000@0x0(uboot)," \
97 + "0x20000@0xe0000(uboot_env)," \
98 + "0x100000@0x100000(second_stage_uboot)," \
99 + "-@0x200000(root)\0"
101 #define CONFIG_EXTRA_ENV_SETTINGS \
102 - "console=console=ttyS0,115200\0" \
103 - "mtdids=nand0=orion_nand\0" \
104 - "mtdparts="CONFIG_MTDPARTS \
105 - "kernel=/boot/uImage\0" \
106 - "initrd=/boot/uInitrd\0" \
107 - "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
108 + "console=console=ttyS0,115200\0" \
109 + "mtdids=nand0=orion_nand\0" \
110 + "mtdparts="CONFIG_MTDPARTS \
111 + "kernel=/boot/zImage\0" \
112 + "fdt=/boot/dockstar.dtb\0" \
113 + "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
116 - * Ethernet Driver configuration
117 + * Ethernet driver configuration
119 #ifdef CONFIG_CMD_NET
120 #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
122 #define CONFIG_CMD_UBI
123 #define CONFIG_CMD_UBIFS
124 #define CONFIG_RBTREE
125 -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
126 +#define CONFIG_MTD_DEVICE
127 #define CONFIG_MTD_PARTITIONS
128 #define CONFIG_CMD_MTDPARTS