-#define CFG_FLASH_BASE 0xff800000
-#define CFG_MAX_FLASH_BANKS 1
-#define CFG_MAX_FLASH_SECT 64
-#define CFG_FLASH_SIZE 8
-#undef CFG_FLASH_16BIT
-#define CFG_FLASH_ERASE_TOUT 240000
-#define CFG_FLASH_WRITE_TOUT 500
-#define CFG_FLASH_LOCK_TOUT 500
-#define CFG_FLASH_UNLOCK_TOUT 10000
-#define CFG_FLASH_PROTECTION
+#define CONFIG_SYS_FLASH_BASE 0xff800000
+#define CONFIG_SYS_MAX_FLASH_BANKS 1
+#define CONFIG_SYS_MAX_FLASH_SECT 64
+#define CONFIG_SYS_FLASH_SIZE 8
+#undef CONFIG_SYS_FLASH_16BIT
+#define CONFIG_SYS_FLASH_ERASE_TOUT 240000
+#define CONFIG_SYS_FLASH_WRITE_TOUT 500
+#define CONFIG_SYS_FLASH_LOCK_TOUT 500
+#define CONFIG_SYS_FLASH_UNLOCK_TOUT 10000
+#define CONFIG_SYS_FLASH_PROTECTION