}
#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)
#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 */
#ifndef __ASM_ARCH_MX6UL_DDR_H__
#define __ASM_ARCH_MX6UL_DDR_H__
-#ifndef CONFIG_MX6UL
+#ifndef CONFIG_SOC_MX6UL
#error "wrong CPU"
#endif
#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
#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