summaryrefslogtreecommitdiff
path: root/cpu/ppc4xx
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-05-22 22:52:13 +0000
committerwdenk <wdenk>2003-05-22 22:52:13 +0000
commit5d232d0e7ea982d859d028ab482d95eb68460b19 (patch)
treea02c773fa4be5687f8f97d053ebd9afebbfaa54f /cpu/ppc4xx
parentc8c3a8be2dd09e51d7dc33f431e3a638ac5688f2 (diff)
downloadu-boot-imx-5d232d0e7ea982d859d028ab482d95eb68460b19.zip
u-boot-imx-5d232d0e7ea982d859d028ab482d95eb68460b19.tar.gz
u-boot-imx-5d232d0e7ea982d859d028ab482d95eb68460b19.tar.bz2
* Patch by Dave Ellis, 22 May 2003:
Fix problem with only partially cleared .bss segment * Patch by Rune Torgersen, 12 May 2003: get PCI to work on a MPC8266ADS board; incorporate change to cpu/mpc8260/pci.c to enable overrides of PCI memory parameters
Diffstat (limited to 'cpu/ppc4xx')
-rw-r--r--cpu/ppc4xx/spd_sdram.c2
-rw-r--r--cpu/ppc4xx/start.S4
2 files changed, 3 insertions, 3 deletions
diff --git a/cpu/ppc4xx/spd_sdram.c b/cpu/ppc4xx/spd_sdram.c
index bf5d224..9c1cac5 100644
--- a/cpu/ppc4xx/spd_sdram.c
+++ b/cpu/ppc4xx/spd_sdram.c
@@ -289,7 +289,7 @@ long int spd_sdram(int(read_spd)(uint addr))
/* now check for ECC ability of module. We only support ECC
* on 32 bit wide devices with 8 bit ECC.
*/
- if ( (read_spd(11)==2) && ((read_spd(6)==40) || (read_spd(14)==8)) ){
+ if ( (read_spd(11)==2) && (read_spd(6)==40) && (read_spd(14)==8) ){
sdram0_ecccfg=0xf<<SDRAM0_ECCCFG_SHIFT;
ecc_on = 1;
}
diff --git a/cpu/ppc4xx/start.S b/cpu/ppc4xx/start.S
index c40a8db..c334f93 100644
--- a/cpu/ppc4xx/start.S
+++ b/cpu/ppc4xx/start.S
@@ -133,7 +133,7 @@
GOT_ENTRY(transfer_to_handler)
GOT_ENTRY(_end)
- GOT_ENTRY(.bss)
+ GOT_ENTRY(__bss_start)
END_GOT
/*
@@ -1339,7 +1339,7 @@ clear_bss:
/*
* Now clear BSS segment
*/
- lwz r3,GOT(.bss)
+ lwz r3,GOT(__bss_start)
lwz r4,GOT(_end)
cmplw 0, r3, r4