-#define CONFIG_SYS_I2C_LEGACY
-#define CONFIG_SYS_I2C_FSL
-#define CONFIG_SYS_FSL_I2C_SPEED 80000
-#define CONFIG_SYS_FSL_I2C_SLAVE 0x7F
-#define CONFIG_SYS_FSL_I2C_OFFSET 0x00000300
-#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
-#define CONFIG_SYS_I2C_PINMUX_REG (gpio_reg->par_feci2c)
-#define CONFIG_SYS_I2C_PINMUX_CLR (0xFFF0)
-#define CONFIG_SYS_I2C_PINMUX_SET (0x000F)
-
-#define CONFIG_SYS_LOAD_ADDR 0x800000
-
-#define CONFIG_BOOTCOMMAND "bootm ffe40000"
+#define CFG_SYS_I2C_PINMUX_REG (gpio_reg->par_feci2c)
+#define CFG_SYS_I2C_PINMUX_CLR (0xFFF0)
+#define CFG_SYS_I2C_PINMUX_SET (0x000F)