diff options
Diffstat (limited to 'include/configs/mx6sx_17x17_arm2.h')
| -rw-r--r-- | include/configs/mx6sx_17x17_arm2.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/configs/mx6sx_17x17_arm2.h b/include/configs/mx6sx_17x17_arm2.h index e99b5df..f2a9b27 100644 --- a/include/configs/mx6sx_17x17_arm2.h +++ b/include/configs/mx6sx_17x17_arm2.h @@ -11,13 +11,7 @@ #include "mx6sx_arm2.h" -#ifdef CONFIG_TARGET_MX6SX_14X14_ARM2 -#define CONFIG_DEFAULT_FDT_FILE "imx6sx-14x14-arm2.dtb" -#else -#define CONFIG_DEFAULT_FDT_FILE "imx6sx-17x17-arm2.dtb" -#endif - -#ifdef CONFIG_SYS_USE_SPINOR /* Pin conflict between SPI-NOR and SD2 */ +#ifdef CONFIG_MXC_SPI /* Pin conflict between SPI-NOR and SD2 */ #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC3 */ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ @@ -29,7 +23,7 @@ #define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */ #endif -#ifdef CONFIG_SYS_USE_EIMNOR +#ifdef CONFIG_MXC_SPI #undef CONFIG_SYS_FLASH_SECT_SIZE #undef CONFIG_SYS_MAX_FLASH_SECT #define CONFIG_SYS_FLASH_SECT_SIZE (256 * 1024) |