* Includes
*/
-#if defined(CONFIG_MX23) && defined(CONFIG_MX28)
-#error Select either CONFIG_MX23 or CONFIG_MX28 , never both!
-#elif !defined(CONFIG_MX23) && !defined(CONFIG_MX28)
-#error Select one of CONFIG_MX23 or CONFIG_MX28 !
+#if defined(CONFIG_SOC_MX23) && defined(CONFIG_SOC_MX28)
+#error Select either CONFIG_SOC_MX23 or CONFIG_SOC_MX28 , never both!
+#elif !defined(CONFIG_SOC_MX23) && !defined(CONFIG_SOC_MX28)
+#error Select one of CONFIG_SOC_MX23 or CONFIG_SOC_MX28 !
#endif
#include <asm/arch/regs-base.h>
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
#include <asm/arch/iomux-mx23.h>
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
#include <asm/arch/iomux-mx28.h>
#endif
/* OCRAM at 0x0 ; 32kB on MX23 ; 128kB on MX28 */
#define CONFIG_SYS_INIT_RAM_ADDR 0x00000000
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
#define CONFIG_SYS_INIT_RAM_SIZE (32 * 1024)
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
#define CONFIG_SYS_INIT_RAM_SIZE (128 * 1024)
#endif
/* I2C */
#ifdef CONFIG_CMD_I2C
-#define CONFIG_I2C_MXS
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXS
#define CONFIG_HARD_I2C
#ifndef CONFIG_SYS_I2C_SPEED
#define CONFIG_SYS_I2C_SPEED 400000