configs: Migrate CMD_NAND*

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

diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index 69988a8..7c28a94 100644 (file)
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -13,6 +13,7 @@
 #include "at91-sama5_common.h"
 #undef CONFIG_BOOTARGS
 #define CONFIG_SYS_USE_SERIALFLASH     1
+#define CONFIG_BOARD_LATE_INIT
 
 /*
  * Memory configurations
@@ -31,13 +32,11 @@
 /*
  * Environment
  */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_OFFSET              0x8000
+#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
+#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 #define CONFIG_ENV_SIZE                        0x4000
-#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
-#define CONFIG_ENV_SECT_SIZE           0x1000
+#define CONFIG_SYS_MMC_ENV_DEV         0       /* eMMC */
+#define CONFIG_ENV_OFFSET              512     /* just after the MBR */
 
 /*
  * U-Boot general configurations
@@ -97,7 +96,6 @@
  * USB
  */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     3
 
 /* USB device */
 #define CONFIG_USB_ETHER
@@ -175,18 +173,23 @@
        "nfsargs="                                                      \
                "setenv bootargs root=/dev/nfs rw "                     \
                        "nfsroot=${serverip}:${rootpath},v3,tcp\0"      \
+       "fdtimg=if test ${bootmode} = \"sf\" ; then "                   \
+                       "setenv kernel_fdt 1 ; "                        \
+               "else ; "                                               \
+                       "setenv kernel_fdt 2 ; "                        \
+               "fi\0"                                                  \
        "mmc_mmc="                                                      \
-               "run mmcload mmcargs addargs ; "                        \
-               "bootm ${kernel_addr_r}\0"                              \
+               "run fdtimg mmcload mmcargs addargs ; "                 \
+               "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \
        "mmc_nfs="                                                      \
-               "run mmcload nfsargs addip addargs ; "                  \
-               "bootm ${kernel_addr_r}\0"                              \
+               "run fdtimg mmcload nfsargs addip addargs ; "                   \
+               "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \
        "net_mmc="                                                      \
-               "run netload mmcargs addargs ; "                        \
-               "bootm ${kernel_addr_r}\0"                              \
+               "run fdtimg netload mmcargs addargs ; "                 \
+               "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \
        "net_nfs="                                                      \
-               "run netload nfsargs addip addargs ; "                  \
-               "bootm ${kernel_addr_r}\0"                              \
+               "run fdtimg netload nfsargs addip addargs ; "                   \
+               "bootm ${kernel_addr_r}:kernel@1 - ${kernel_addr_r}:fdt@${kernel_fdt}\0" \
        "try_bootscript="                                               \
                "mmc rescan;"                                           \
                "if test -e mmc 1:1 ${bootscript} ; then "              \