arm: mx6: add support for i.MX6ULL

[karo-tx-uboot.git] / arch / arm / include / asm / arch-mx6 / mx6-ddr.h

diff --git a/arch/arm/include/asm/arch-mx6/mx6-ddr.h b/arch/arm/include/asm/arch-mx6/mx6-ddr.h
index 2a545c4fa0b08d07b8468f7ea9d1daa96705d37a..8004c67ae0fd9a172758ce1830c62a186eee4f24 100644 (file)
--- 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) || defined(CONFIG_SOC_MX6ULL)
 #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 */