Merge branch 'master' of git://git.denx.de/u-boot

[u-boot] / include / configs / tqma6.h

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 95d76920bf52bd8eb8fee12e3e13ca26a8ac0a83..983153ffb55cd0257f3ee27cb05b8ff2a884fc49 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -12,9 +12,6 @@
 #include <linux/kconfig.h>
 /* SPL */
 /* #if defined(CONFIG_SPL_BUILD) */
-
-#define CONFIG_SPL_SPI_SUPPORT
-
 /* common IMX6 SPL configuration */
 #include "imx6_spl.h"
 
@@ -298,7 +295,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"  \