-#define CFG_IDE_MAXDEVICE 1
-#define CFG_MARUBUN_MRSHPC 0xb83fffe0
-#define CFG_MARUBUN_MW1 0xb8400000
-#define CFG_MARUBUN_MW2 0xb8500000
-#define CFG_MARUBUN_IO 0xb8600000
-
-#define CFG_PIO_MODE 1
-#define CFG_IDE_MAXBUS 1
+#define CONFIG_SYS_IDE_MAXDEVICE 1
+#define CONFIG_SYS_MARUBUN_MRSHPC 0xb83fffe0
+#define CONFIG_SYS_MARUBUN_MW1 0xb8400000
+#define CONFIG_SYS_MARUBUN_MW2 0xb8500000
+#define CONFIG_SYS_MARUBUN_IO 0xb8600000
+
+#define CONFIG_SYS_PIO_MODE 1
+#define CONFIG_SYS_IDE_MAXBUS 1