diff options
| author | Ye Li <ye.li@nxp.com> | 2017-02-24 17:20:08 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:04:39 +0800 |
| commit | e974006f6ad9f40cb380f0790028ee161ed7c0b4 (patch) | |
| tree | 22a66995050369dae61a4ada5e3b25f975f48c65 | |
| parent | b93aa92e4f8cde26c3a14d860b2d29912c8029d8 (diff) | |
| download | u-boot-imx-e974006f6ad9f40cb380f0790028ee161ed7c0b4.zip u-boot-imx-e974006f6ad9f40cb380f0790028ee161ed7c0b4.tar.gz u-boot-imx-e974006f6ad9f40cb380f0790028ee161ed7c0b4.tar.bz2 | |
MLK-14261-1 mx6solo: Rename the CONFIG_MX6SOLO to CONFIG_MX6S
Since there is already CONFIG_MX6S used for i.MX6 SOLO in u-boot codes,
we don't need to add new CONFIG_MX6SOLO. Rename the existing CONFIG_MX6SOLO
to CONFIG_MX6S.
Additional, for CONFIG_MX6S, we should select CONFIG_MX6DL. The major difference
for these two chips are core number and DDR controller. So all duallite
relevant definitions can apply to solo. User can combine the two configs
if any code only apply to solo or duallite.
Signed-off-by: Ye Li <ye.li@nxp.com>
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/mx6_plugin.S | 2 | ||||
| -rw-r--r-- | board/freescale/mx6qsabreauto/plugin.S | 2 | ||||
| -rw-r--r-- | board/freescale/mx6sabresd/plugin.S | 2 | ||||
| -rw-r--r-- | include/configs/mx6_common.h | 6 |
4 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/include/asm/arch-mx6/mx6_plugin.S b/arch/arm/include/asm/arch-mx6/mx6_plugin.S index b7d1b20..02d855f 100644 --- a/arch/arm/include/asm/arch-mx6/mx6_plugin.S +++ b/arch/arm/include/asm/arch-mx6/mx6_plugin.S @@ -64,7 +64,7 @@ plugin_start: before_calling_rom___pu_irom_hwcnfg_setup: ldr r3, =ROM_VERSION_OFFSET ldr r4, [r3] -#if defined(CONFIG_MX6SOLO) || defined(CONFIG_MX6DL) +#if defined(CONFIG_MX6S) || defined(CONFIG_MX6DL) ldr r3, =ROM_VERSION_TO12 cmp r4, r3 ldrge r3, =ROM_API_TABLE_BASE_ADDR_MX6DL_TO12 diff --git a/board/freescale/mx6qsabreauto/plugin.S b/board/freescale/mx6qsabreauto/plugin.S index 30e1948..443e6e2 100644 --- a/board/freescale/mx6qsabreauto/plugin.S +++ b/board/freescale/mx6qsabreauto/plugin.S @@ -650,7 +650,7 @@ .endm .macro imx6_ddr_setting -#if defined (CONFIG_MX6SOLO) +#if defined (CONFIG_MX6S) imx6solosabreauto_ddr_setting #elif defined (CONFIG_MX6DL) imx6dlsabreauto_ddr_setting diff --git a/board/freescale/mx6sabresd/plugin.S b/board/freescale/mx6sabresd/plugin.S index a45487f..cf820bb 100644 --- a/board/freescale/mx6sabresd/plugin.S +++ b/board/freescale/mx6sabresd/plugin.S @@ -664,7 +664,7 @@ .endm .macro imx6_ddr_setting -#if defined (CONFIG_MX6SOLO) +#if defined (CONFIG_MX6S) imx6solosabresd_ddr_setting #elif defined (CONFIG_MX6DL) imx6dlsabresd_ddr_setting diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 0c3bc7d..138dd62 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -11,7 +11,7 @@ #ifndef CONFIG_MX6UL #define CONFIG_ARM_ERRATA_743622 #if (defined(CONFIG_MX6QP) || defined(CONFIG_MX6Q) ||\ -defined(CONFIG_MX6DL)) && !defined(CONFIG_MX6SOLO) +defined(CONFIG_MX6DL)) && !defined(CONFIG_MX6S) #define CONFIG_ARM_ERRATA_751472 #define CONFIG_ARM_ERRATA_794072 #define CONFIG_ARM_ERRATA_761320 @@ -32,6 +32,10 @@ defined(CONFIG_MX6DL)) && !defined(CONFIG_MX6SOLO) #define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_MXC_GPT_HCLK +#ifdef CONFIG_MX6S +#define CONFIG_MX6DL +#endif + #define CONFIG_SYS_BOOTM_LEN 0x1000000 #include <linux/sizes.h> |