diff options
Diffstat (limited to 'include/configs/mx6ull_ddr3_arm2.h')
| -rw-r--r-- | include/configs/mx6ull_ddr3_arm2.h | 48 |
1 files changed, 10 insertions, 38 deletions
diff --git a/include/configs/mx6ull_ddr3_arm2.h b/include/configs/mx6ull_ddr3_arm2.h index b4d47a8..377adac 100644 --- a/include/configs/mx6ull_ddr3_arm2.h +++ b/include/configs/mx6ull_ddr3_arm2.h @@ -8,26 +8,18 @@ #ifndef __MX6ULL_DDR3_ARM2_CONFIG_H #define __MX6ULL_DDR3_ARM2_CONFIG_H -#define CONFIG_DEFAULT_FDT_FILE "imx6ull-14x14-ddr3-arm2.dtb" - -#ifdef CONFIG_SYS_BOOT_QSPI -#define CONFIG_SYS_USE_QSPI +#ifdef CONFIG_QSPI_BOOT #define CONFIG_ENV_IS_IN_SPI_FLASH -#elif defined CONFIG_SYS_BOOT_SPINOR -#define CONFIG_SYS_USE_SPINOR +#elif defined CONFIG_SPI_BOOT +#define CONFIG_MXC_SPI #define CONFIG_ENV_IS_IN_SPI_FLASH -#elif defined CONFIG_SYS_BOOT_NAND -#define CONFIG_SYS_USE_NAND +#elif defined CONFIG_NAND_BOOT +#define CONFIG_CMD_NAND #define CONFIG_ENV_IS_IN_NAND #else -#ifndef CONFIG_MX6ULL_DDR3_ARM2_EMMC_REWORK -#define CONFIG_SYS_USE_QSPI -#endif #define CONFIG_ENV_IS_IN_MMC #endif -#define CONFIG_VIDEO -#define CONFIG_FSL_USDHC #define BOOTARGS_CMA_SIZE "" #include "mx6ul_arm2.h" @@ -52,20 +44,14 @@ #undef CONFIG_POWER #endif -#ifdef CONFIG_SYS_USE_SPINOR -#define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_MXC_SPI +#ifdef CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) #define CONFIG_SF_DEFAULT_CS 0 #endif -#ifdef CONFIG_CMD_NET -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP +#ifdef CONFIG_DM_ETH #define CONFIG_CMD_MII #define CONFIG_FEC_MXC #define CONFIG_MII @@ -75,33 +61,19 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1 #define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_ETHPRIME "FEC0" #elif (CONFIG_FEC_ENET_DEV == 1) #define IMX_FEC_BASE ENET2_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x2 #define CONFIG_FEC_XCV_TYPE MII100 +#define CONFIG_ETHPRIME "FEC1" #endif -#define CONFIG_ETHPRIME "FEC" #define CONFIG_PHYLIB #define CONFIG_PHY_MICREL -#define CONFIG_FEC_DMA_MINALIGN 64 +#define CONFIG_FEC_MXC_MDIO_BASE ENET2_BASE_ADDR #endif -#ifdef CONFIG_VIDEO -#define CONFIG_CFB_CONSOLE -#define CONFIG_VIDEO_MXS -#define CONFIG_VIDEO_LOGO -#define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE -#define CONFIG_SYS_CONSOLE_IS_IN_ENV -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN -#define CONFIG_CMD_BMP -#define CONFIG_BMP_16BPP -#define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_IMX_VIDEO_SKIP -#endif /* #define CONFIG_SPLASH_SCREEN*/ /* #define CONFIG_MXC_EPDC*/ |