*/
/* FIXME: This should be loaded from device tree... */
-#define CONFIG_SYS_PL310_BASE 0xa0412000
+#define CFG_SYS_PL310_BASE 0xa0412000
/* Linux does not boot if FDT / initrd is loaded to end of RAM */
#define BOOT_ENV \
#define BOOTCMD_ENV \
"fastbootcmd=echo '*** FASTBOOT MODE ***'; fastboot usb 0\0"
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
BOOT_ENV \
CONSOLE_ENV \
FASTBOOT_ENV \