diff options
| author | Peng Fan <Peng.Fan@freescale.com> | 2015-07-09 12:23:38 +0800 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-03-09 14:42:41 +0100 |
| commit | f21abb9a32c606ee9d0fdaadc73c066180d59481 (patch) | |
| tree | 696d30cf9828c6890f81e5949694b51b513838f3 /include | |
| parent | 37e4e84791193fc575f172af52af03e45e58a3d2 (diff) | |
MLK-11227 imx: mx6ul_14x14_lpddr2_arm2 add weimnor defconfig
1. Add weimnor boot defconfig
2. move CONFIG_FSL_USDHC and CONFIG_VIDEO to board header
3. Add CONFIG_SYS_FLASH_PROTECTION for mx6ul 14x14 lpddr2 arm2
4. correct CONFIG_SYS_FLASH_SECT_SIZE and CONFIG_SYS_MAX_FLASH_SECT
5. Add comments for setup_eimnor, since ENET2_RXER pin conflicts
with ENET2. Also eimnor support will disable SD1/SD2, need ENET
to boot kernel and nfs using enet. So setup_eimnor should be
invoked after setup_fec
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6ul_14x14_ddr3_arm2.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_lpddr2_arm2.h | 14 | ||||
| -rw-r--r-- | include/configs/mx6ul_arm2.h | 7 |
3 files changed, 18 insertions, 5 deletions
diff --git a/include/configs/mx6ul_14x14_ddr3_arm2.h b/include/configs/mx6ul_14x14_ddr3_arm2.h index 3ad0b68b15..30e074f909 100644 --- a/include/configs/mx6ul_14x14_ddr3_arm2.h +++ b/include/configs/mx6ul_14x14_ddr3_arm2.h @@ -27,6 +27,8 @@ #define CONFIG_ENV_IS_IN_MMC #endif +#define CONFIG_VIDEO +#define CONFIG_FSL_USDHC #include "mx6ul_arm2.h" #define PHYS_SDRAM_SIZE SZ_1G diff --git a/include/configs/mx6ul_14x14_lpddr2_arm2.h b/include/configs/mx6ul_14x14_lpddr2_arm2.h index c0b212922b..5b296881d3 100644 --- a/include/configs/mx6ul_14x14_lpddr2_arm2.h +++ b/include/configs/mx6ul_14x14_lpddr2_arm2.h @@ -19,6 +19,7 @@ #elif defined CONFIG_SYS_BOOT_EIMNOR #define CONFIG_SYS_USE_EIMNOR #define CONFIG_ENV_IS_IN_FLASH +#define CONFIG_SYS_FLASH_PROTECTION #elif defined CONFIG_SYS_BOOT_NAND #define CONFIG_SYS_USE_NAND #define CONFIG_ENV_IS_IN_NAND @@ -26,6 +27,19 @@ #define CONFIG_ENV_IS_IN_MMC #endif +#define CONFIG_FSL_USDHC +#define CONFIG_VIDEO +#ifdef CONFIG_SYS_BOOT_EIMNOR +/* + * Conflicts with SD1/SD2/VIDEO/ENET + * ENET is keeped, since only RXER conflicts. + * If removed ENET, we can not boot kernel, since sd1/sd2 is disabled + * when support weimnor. + */ +#undef CONFIG_FSL_USDHC +#undef CONFIG_VIDEO +#endif + #include "mx6ul_arm2.h" #define PHYS_SDRAM_SIZE SZ_512M diff --git a/include/configs/mx6ul_arm2.h b/include/configs/mx6ul_arm2.h index 096d1f4484..076cabfb0d 100644 --- a/include/configs/mx6ul_arm2.h +++ b/include/configs/mx6ul_arm2.h @@ -82,8 +82,6 @@ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 #endif -#define CONFIG_VIDEO - /* Command definition */ #include <config_cmd_default.h> @@ -274,9 +272,9 @@ #ifdef CONFIG_SYS_USE_EIMNOR #undef CONFIG_SYS_NO_FLASH #define CONFIG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR -#define CONFIG_SYS_FLASH_SECT_SIZE (128 * 1024) +#define CONFIG_SYS_FLASH_SECT_SIZE (256 * 1024) #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ -#define CONFIG_SYS_MAX_FLASH_SECT 1024 /* max number of sectors on one chip */ +#define CONFIG_SYS_MAX_FLASH_SECT 512 /* max number of sectors on one chip */ #define CONFIG_SYS_FLASH_CFI /* Flash memory is CFI compliant */ #define CONFIG_FLASH_CFI_DRIVER /* Use drivers/cfi_flash.c */ #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* Use buffered writes*/ @@ -320,7 +318,6 @@ #endif /* MMC Configs */ -#define CONFIG_FSL_USDHC #ifdef CONFIG_FSL_USDHC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 |