diff options
| author | Tom Rini <trini@ti.com> | 2014-11-05 12:48:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-05 12:48:09 -0500 |
| commit | 625509ab0edbb7d943ad9028de3c21ca48aa58be (patch) | |
| tree | 2ea6bda524b3ad7e964f4357428de2890ad81cf4 /include/configs/tqma6.h | |
| parent | d5325eff10922acb11c39efece6d5f24de5b1998 (diff) | |
| parent | 0b23780ff02bdbec46fac1fe4151e2ebf1eae881 (diff) | |
| download | blackbird-obmc-uboot-625509ab0edbb7d943ad9028de3c21ca48aa58be.tar.gz blackbird-obmc-uboot-625509ab0edbb7d943ad9028de3c21ca48aa58be.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'include/configs/tqma6.h')
| -rw-r--r-- | include/configs/tqma6.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index d97a9613ae..c94eee19a2 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -9,13 +9,26 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_MX6 + +/* SPL */ +/* #if defined(CONFIG_SPL_BUILD) */ + +#define CONFIG_SPL_MMC_SUPPORT +#define CONFIG_SPL_SPI_SUPPORT +#define CONFIG_SPL_FAT_SUPPORT +#define CONFIG_SPL_EXT_SUPPORT + +/* common IMX6 SPL configuration */ +#include "imx6_spl.h" + +/* #endif */ + #include "mx6_common.h" #include <asm/arch/imx-regs.h> #include <asm/imx-common/gpio.h> #include <linux/sizes.h> -#define CONFIG_MX6 - #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #define PHYS_SDRAM_SIZE (512u * SZ_1M) #elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) @@ -57,7 +70,7 @@ #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS (0 | (IMX_GPIO_NR(3, 19) << 8)) +#define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 50000000 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) |
