-#if defined (CFG_AMD_BOOT)
-#define CFG_CS0_BASE 0xfff0
-#define CFG_CS0_MASK 0x00080000 /* 512 KB */
-#define CFG_CS0_CTRL 0x003f0d40
-
-#define CFG_CS1_BASE 0xfe00
-#define CFG_CS1_MASK 0x01000000 /* 16 MB */
-#define CFG_CS1_CTRL 0x003f1540
+#if defined (CONFIG_SYS_AMD_BOOT)
+#define CONFIG_SYS_CS0_BASE 0xfff0
+#define CONFIG_SYS_CS0_MASK 0x00080000 /* 512 KB */
+#define CONFIG_SYS_CS0_CTRL 0x003f0d40
+
+#define CONFIG_SYS_CS1_BASE 0xfe00
+#define CONFIG_SYS_CS1_MASK 0x01000000 /* 16 MB */
+#define CONFIG_SYS_CS1_CTRL 0x003f1540