E500 update: repoint IVPR to RAM when code is relocated

Patch by Kylo Ginsberg, 13 Apr 2005

diff --git a/CHANGELOG b/CHANGELOG
index 1aec75d9531cf7b686f6bcaa29cbd51fb0a2d3df..2b446015de87a807d288958f59a3e465dc85026e 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* E500 update: repoint IVPR to RAM when code is relocated
+  Patch by Kylo Ginsberg, 13 Apr 2005
+
 * Fix loop end test in lib_generic/string.c:strswab()
   Patch by Andrew Dyer, October 10, 2005
   Signed-off-by: Andrew Dyer <amdyer@gmail.com>

diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S
index 5f75bc1aff9e69175671616261acb0489bc87fb9..2f2bd3ad52a0ef37141e24c4f7bfe3ba3dc03e9f 100644 (file)
--- a/cpu/mpc85xx/start.S
+++ b/cpu/mpc85xx/start.S
@@ -995,6 +995,11 @@ relocate_code:
 7:     sync                    /* Wait for all icbi to complete on bus */
        isync
 
+       /*
+        * Re-point the IVPR at RAM
+        */
+       mtspr   IVPR,r10
+       
 /*
  * We are done. Do not return, instead branch to second part of board
  * initialization, now running from RAM.

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index d1e294f23be69ca5dbc6baf5bcf14c2c64fe6c01..b1c6ab0e4ec3987b3783b1bd58f60ae5f138e2eb 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -429,6 +429,10 @@ void board_init_f (ulong bootflag)
         */
        addr -= len;
        addr &= ~(4096 - 1);
+#ifdef CONFIG_E500
+       /* round down to next 64 kB limit so that IVPR stays aligned */
+       addr &= ~(65536 - 1);
+#endif
 
        debug ("Reserving %ldk for U-Boot at: %08lx\n", len >> 10, addr);