summaryrefslogtreecommitdiffstats
path: root/board/ixdp425
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-02-08 19:38:38 +0000
committerwdenk <wdenk>2004-02-08 19:38:38 +0000
commitf6e20fc6ca5a45316f94743d8b60dce4d9766bc8 (patch)
treecdea7c7227b937ff231d98e50e64b6fa447bacda /board/ixdp425
parentf4863a7aec41f1f78fe93eade700b15b287a5ef7 (diff)
downloadtalos-obmc-uboot-f6e20fc6ca5a45316f94743d8b60dce4d9766bc8.tar.gz
talos-obmc-uboot-f6e20fc6ca5a45316f94743d8b60dce4d9766bc8.zip
Patch by Anders Larsen, 09 Jan 2004:
ARM memory layout fixes: the abort-stack is now set up in the correct RAM area, and the BSS is zeroed out as it should be. Furthermore, the magic variables 'armboot_end' and 'armboot_end_data' of the linker scripts are replaced by '__bss_start' and '_end', resp., which is a further step to eliminate unnecessary differences between the implementation of the CPU architectures.
Diffstat (limited to 'board/ixdp425')
-rw-r--r--board/ixdp425/config.mk2
-rw-r--r--board/ixdp425/flash.c4
-rw-r--r--board/ixdp425/u-boot.lds8
3 files changed, 5 insertions, 9 deletions
diff --git a/board/ixdp425/config.mk b/board/ixdp425/config.mk
index 6bbb9a828b..9f616f3580 100644
--- a/board/ixdp425/config.mk
+++ b/board/ixdp425/config.mk
@@ -1,2 +1,2 @@
#TEXT_BASE = 0x00100000
-TEXT_BASE = 0x00f00000
+TEXT_BASE = 0x00f80000
diff --git a/board/ixdp425/flash.c b/board/ixdp425/flash.c
index bd3a7055f8..1d958c8c19 100644
--- a/board/ixdp425/flash.c
+++ b/board/ixdp425/flash.c
@@ -72,7 +72,7 @@ unsigned long flash_init (void)
flash_get_offsets (PHYS_FLASH_1, &flash_info[i]);
break;
default:
- panic ("configured to many flash banks!\n");
+ panic ("configured too many flash banks!\n");
break;
}
size += flash_info[i].size;
@@ -82,7 +82,7 @@ unsigned long flash_init (void)
*/
flash_protect (FLAG_PROTECT_SET,
CFG_FLASH_BASE,
- CFG_FLASH_BASE + _armboot_end_data - _armboot_start,
+ CFG_FLASH_BASE + _bss_start - _armboot_start,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
diff --git a/board/ixdp425/u-boot.lds b/board/ixdp425/u-boot.lds
index cd44eb9062..91ef0302b3 100644
--- a/board/ixdp425/u-boot.lds
+++ b/board/ixdp425/u-boot.lds
@@ -48,12 +48,8 @@ SECTIONS
.u_boot_cmd : { *(.u_boot_cmd) }
__u_boot_cmd_end = .;
- armboot_end_data = .;
-
. = ALIGN(4);
- bss_start = .;
+ __bss_start = .;
.bss : { *(.bss) }
- bss_end = .;
-
- armboot_end = .;
+ _end = .;
}
OpenPOWER on IntegriCloud