sbc8548: relocate 64MB user flash to sane boundary

[platform/kernel/u-boot.git] / board / sbc8548 / tlb.c

diff --git a/board/sbc8548/tlb.c b/board/sbc8548/tlb.c
index bb4c052..e9cedc7 100644 (file)
--- a/board/sbc8548/tlb.c
+++ b/board/sbc8548/tlb.c
@@ -46,12 +46,14 @@ struct fsl_e_tlb_entry tlb_table[] = {
 
        /*
         * TLB 0:       64M     Non-cacheable, guarded
-        * 0xfc000000   56M     8MB -> 64MB of user flash
+        * 0xfc000000   56M     unused
         * 0xff800000   8M      boot FLASH
+        *      .... or ....
+        * 0xfc000000   64M     user flash
+        *
         * Out of reset this entry is only 4K.
         */
-       SET_TLB_ENTRY(1, CONFIG_SYS_ALT_FLASH + 0x800000,
-                     CONFIG_SYS_ALT_FLASH + 0x800000,
+       SET_TLB_ENTRY(1, 0xfc000000, 0xfc000000,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
                      0, 0, BOOKE_PAGESZ_64M, 1),
 
@@ -103,21 +105,12 @@ struct fsl_e_tlb_entry tlb_table[] = {
                      0, 5, BOOKE_PAGESZ_16M, 1),
 
        /*
-        * TLB 6:       4M      Non-cacheable, guarded
-        * 0xfb800000   4M      1st 4MB block of 64MB user FLASH
+        * TLB 6:       64M     Non-cacheable, guarded
+        * 0xec000000   64M     64MB user FLASH
         */
        SET_TLB_ENTRY(1, CONFIG_SYS_ALT_FLASH, CONFIG_SYS_ALT_FLASH,
                      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-                     0, 6, BOOKE_PAGESZ_4M, 1),
-
-       /*
-        * TLB 7:       4M      Non-cacheable, guarded
-        * 0xfbc00000   4M      2nd 4MB block of 64MB user FLASH
-        */
-       SET_TLB_ENTRY(1, CONFIG_SYS_ALT_FLASH + 0x400000,
-                     CONFIG_SYS_ALT_FLASH + 0x400000,
-                     MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-                     0, 7, BOOKE_PAGESZ_4M, 1),
+                     0, 6, BOOKE_PAGESZ_64M, 1),
 
 };