From cde758a8bec3c21e1cf653ce5803417a88a9e5d2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= <LW@KARO-electronics.de>
Date: Mon, 12 Oct 2015 10:40:51 +0200
Subject: [PATCH] arm: mx6: rename some missed instances of CONFIG_MX6* to
 CONFIG_SOC_MX6*

---
 arch/arm/cpu/armv7/mx6/ddr.c              |  2 +-
 arch/arm/include/asm/arch-mx6/mx6-ddr.h   | 14 ++++----------
 arch/arm/include/asm/arch-mx6/mx6ul-ddr.h |  2 +-
 include/configs/mx6_common.h              |  4 ++--
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/arch/arm/cpu/armv7/mx6/ddr.c b/arch/arm/cpu/armv7/mx6/ddr.c
index 135256a969..9080d11764 100644
--- a/arch/arm/cpu/armv7/mx6/ddr.c
+++ b/arch/arm/cpu/armv7/mx6/ddr.c
@@ -71,7 +71,7 @@ void mx6sx_dram_iocfg(unsigned width,
 }
 #endif
 
-#ifdef CONFIG_MX6UL
+#ifdef CONFIG_SOC_MX6UL
 void mx6ul_dram_iocfg(unsigned width,
 		      const struct mx6ul_iomux_ddr_regs *ddr,
 		      const struct mx6ul_iomux_grp_regs *grp)
diff --git a/arch/arm/include/asm/arch-mx6/mx6-ddr.h b/arch/arm/include/asm/arch-mx6/mx6-ddr.h
index 2a545c4fa0..4717a9469d 100644
--- a/arch/arm/include/asm/arch-mx6/mx6-ddr.h
+++ b/arch/arm/include/asm/arch-mx6/mx6-ddr.h
@@ -9,21 +9,15 @@
 #ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_SOC_MX6Q
 #include "mx6q-ddr.h"
-#else
-#if defined(CONFIG_SOC_MX6DL) || defined(CONFIG_SOC_MX6S)
+#elif defined(CONFIG_SOC_MX6DL) || defined(CONFIG_SOC_MX6S)
 #include "mx6dl-ddr.h"
-#else
-#ifdef CONFIG_SOC_MX6SX
+#elif defined(CONFIG_SOC_MX6SX)
 #include "mx6sx-ddr.h"
-#else
-#ifdef CONFIG_SOC_MX6UL
+#elif defined(CONFIG_SOC_MX6UL)
 #include "mx6ul-ddr.h"
 #else
 #error "Please select cpu"
-#endif	/* CONFIG_SOC_MX6UL */
-#endif	/* CONFIG_SOC_MX6SX */
-#endif	/* CONFIG_SOC_MX6DL or CONFIG_SOC_MX6S */
-#endif	/* CONFIG_SOC_MX6Q */
+#endif
 #else
 
 /* MMDC P0/P1 Registers */
diff --git a/arch/arm/include/asm/arch-mx6/mx6ul-ddr.h b/arch/arm/include/asm/arch-mx6/mx6ul-ddr.h
index ed11c4bb4d..13e6263e10 100644
--- a/arch/arm/include/asm/arch-mx6/mx6ul-ddr.h
+++ b/arch/arm/include/asm/arch-mx6/mx6ul-ddr.h
@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_MX6UL_DDR_H__
 #define __ASM_ARCH_MX6UL_DDR_H__
 
-#ifndef CONFIG_MX6UL
+#ifndef CONFIG_SOC_MX6UL
 #error "wrong CPU"
 #endif
 
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 36eaa42bfb..740b81272b 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -17,7 +17,7 @@
 #ifndef __MX6_COMMON_H
 #define __MX6_COMMON_H
 
-#ifndef CONFIG_MX6UL
+#ifndef CONFIG_SOC_MX6UL
 #define CONFIG_ARM_ERRATA_743622
 #define CONFIG_ARM_ERRATA_751472
 #define CONFIG_ARM_ERRATA_794072
@@ -56,7 +56,7 @@
 #define CONFIG_REVISION_TAG
 
 /* Boot options */
-#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL) || defined(CONFIG_MX6UL))
+#if (defined(CONFIG_SOC_MX6SX) || defined(CONFIG_SOC_MX6SL) || defined(CONFIG_SOC_MX6UL))
 #define CONFIG_LOADADDR		0x82000000
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE	0x87800000
-- 
2.39.2