Remove remnants of obsolete CONFIG_SYS_GBL_DATA_SIZE comments

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

diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
index f67cf06..dfab0f4 100644 (file)
--- a/include/configs/a320evb.h
+++ b/include/configs/a320evb.h
@@ -32,6 +32,11 @@
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 
 /*-----------------------------------------------------------------------
+ * Power Management Unit
+ */
+#define CONFIG_FTPMU010_POWER
+
+/*-----------------------------------------------------------------------
  * Timer
  */
 #define CONFIG_SYS_HZ          1000    /* timer ticks per second */
@@ -108,10 +113,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128 * 1024)
 
 /*-----------------------------------------------------------------------
- * size in bytes reserved for initial data
-*/
-
-/*-----------------------------------------------------------------------
  * SDRAM controller configuration
  */
 #define CONFIG_SYS_FTSDMC020_TP0       (FTSDMC020_TP0_TRAS(2) |        \
@@ -138,21 +139,28 @@
 #define PHYS_SDRAM_1           0x10000000      /* SDRAM Bank #1 */
 #define PHYS_SDRAM_1_SIZE      0x04000000      /* 64 MB */
 
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + 0x1000 - \
+                                       GENERATED_GBL_DATA_SIZE)
+
 /*
  * Load address and memory test area should agree with
  * board/faraday/a320/config.mk. Be careful not to overwrite U-boot itself.
  */
-#define CONFIG_SYS_LOAD_ADDR           0x12000000
+#define CONFIG_SYS_LOAD_ADDR           (PHYS_SDRAM_1 + 0x2000000)
 
 /* memtest works on 63 MB in DRAM */
-#define CONFIG_SYS_MEMTEST_START       0x10000000
-#define CONFIG_SYS_MEMTEST_END         0x13F00000
+#define CONFIG_SYS_MEMTEST_START       PHYS_SDRAM_1
+#define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_1 + 0x3F00000)
+
+#define CONFIG_SYS_TEXT_BASE           0
 
 /*-----------------------------------------------------------------------
  * Static memory controller configuration
  */
 
-#include <asm/arch/ftsmc020.h>
+#define CONFIG_FTSMC020
+#include <faraday/ftsmc020.h>
 
 #define FTSMC020_BANK0_CONFIG  (FTSMC020_BANK_ENABLE             |     \
                                 FTSMC020_BANK_BASE(PHYS_FLASH_1) |     \
@@ -215,7 +223,7 @@
 
 /* environments */
 #define CONFIG_ENV_IS_IN_FLASH
-#define CONFIG_ENV_ADDR                        0x00060000
+#define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0x60000)
 #define CONFIG_ENV_SIZE                        0x20000
 
 #endif /* __CONFIG_H */