Convert CONFIG_USB_MAX_CONTROLLER_COUNT to Kconfig

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

diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index d9311a4..9b89d9e 100644 (file)
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -12,10 +12,6 @@
 
 #ifdef CONFIG_SPL
 #include "imx6_spl.h"
-
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_DM_REGULATOR
-#endif
 #endif
 
 /* Miscellaneous configurable options */
@@ -25,44 +21,30 @@
 #define CONFIG_SYS_SDRAM_BASE          MMDC0_ARB_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
-#define CONFIG_SYS_INIT_SP_OFFSET \
-       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #endif
 
 /* LCD */
-#ifndef CONFIG_SPL_BUILD
-#ifdef CONFIG_DM_VIDEO
-#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_BMP_LOGO
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
-#endif
-#endif
 
 /* Environment is stored in the eMMC boot partition */
 
 #define CONFIG_ENV_VERSION     100
-#define CONFIG_BOARD_NAME      opos6ul
 #define ACFG_CONSOLE_DEV        ttymxc0
 #define CONFIG_SYS_AUTOLOAD     "no"
-#define CONFIG_ROOTPATH         "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
-#define CONFIG_BOOTCOMMAND     "run emmcboot"
+#define CONFIG_ROOTPATH         "/tftpboot/opos6ul-root"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "env_version="          __stringify(CONFIG_ENV_VERSION)         "\0"                    \
        "consoledev="           __stringify(ACFG_CONSOLE_DEV)           "\0"                    \
-       "board_name="           __stringify(CONFIG_BOARD_NAME)          "\0"                    \
+       "board_name=opos6ul\0"                                                                  \
        "fdt_addr=0x88000000\0"                                                                 \
        "fdt_high=0xffffffff\0"                                                                 \
-       "fdt_name="           __stringify(CONFIG_BOARD_NAME)          "dev\0"                   \
+       "fdt_name=opos6uldev\0"                                                                 \
        "initrd_high=0xffffffff\0"                                                              \
        "ip_dyn=yes\0"                                                                          \
        "stdin=serial\0"                                                                        \
@@ -72,7 +54,7 @@
        "mmcpart=2\0"                                                                           \
        "mmcroot=/dev/mmcblk0p2 ro\0"                                                           \
        "mmcrootfstype=ext4 rootwait\0"                                                         \
-       "kernelimg="           __stringify(CONFIG_BOARD_NAME)          "-linux.bin\0"           \
+       "kernelimg=opos6ul-linux.bin\0"                                                         \
        "splashpos=0,0\0"                                                                       \
        "splashimage="          __stringify(CONFIG_SYS_LOAD_ADDR)       "\0"                    \
        "videomode=video=ctfb:x:800,y:480,depth:18,pclk:33033,le:96,ri:96,up:20,lo:21,hs:64,vs:4,sync:0,vmode:0\0" \