diff options
| -rw-r--r-- | board/freescale/mx6sabreauto/mx6sabreauto.c | 9 | ||||
| -rw-r--r-- | configs/mx6sabreauto_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/mx6sabreauto.h | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index 13af9ca6cd..bfd5ffa5c7 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -197,6 +197,7 @@ static int port_exp_direction_output(unsigned gpio, int value) return 0; } +#ifdef CONFIG_MTD_NOR_FLASH static iomux_v3_cfg_t const eimnor_pads[] = { IOMUX_PADS(PAD_EIM_D16__EIM_DATA16 | MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)), IOMUX_PADS(PAD_EIM_D17__EIM_DATA17 | MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)), @@ -292,6 +293,7 @@ static void setup_iomux_eimnor(void) eimnor_cs_setup(); } +#endif static void setup_iomux_enet(void) { @@ -571,8 +573,10 @@ int board_early_init_f(void) #ifdef CONFIG_NAND_MXS setup_gpmi_nand(); #endif - eim_clk_setup(); +#ifdef CONFIG_MTD_NOR_FLASH + eim_clk_setup(); +#endif return 0; } @@ -601,7 +605,10 @@ int board_init(void) #ifdef CONFIG_VIDEO_IPUV3 setup_display(); #endif + +#ifdef CONFIG_MTD_NOR_FLASH setup_iomux_eimnor(); +#endif return 0; } diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index c63cc8e81e..f904cbfe8d 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -38,7 +38,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y -CONFIG_MTD_NOR_FLASH=y +# CONFIG_MTD_NOR_FLASH is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index fd0d5ce063..2c08fd1baa 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -31,6 +31,7 @@ #include "mx6sabre_common.h" +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR #define CONFIG_SYS_FLASH_SECT_SIZE (128 * 1024) #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ @@ -40,6 +41,7 @@ #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* Use buffered writes*/ #define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT +#endif #define CONFIG_SYS_FSL_USDHC_NUM 2 #if defined(CONFIG_ENV_IS_IN_MMC) |