#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 */