Remove config_distro_defaults.h

[people/ms/u-boot.git] / include / configs / mx6cuboxi.h

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 5930f591cbd0c0814e5bcac20783418c9f040067..0e1d18cad8780f40dfb2dd821d0e400115a9f25d 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -8,7 +8,6 @@
 #ifndef __MX6CUBOXI_CONFIG_H
 #define __MX6CUBOXI_CONFIG_H
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #include "imx6_spl.h"
@@ -23,12 +22,10 @@
 
 /* SATA Configuration */
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE      1
 #define CONFIG_DWC_AHSATA_PORT_ID       0
 #define CONFIG_DWC_AHSATA_BASE_ADDR     SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 /* Ethernet Configuration */
@@ -41,7 +38,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_IPUV3_CLK               260000000
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
@@ -56,7 +52,6 @@
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
-#define CONFIG_SYS_USB_EVENT_POLL
 #define CONFIG_PREBOOT \
        "if hdmidet; then " \
                "usb start; "                  \
@@ -108,6 +103,10 @@
                        "fi; "  \
                "fi\0" \
        "findfdt="\
+               "if test $board_name = HUMMINGBOARD2 && test $board_rev = MX6Q ; then " \
+                       "setenv fdtfile imx6q-hummingboard2.dtb; fi; " \
+               "if test $board_name = HUMMINGBOARD2 && test $board_rev = MX6DL ; then " \
+                       "setenv fdtfile imx6dl-hummingboard2.dtb; fi; " \
                "if test $board_name = HUMMINGBOARD && test $board_rev = MX6Q ; then " \
                        "setenv fdtfile imx6q-hummingboard.dtb; fi; " \
                "if test $board_name = HUMMINGBOARD && test $board_rev = MX6DL ; then " \
@@ -120,11 +119,6 @@
                        "echo WARNING: Could not determine dtb to use; fi; \0" \
        BOOTENV
 
-#define CONFIG_BOOTCOMMAND \
-       "run findfdt; " \
-       "run finduuid; " \
-       "run distro_bootcmd"
-
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
        func(SATA, sata, 0) \