#include <configs/aspeed-common.h>
-#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE
+#define CFG_SYS_UBOOT_BASE CONFIG_TEXT_BASE
/* Misc */
#define STR_HELPER(s) #s
#define STR(s) STR_HELPER(s)
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
"loadaddr=" STR(CONFIG_SYS_LOAD_ADDR) "\0" \
"bootspi=fdt addr 20100000 && fdt header get fitsize totalsize && " \
"cp.b 20100000 ${loadaddr} ${fitsize} && bootm; " \