Convert CONFIG_BOARD_EARLY_INIT_F to Kconfig

[platform/kernel/u-boot.git] / include / configs / at91-sama5_common.h

diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 9c3ebd0..42410a8 100644 (file)
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -24,19 +24,11 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #endif
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_DISPLAY_CPUINFO
-
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_OF_LIBFDT               /* Device Tree support */
-
-#define CONFIG_SYS_GENERIC_BOARD
 
 /* general purpose I/O */
 #define CONFIG_AT91_GPIO
 
-#define CONFIG_BOOTDELAY               3
 
 /*
  * BOOTP options
@@ -49,10 +41,15 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
 
 #ifdef CONFIG_SYS_USE_MMC
+
+#ifdef CONFIG_ENV_IS_IN_MMC
+/* Use raw reserved sectors to save environment */
+#define CONFIG_ENV_OFFSET              0x2000
+#define CONFIG_ENV_SIZE                        0x1000
+#define CONFIG_SYS_MMC_ENV_DEV         0
+#else
 /* u-boot env in sd/mmc card */
 #define CONFIG_ENV_IS_IN_FAT
 #define CONFIG_FAT_WRITE
@@ -60,6 +57,7 @@
 #define FAT_ENV_DEVICE_AND_PART        "0"
 #define FAT_ENV_FILE           "uboot.env"
 #define CONFIG_ENV_SIZE                0x4000
+#endif
 
 #define CONFIG_BOOTCOMMAND     "if test ! -n ${dtb_name}; then "       \
                                    "setenv dtb_name at91-${board_name}.dtb; " \
@@ -74,7 +72,7 @@
 #define CONFIG_BOOTARGS                                                        \
        "console=ttyS0,115200 earlyprintk "                             \
        "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"          \
-       "256K(env),256k(env_redundent),256k(spare),"                    \
+       "256K(env),256k(env_redundant),256k(spare),"                    \
        "512k(dtb),6M(kernel)ro,-(rootfs) "                             \
        "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
 
@@ -87,6 +85,16 @@
 #define CONFIG_BOOTCOMMAND             "nand read 0x21000000 0x180000 0x80000;"        \
                                        "nand read 0x22000000 0x200000 0x600000;"       \
                                        "bootz 0x22000000 - 0x21000000"
+#elif CONFIG_SYS_USE_SERIALFLASH
+/* u-boot env in serial flash, by default is bus 0 and cs 0 */
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_OFFSET              0x6000
+#define CONFIG_ENV_SIZE                        0x2000
+#define CONFIG_ENV_SECT_SIZE           0x1000
+#define CONFIG_BOOTCOMMAND             "sf probe 0; "                          \
+                                       "sf read 0x21000000 0x60000 0xc000; "   \
+                                       "sf read 0x22000000 0x6c000 0x394000; " \
+                                       "bootz 0x22000000 - 0x21000000"
 #endif
 
 #endif
@@ -95,12 +103,9 @@
 
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                       sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)