diff options
| author | Stefan Roese <sr@denx.de> | 2007-12-29 09:23:11 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-12-29 09:23:11 +0100 |
| commit | feaa43f3a8f465cbf01ffa1b23b6b52431819a52 (patch) | |
| tree | 3ee393d421c72a882d27b1de5978a2a9befce062 /cpu/ppc4xx/start.S | |
| parent | 8697e6a19b10f514511b6a9c86de88bd108c4f8d (diff) | |
| parent | e174ac34adf5d5653df12bc3cf19c52063a71269 (diff) | |
| download | u-boot-imx-feaa43f3a8f465cbf01ffa1b23b6b52431819a52.zip u-boot-imx-feaa43f3a8f465cbf01ffa1b23b6b52431819a52.tar.gz u-boot-imx-feaa43f3a8f465cbf01ffa1b23b6b52431819a52.tar.bz2 | |
Merge branch 'for-1.3.2-ver2'
Conflicts:
cpu/ppc4xx/fdt.c
include/configs/kilauea.h
include/configs/sequoia.h
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'cpu/ppc4xx/start.S')
| -rw-r--r-- | cpu/ppc4xx/start.S | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/cpu/ppc4xx/start.S b/cpu/ppc4xx/start.S index f5a135f..52601ed 100644 --- a/cpu/ppc4xx/start.S +++ b/cpu/ppc4xx/start.S @@ -1356,7 +1356,11 @@ relocate_code: dccci 0,0 /* Invalidate data cache, now no longer our stack */ sync isync - addi r1,r0,0x0000 /* TLB entry #0 */ +#ifdef CFG_TLB_FOR_BOOT_FLASH + addi r1,r0,CFG_TLB_FOR_BOOT_FLASH /* Use defined TLB */ +#else + addi r1,r0,0x0000 /* Default TLB entry is #0 */ +#endif tlbre r0,r1,0x0002 /* Read contents */ ori r0,r0,0x0c00 /* Or in the inhibit, write through bit */ tlbwe r0,r1,0x0002 /* Save it out */ @@ -1490,16 +1494,25 @@ clear_bss: lwz r4,GOT(_end) cmplw 0, r3, r4 - beq 6f + beq 7f li r0, 0 -5: + + andi. r5, r4, 3 + beq 6f + sub r4, r4, r5 + mtctr r5 + mr r5, r4 +5: stb r0, 0(r5) + addi r5, r5, 1 + bdnz 5b +6: stw r0, 0(r3) addi r3, r3, 4 cmplw 0, r3, r4 - bne 5b -6: + bne 6b +7: mr r3, r9 /* Init Data pointer */ mr r4, r10 /* Destination Address */ bl board_init_r |