-#define CONFIG_IODELAY_RECALIBRATION
-
-/* MMC ENV related defines */
-#define CONFIG_SYS_MMC_ENV_DEV 1 /* eMMC */
-#define CONFIG_SYS_MMC_ENV_PART 0
-
-#define CONFIG_SYS_BOOTM_LEN SZ_64M
-
-#define CONFIG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */
-#define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
-#define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
-
-#define CONFIG_ENV_EEPROM_IS_ON_I2C
-#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
-
-#define CONFIG_SYS_OMAP_ABE_SYSCK
+#define CFG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */
+#define CFG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
+#define CFG_SYS_NS16550_COM3 UART3_BASE /* UART3 */