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 f77a5fa..8d0311c 100644 (file)
--- a/include/configs/owl-common.h
+++ b/include/configs/owl-common.h
@@ -11,30 +11,16 @@
 #define _OWL_COMMON_CONFIG_H_
 
 /* SDRAM Definitions */
-#define CONFIG_SYS_SDRAM_BASE          0x0
-#define CONFIG_SYS_SDRAM_SIZE          0x80000000
-
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY              (24000000)      /* 24MHz */
-
-#define CONFIG_SYS_MALLOC_LEN          (32 * 1024 * 1024)
+#define CFG_SYS_SDRAM_BASE             0x0
 
 /* Some commands use this as the default load address */
-#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x7ffc0)
 
 /*
  * This is the initial SP which is used only briefly for relocating the u-boot
  * 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)
-
-/* UART Definitions */
-#define CONFIG_BAUDRATE                        115200
 
 /* Console configuration */
-#define CONFIG_SYS_CBSIZE              1024    /* Console buffer size */
-#define CONFIG_SYS_MAXARGS             64
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
 #endif