From: Matthias Fuchs Date: Mon, 26 Jul 2010 15:17:53 +0000 (+0200) Subject: ppc4xx: Fix building of PMC440 board X-Git-Tag: v2010.09-rc1~32 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5baefbba382854ed824ee381796174a7401362fa;p=u-boot ppc4xx: Fix building of PMC440 board Update image size and default environment after addition of new environment handling. Signed-off-by: Matthias Fuchs Signed-off-by: Stefan Roese --- diff --git a/board/esd/pmc440/config.mk b/board/esd/pmc440/config.mk index 91e65ec8a9..6e9f735f42 100644 --- 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/include/configs/PMC440.h b/include/configs/PMC440.h index c2fb56c6f9..3c19f52d9c 100644 --- 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 */