summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-06-06 10:59:12 +0200
committerStefan Roese <sr@denx.de>2006-06-06 10:59:12 +0200
commit4526c87eeca107d5dba69a449b6c8bc68d1b2b35 (patch)
treedd6905593c093f25a5517ff8294783d1f6d7a7d8
parent2fd9eb509ddd557550214d472ec6170761e0c7d6 (diff)
downloadu-boot-imx-4526c87eeca107d5dba69a449b6c8bc68d1b2b35.zip
u-boot-imx-4526c87eeca107d5dba69a449b6c8bc68d1b2b35.tar.gz
u-boot-imx-4526c87eeca107d5dba69a449b6c8bc68d1b2b35.tar.bz2
Update PCS440EP port to fit into one flash device (incl. environment)
Patch by Stefan Roese, 06 Jun 2006
-rw-r--r--CHANGELOG3
-rw-r--r--board/pcs440ep/config.mk2
-rw-r--r--board/pcs440ep/pcs440ep.c2
-rw-r--r--board/pcs440ep/u-boot.lds22
-rw-r--r--include/configs/pcs440ep.h6
5 files changed, 11 insertions, 24 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0b783cb..c2b3180 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Update PCS440EP port to fit into one flash device (incl. environment)
+ Patch by Stefan Roese, 06 Jun 2006
+
* Add support for PCS440EP board
Patch by Stefan Roese, 02 Jun 2006
diff --git a/board/pcs440ep/config.mk b/board/pcs440ep/config.mk
index c39271c..319c4fa 100644
--- a/board/pcs440ep/config.mk
+++ b/board/pcs440ep/config.mk
@@ -30,7 +30,7 @@
ifeq ($(ramsym),1)
TEXT_BASE = 0xFBD00000
else
-TEXT_BASE = 0xFFF80000
+TEXT_BASE = 0xFFFA0000
endif
PLATFORM_CPPFLAGS += -DCONFIG_440=1
diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c
index b71caf2..8858f0a 100644
--- a/board/pcs440ep/pcs440ep.c
+++ b/board/pcs440ep/pcs440ep.c
@@ -137,7 +137,7 @@ int misc_init_r (void)
(void)flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1,
- &flash_info[0]);
+ &flash_info[1]);
return 0;
}
diff --git a/board/pcs440ep/u-boot.lds b/board/pcs440ep/u-boot.lds
index b3bac7c..6ab476a 100644
--- a/board/pcs440ep/u-boot.lds
+++ b/board/pcs440ep/u-boot.lds
@@ -63,24 +63,8 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- /* WARNING - the following is hand-optimized to fit within */
- /* the sector layout of our flash chips! XXX FIXME XXX */
-
cpu/ppc4xx/start.o (.text)
board/pcs440ep/init.o (.text)
- cpu/ppc4xx/kgdb.o (.text)
- cpu/ppc4xx/traps.o (.text)
- cpu/ppc4xx/interrupts.o (.text)
- cpu/ppc4xx/serial.o (.text)
- cpu/ppc4xx/cpu_init.o (.text)
- cpu/ppc4xx/speed.o (.text)
- common/dlmalloc.o (.text)
- lib_generic/crc32.o (.text)
- lib_ppc/extable.o (.text)
- lib_generic/zlib.o (.text)
-
-/* . = env_offset;*/
-/* common/environment.o(.text)*/
*(.text)
*(.fixup)
@@ -111,8 +95,8 @@ SECTIONS
_FIXUP_TABLE_ = .;
*(.fixup)
}
- __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2;
- __fixup_entries = (. - _FIXUP_TABLE_)>>2;
+ __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2;
+ __fixup_entries = (. - _FIXUP_TABLE_) >> 2;
.data :
{
@@ -131,7 +115,6 @@ SECTIONS
.u_boot_cmd : { *(.u_boot_cmd) }
__u_boot_cmd_end = .;
-
. = .;
__start___ex_table = .;
__ex_table : { *(__ex_table) }
@@ -152,6 +135,7 @@ SECTIONS
*(.bss)
*(COMMON)
}
+
_end = . ;
PROVIDE (end = .);
}
diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h
index 854809d..ec7a41b 100644
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -42,7 +42,7 @@
* Base addresses -- Note these are effective addresses where the
* actual resources get mapped (not physical addresses)
*----------------------------------------------------------------------*/
-#define CFG_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Monitor */
+#define CFG_MONITOR_LEN 0x60000 /* Reserve 384 kB for Monitor */
#define CFG_MALLOC_LEN (256 * 1024) /* Reserve 256 kB for malloc() */
#define CFG_MONITOR_BASE (-CFG_MONITOR_LEN)
#define CFG_SDRAM_BASE 0x00000000 /* _must_ be 0 */
@@ -160,8 +160,8 @@
"kernel_addr=fff00000\0" \
"ramdisk_addr=fff00000\0" \
"load=tftp 100000 /tftpboot/pcs440ep/u-boot.bin\0" \
- "update=protect off fff80000 ffffffff;era fff80000 ffffffff;" \
- "cp.b 100000 fff80000 80000;" \
+ "update=protect off fffa0000 ffffffff;era fffa0000 ffffffff;" \
+ "cp.b 100000 fffa0000 60000;" \
"setenv filesize;saveenv\0" \
"upd=run load;run update\0" \
""