Merge branch 'master' into next

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

diff --git a/include/configs/owl-common.h b/include/configs/owl-common.h
index 0372bd7..8d0311c 100644 (file)
--- a/include/configs/owl-common.h
+++ b/include/configs/owl-common.h
@@ -11,7 +11,7 @@
 #define _OWL_COMMON_CONFIG_H_
 
 /* SDRAM Definitions */
-#define CONFIG_SYS_SDRAM_BASE          0x0
+#define CFG_SYS_SDRAM_BASE             0x0
 
 /* Some commands use this as the default load address */
 
@@ -20,7 +20,6 @@
  * image to the top of SDRAM. After relocation u-boot moves the stack to the
  * proper place.
  */
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE + 0x7ff00)
 
 /* Console configuration */