diff options
| author | Wolfgang Denk <[email protected]> | 2010-11-30 21:15:25 +0100 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2010-11-30 21:15:25 +0100 |
| commit | a7bf3ecc71003f15470aeea43477be15bb15054e (patch) | |
| tree | 71ce3ea95c4f7c25b9f0011946d5b2581c9f0766 /arch | |
| parent | bb7fc5744dd696552092cee571041d7df3128dbe (diff) | |
| parent | e45c98ad35ca600e25e9264528e7b6be17969f8c (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/start.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index 515be4c871b..460ac9aabb9 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -1158,6 +1158,10 @@ map_flash_by_law1: bne 1b stw r4, LBLAWAR1(r3) /* LBLAWAR1 <= 8MB Flash Size */ + /* Wait for HW to catch up */ + lwz r4, LBLAWAR1(r3) + twi 0,r4,0 + isync blr /* Though all the LBIU Local Access Windows and LBC Banks will be @@ -1196,5 +1200,9 @@ remap_flash_by_law0: xor r4, r4, r4 stw r4, LBLAWBAR1(r3) stw r4, LBLAWAR1(r3) /* Off LBIU LAW1 */ + /* Wait for HW to catch up */ + lwz r4, LBLAWAR1(r3) + twi 0,r4,0 + isync blr #endif /* CONFIG_SYS_FLASHBOOT */ |