Merge branch 'master' of git://git.denx.de/u-boot-net

diff --git a/board/esd/ar405/config.mk b/board/esd/ar405/config.mk
index 3e8baf6..da7c107 100644 (file)
--- a/board/esd/ar405/config.mk
+++ b/board/esd/ar405/config.mk
@@ -20,11 +20,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
-
-#
-# esd AR405 boards
-#
-
-#TEXT_BASE = 0xFFFE0000
-#TEXT_BASE = 0xFFFD0000
-TEXT_BASE = 0xFFFC0000
+TEXT_BASE = 0xFFFA0000

diff --git a/board/esd/canbt/config.mk b/board/esd/canbt/config.mk
index 80076cd..ae855dc 100644 (file)
--- a/board/esd/canbt/config.mk
+++ b/board/esd/canbt/config.mk
@@ -20,10 +20,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
-
-#
-# esd ADCIOP boards
-#
-
-TEXT_BASE = 0xFFFE0000
-#TEXT_BASE = 0xFFFD0000
+TEXT_BASE = 0xFFFC0000

diff --git a/board/esd/pmc440/config.mk b/board/esd/pmc440/config.mk
index 91e65ec..6e9f735 100644 (file)
--- a/board/esd/pmc440/config.mk
+++ b/board/esd/pmc440/config.mk
@@ -23,7 +23,7 @@
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 ifndef TEXT_BASE
-TEXT_BASE = 0xFFFA0000
+TEXT_BASE = 0xFFF90000
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/sc3/config.mk b/board/sc3/config.mk
index 1bdf5e4..a46b197 100644 (file)
--- a/board/sc3/config.mk
+++ b/board/sc3/config.mk
@@ -21,4 +21,4 @@
 # MA 02111-1307 USA
 #
 
-TEXT_BASE = 0xFFFC0000
+TEXT_BASE = 0xFFFA0000

diff --git a/include/configs/AR405.h b/include/configs/AR405.h
index 52ead43..45c64c2 100644 (file)
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -175,9 +175,9 @@
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_FLASH_BASE          0xFFFC0000
-#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256 kB for Monitor   */
+#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE
+#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 
 /*
@@ -209,11 +209,11 @@
 #define CONFIG_SYS_FLASH_EMPTY_INFO            /* print 'E' for empty sector on flinfo */
 
 #define CONFIG_ENV_IS_IN_FLASH 1
-#define CONFIG_ENV_ADDR                0xFFFB0000      /* Address of Environment Sector*/
+#define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SECT_SIZE   0x10000 /* see README - env sector total size   */
 #define CONFIG_ENV_SIZE                0x04000         /* Size of Environment          */
 
-#define CONFIG_ENV_ADDR_REDUND     0xFFFA0000
+#define CONFIG_ENV_ADDR_REDUND  (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 /*

diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index cdba81d..115a6f9 100644 (file)
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -120,9 +120,9 @@
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_FLASH_BASE          0xFFFE0000
-#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_MONITOR_LEN         (128 * 1024)    /* Reserve 128 kB for Monitor   */
+#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_MONITOR_BASE
+#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 kB for malloc()  */
 
 /*

diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index c2fb56c..3c19f52 100644 (file)
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -53,7 +53,7 @@
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  *----------------------------------------------------------------------*/
-#define CONFIG_SYS_MONITOR_LEN         (384  * 1024)   /* Reserve 384 kB for Monitor   */
+#define CONFIG_SYS_MONITOR_LEN         (~(TEXT_BASE) + 1)
 #define CONFIG_SYS_MALLOC_LEN          (1024 * 1024)   /* Reserve 256 kB for malloc()  */
 
 #define CONFIG_PRAM            0       /* use pram variable to overwrite */
@@ -61,7 +61,7 @@
 #define CONFIG_SYS_BOOT_BASE_ADDR      0xf0000000
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE          0xfc000000      /* start of FLASH       */
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
 #define CONFIG_SYS_NAND_ADDR           0xd0000000      /* NAND Flash           */
 #define CONFIG_SYS_OCM_BASE            0xe0010000      /* ocm                  */
 #define CONFIG_SYS_OCM_DATA_ADDR       CONFIG_SYS_OCM_BASE
@@ -301,8 +301,8 @@
        "fdt_addr_r=800000\0"                                           \
        "fpga=fpga loadb 0 ${fpga_addr}\0"                              \
        "load=tftp 200000 /tftpboot/pmc440/u-boot.bin\0"                \
-       "update=protect off fffa0000 ffffffff;era fffa0000 ffffffff;"   \
-               "cp.b 200000 fffa0000 60000\0"                          \
+       "update=protect off fff90000 ffffffff;era fff90000 ffffffff;"   \
+               "cp.b 200000 fff90000 70000\0"                          \
        ""
 
 #define CONFIG_BOOTDELAY       3       /* autoboot after 3 seconds     */

diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 13a941e..23a859f 100644 (file)
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -278,15 +278,13 @@
        "load=tftp 200000 ${u-boot}\0"                                  \
        "update=protect off " xstr(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;"        \
                "era " xstr(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;"               \
-               "cp.b ${fileaddr} " xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize};" \
-               "setenv filesize;saveenv\0"                             \
+               "cp.b ${fileaddr} " xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize}" \
        "upd=run load update\0"                                         \
 
 #define CONFIG_AMCC_DEF_ENV_NAND_UPD                                   \
        "u-boot-nand=" xstr(CONFIG_HOSTNAME) "/u-boot-nand.bin\0"       \
        "nload=tftp 200000 ${u-boot-nand}\0"                            \
-       "nupdate=nand erase 0 100000;nand write 200000 0 100000;"       \
-               "setenv filesize;saveenv\0"                             \
+       "nupdate=nand erase 0 100000;nand write 200000 0 100000"        \
        "nupd=run nload nupdate\0"
 
 #endif /* __AMCC_COMMON_H */

diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 76e9a76..2a7ab8d 100644 (file)
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -53,13 +53,6 @@
 #define CONFIG_HOSTNAME                katmai
 #include "amcc-common.h"
 
-/*
- * For booting 256K-paged Linux we should have 16MB of memory
- * for Linux initial memory map
- */
-#undef CONFIG_SYS_BOOTMAPSZ
-#define CONFIG_SYS_BOOTMAPSZ   (16 << 20)
-
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_pre_init          */
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
@@ -188,11 +181,10 @@
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        CONFIG_AMCC_DEF_ENV                                             \
        CONFIG_AMCC_DEF_ENV_POWERPC                                     \
-       CONFIG_AMCC_DEF_ENV_PPC_OLD                                     \
        CONFIG_AMCC_DEF_ENV_NOR_UPD                                     \
-       "kernel_addr=fff10000\0"                                        \
-       "ramdisk_addr=fff20000\0"                                       \
-       "kozio=bootm ffc60000\0"                                        \
+       "kernel_addr=ff000000\0"                                        \
+       "fdt_addr=ff1e0000\0"                                           \
+       "ramdisk_addr=ff200000\0"                                       \
        "pciconfighost=1\0"                                             \
        "pcie_mode=RP:RP:RP\0"                                          \
        ""

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 61eb26e..19084ce 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -379,8 +379,9 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0xFFE00000
-#define CONFIG_SYS_MONITOR_BASE        0xFFFC0000     /* placed last 256k */
-#define CONFIG_SYS_MONITOR_LEN         (224 * 1024)    /* Reserve 224 KiB for Monitor  */
+
+#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* Start of U-Boot      */
+#define CONFIG_SYS_MONITOR_LEN         (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)    /* Reserve 128 KiB for malloc() */
 
 /*