summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2017-02-24 17:20:08 +0800
committerYe Li <ye.li@nxp.com>2017-04-05 14:04:39 +0800
commite974006f6ad9f40cb380f0790028ee161ed7c0b4 (patch)
tree22a66995050369dae61a4ada5e3b25f975f48c65 /arch/arm/include/asm
parentb93aa92e4f8cde26c3a14d860b2d29912c8029d8 (diff)
downloadu-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>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/arch-mx6/mx6_plugin.S2
1 files changed, 1 insertions, 1 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