Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / evb_ast2500.h

diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h
index dc032c1..f304929 100644 (file)
--- a/include/configs/evb_ast2500.h
+++ b/include/configs/evb_ast2500.h
@@ -11,6 +11,10 @@
 
 #include <configs/aspeed-common.h>
 
-#define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE
+#define CFG_SYS_UBOOT_BASE             CONFIG_TEXT_BASE
+
+/* Misc */
+#define CFG_EXTRA_ENV_SETTINGS \
+       ""
 
 #endif /* __CONFIG_H */