summaryrefslogtreecommitdiff
path: root/include
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 /include
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 'include')
-rw-r--r--include/configs/mx6_common.h6
1 files changed, 5 insertions, 1 deletions
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>