Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index be8920e80de440c53866fb0f84f57e303bc9afb7..09783a2ca052bc4b8e90b207502bb852b7ffa1e5 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -12,10 +12,6 @@
 #include <linux/kconfig.h>
 /* SPL */
 /* #if defined(CONFIG_SPL_BUILD) */
-
-#define CONFIG_SPL_MMC_SUPPORT
-#define CONFIG_SPL_SPI_SUPPORT
-
 /* common IMX6 SPL configuration */
 #include "imx6_spl.h"
 
@@ -36,9 +32,6 @@
 #define PHYS_SDRAM_SIZE                        (1024u * SZ_1M)
 #endif
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
-
 #define CONFIG_MXC_UART
 
 /* SPI */
@@ -299,7 +292,7 @@
        "uboot=u-boot.imx\0"                                                   \
        "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0"                               \
        "fdt_addr="__stringify(TQMA6_FDT_ADDRESS)"\0"                          \
-       "console=" CONFIG_CONSOLE_DEV "\0"                                     \
+       "console=" CONSOLE_DEV "\0"                                     \
        "fdt_high=0xffffffff\0"                                                \
        "initrd_high=0xffffffff\0"                                             \
        "addtty=setenv bootargs ${bootargs} console=${console},${baudrate}\0"  \