Merge with /home/m8/git/u-boot

[oweals/u-boot.git] / include / configs / suzaku.h

diff --git a/include/configs/suzaku.h b/include/configs/suzaku.h
index 5c5cdf48a63cab66164f91b441e1dba39e6a8727..1ee6be174fe326c3b6a92bfb2a9f05e924f88024 100644 (file)
--- a/include/configs/suzaku.h
+++ b/include/configs/suzaku.h
@@ -25,18 +25,12 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/*
- * If we are developing, we might want to start armboot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL           /* undef for developing */
-
 /*
  * High Level Configuration Options
  * (easy to change)
  */
 
-#define CONFIG_MICROBLZE       1       /* This is an MicroBlaze CPU    */
+#define CONFIG_MICROBLAZE      1       /* This is an MicroBlaze CPU    */
 #define CONFIG_SUZAKU          1       /* on an SUZAKU Board           */
 
 /*-----------------------------------------------------------------------
@@ -47,6 +41,7 @@
 #define CFG_SDRAM_BASE         0x80000000
 #define CFG_SDRAM_SIZE         0x01000000
 #define CFG_FLASH_BASE         0xfff00000
+#define CFG_FLASH_SIZE         0x00400000
 #define CFG_RESET_ADDRESS      0xfff00100
 #define CFG_MONITOR_LEN                (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CFG_MONITOR_BASE        (CFG_SDRAM_BASE + CFG_SDRAM_SIZE - (1024 * 1024))
@@ -87,4 +82,14 @@
 #define        CFG_ENV_SIZE            0x10000 /* Total Size of Environment Sector     */
 #define CFG_ENV_SECT_SIZE      0x10000 /* see README - env sector total size   */
 
+/*-----------------------------------------------------------------------
+ * Definitions for initial stack pointer and data area (in DPRAM)
+ */
+
+#define CFG_INIT_RAM_ADDR      0x80000000      /* inside of SDRAM */
+#define CFG_INIT_RAM_END       0x2000          /* End of used area in RAM */
+#define CFG_GBL_DATA_SIZE      128             /* size in bytes reserved for initial data */
+#define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
+#define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
+
 #endif /* __CONFIG_H */