Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

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

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 803661cfa843390970a7bacfa204ae25fd391187..a6690367f8c5fc59238978db697c935ae1b83cee 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -29,14 +29,12 @@
 
 /* Ethernet Configuration */
 #define CONFIG_FEC_MXC
-#define CONFIG_MII
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
 #define CONFIG_FEC_XCV_TYPE            RGMII
 #define CONFIG_FEC_MXC_PHYADDR         0
 #define CONFIG_PHY_ATHEROS
 
 /* Framebuffer */
-#define CONFIG_VIDEO_IPUV3
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
@@ -47,31 +45,18 @@
 #define CONFIG_IMX_VIDEO_SKIP
 
 /* USB */
-#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
-#define CONFIG_PREBOOT \
-       "if hdmidet; then " \
-               "usb start; "                  \
-               "setenv stdin  serial,usbkbd; "\
-               "setenv stdout serial,vga; "   \
-               "setenv stderr serial,vga; "   \
-       "else " \
-               "setenv stdin  serial; " \
-               "setenv stdout serial; " \
-               "setenv stderr serial; " \
-       "fi;"
 
 /* Command definition */
 
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 #define CONSOLE_DEV    "ttymxc0"
-#define CONFIG_SYS_FSL_USDHC_NUM       1
 #define CONFIG_SYS_MMC_ENV_DEV         0       /* SDHC2 */
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       "som_rev=undefined\0" \
+       "has_emmc=undefined\0" \
        "fdtfile=undefined\0" \
        "fdt_addr_r=0x18000000\0" \
        "fdt_addr=0x18000000\0" \
@@ -81,7 +66,6 @@
        "ramdisk_addr_r=0x13000000\0" \
        "ramdiskaddr=0x13000000\0" \
        "initrd_high=0xffffffff\0" \
-       "fdt_high=0xffffffff\0" \
        "ip_dyn=yes\0" \
        "console=" CONSOLE_DEV ",115200\0" \
        "bootm_size=0x10000000\0" \
@@ -101,24 +85,27 @@
                        "fi; "  \
                "fi\0" \
        "findfdt="\
-               "if test $board_rev = MX6Q ; then " \
+               "if test ${board_rev} = MX6Q; then " \
                        "setenv fdtprefix imx6q; fi; " \
-               "if test $board_rev = MX6DL ; then " \
+               "if test ${board_rev} = MX6DL; then " \
                        "setenv fdtprefix imx6dl; fi; " \
-               "if test $som_rev = V15 ; then " \
+               "if test ${som_rev} = V15; then " \
                        "setenv fdtsuffix -som-v15; fi; " \
-               "if test $board_name = HUMMINGBOARD2 ; then " \
-                       "setenv fdtfile ${fdtprefix}-hummingboard2${fdtsuffix}.dtb; fi; " \
-               "if test $board_name = HUMMINGBOARD ; then " \
-                       "setenv fdtfile ${fdtprefix}-hummingboard${fdtsuffix}.dtb; fi; " \
-               "if test $board_name = CUBOXI ; then " \
-                       "setenv fdtfile ${fdtprefix}-cubox-i${fdtsuffix}.dtb; fi; " \
-               "if test $fdtfile = undefined; then " \
+               "if test ${has_emmc} = yes; then " \
+                       "setenv emmcsuffix -emmc; fi; " \
+               "if test ${board_name} = HUMMINGBOARD2 ; then " \
+                       "setenv fdtfile ${fdtprefix}-hummingboard2${emmcsuffix}${fdtsuffix}.dtb; fi; " \
+               "if test ${board_name} = HUMMINGBOARD ; then " \
+                       "setenv fdtfile ${fdtprefix}-hummingboard${emmcsuffix}${fdtsuffix}.dtb; fi; " \
+               "if test ${board_name} = CUBOXI ; then " \
+                       "setenv fdtfile ${fdtprefix}-cubox-i${emmcsuffix}${fdtsuffix}.dtb; fi; " \
+               "if test ${fdtfile} = undefined; then " \
                        "echo WARNING: Could not determine dtb to use; fi; \0" \
        BOOTENV
 
 #define BOOT_TARGET_DEVICES(func) \
-       func(MMC, mmc, 0) \
+       func(MMC, mmc, 1) \
+       func(MMC, mmc, 2) \
        func(SATA, sata, 0) \
        func(USB, usb, 0) \
        func(PXE, pxe, na) \
@@ -131,7 +118,6 @@
 #endif /* CONFIG_SPL_BUILD */
 
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
 #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
@@ -142,7 +128,5 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Environment organization */
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-#define CONFIG_ENV_OFFSET              (8 * 64 * 1024)
 
 #endif                         /* __MX6CUBOXI_CONFIG_H */