PXA: Add necessary information for RELOC

[u-boot] / include / configs / vpac270.h

diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index 694a8f92c46fe414a9e1769de594cd42dae6392b..1bcd2f3e049ec2a29be251431e391807df1767c0 100644 (file)
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -45,7 +45,7 @@
        "if ide reset && fatload ide 0 0xa4000000 uImage; then "        \
                "bootm 0xa4000000; "                                    \
        "fi; "                                                          \
-       "bootm 0x40000;"
+       "bootm 0x60000;"
 #define        CONFIG_BOOTARGS                 "console=tty0 console=ttyS0,115200"
 #define        CONFIG_TIMESTAMP
 #define        CONFIG_BOOTDELAY                2       /* Autoboot delay */
@@ -146,8 +146,7 @@
 /*
  * Clock Configuration
  */
-#undef CONFIG_SYS_CLKS_IN_HZ
-#define        CONFIG_SYS_HZ                   3250000         /* Timer @ 3250000 Hz */
+#define        CONFIG_SYS_HZ                   1000            /* Timer @ 3250000 Hz */
 #define        CONFIG_SYS_CPUSPEED             0x190           /* 312MHz */
 
 /*
@@ -182,10 +181,19 @@
 #define        CONFIG_SYS_MEMTEST_END          0xa0800000      /* 4 ... 8 MB in DRAM */
 
 #define        CONFIG_SYS_LOAD_ADDR            (0x5c000000)
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define        CONFIG_SYS_INIT_SP_ADDR         \
+       (CONFIG_SYS_GBL_DATA_SIZE + CONFIG_STACKSIZE + PHYS_SDRAM_1)
 
 /*
  * NOR FLASH
  */
+#define        CONFIG_SYS_MONITOR_BASE         0x0
+#define        CONFIG_SYS_MONITOR_LEN          0x40000
+#define        CONFIG_ENV_ADDR                 \
+                       (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
+#define        CONFIG_ENV_SIZE                 0x4000
+
 #if    defined(CONFIG_CMD_FLASH)       /* NOR */
 #define        PHYS_FLASH_1                    0x00000000      /* Flash Bank #1 */
 
@@ -212,7 +220,16 @@
 #define        CONFIG_SYS_FLASH_PROTECTION             1
 
 #define        CONFIG_ENV_IS_IN_FLASH          1
-#define        CONFIG_ENV_SECT_SIZE            0x4000
+
+/*
+ * The first four sectors of the NOR flash are 0x8000 bytes big, the rest of the
+ * flash consists of 0x20000 bytes big sectors.
+ */
+#if    (CONFIG_ENV_ADDR <= 0x18000)
+#define        CONFIG_ENV_SECT_SIZE            0x8000
+#else
+#define        CONFIG_ENV_SECT_SIZE            0x20000
+#endif
 
 #elif  defined(CONFIG_CMD_ONENAND)     /* OneNAND */
 #define        CONFIG_SYS_NO_FLASH
@@ -226,12 +243,6 @@
 #define        CONFIG_SYS_ENV_IS_NOWHERE
 #endif
 
-#define        CONFIG_SYS_MONITOR_BASE         0x0
-#define        CONFIG_SYS_MONITOR_LEN          0x40000
-
-#define        CONFIG_ENV_ADDR                 0x40000
-#define        CONFIG_ENV_SIZE                 0x4000
-
 /*
  * IDE
  */