configs: Migrate CMD_NAND*

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

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 125c74e..a8a48a5 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -14,20 +14,16 @@
 
 #include "imx6_spl.h"
 
-#define MACH_TYPE_WANDBOARD            4412
-#define CONFIG_MACH_TYPE               MACH_TYPE_WANDBOARD
+#define CONFIG_MACH_TYPE               MACH_TYPE_WANDBOARD_IMX6
 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE
 
 /* SATA Configs */
 
-#define CONFIG_CMD_SATA
 #ifdef CONFIG_CMD_SATA
 #define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE     1
@@ -37,9 +33,6 @@
 #define CONFIG_LIBATA
 #endif
 
-/* Command definition */
-#define CONFIG_CMD_BMODE
-
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
 
@@ -56,8 +49,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
 /* USB Configs */
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
@@ -82,7 +73,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IPUV3_CLK 260000000
-#define CONFIG_CMD_HDMIDETECT
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 #endif
@@ -98,6 +88,7 @@
        "fdt_addr=0x18000000\0" \
        "ip_dyn=yes\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+       "finduuid=part uuid mmc 0:1 uuid\0" \
        "update_sd_firmware_filename=u-boot.imx\0" \
        "update_sd_firmware=" \
                "if test ${ip_dyn} = yes; then " \
@@ -139,6 +130,7 @@
 
 #define CONFIG_BOOTCOMMAND \
           "run findfdt; " \
+          "run finduuid; " \
           "run distro_bootcmd"
 
 #include <config_distro_bootcmd.h>
@@ -159,7 +151,6 @@
 /* Environment organization */
 #define CONFIG_ENV_SIZE                        (8 * 1024)
 
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET              (768 * 1024)
 #define CONFIG_SYS_MMC_ENV_DEV         0