powerpc: Initialize btext subsystem later, after prom_init

We were initializing the btext stuff from prom_init(), thus breaking
the rule that all communication between prom_init() and the rest of
the kernel has to be via the flattened device tree.  This removes
the btext initialization calls from prom_init() and initializes it
instead after the device tree is unflattened.  It would be nice to
do it earlier, but that needs some more infrastructure to find the
properties we need in the flattened device tree.

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 0 insertions, 28 deletions

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index d9b063f567e0..7ef9a3e3002b 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -153,9 +153,6 @@ __after_mmu_off:
         bl      flush_tlbs
 
         bl      initial_bats
-#if !defined(CONFIG_APUS) && defined(CONFIG_BOOTX_TEXT)
-        bl      setup_disp_bat
-#endif
 
 /*
  * Call setup_cpu for CPU 0 and initialize 6xx Idle
@@ -1297,31 +1294,6 @@ initial_bats:
         isync
         blr
 
-#if !defined(CONFIG_APUS) && defined(CONFIG_BOOTX_TEXT)
-setup_disp_bat:
-        /*
-         * setup the display bat prepared for us in prom.c
-         */
-        mflr    r8
-        bl      reloc_offset
-        mtlr    r8
-        addis   r8,r3,disp_BAT@ha
-        addi    r8,r8,disp_BAT@l
-        lwz     r11,0(r8)
-        lwz     r8,4(r8)
-        mfspr   r9,SPRN_PVR
-        rlwinm  r9,r9,16,16,31          /* r9 = 1 for 601, 4 for 604 */
-        cmpwi   0,r9,1
-        beq     1f
-        mtspr   SPRN_DBAT3L,r8
-        mtspr   SPRN_DBAT3U,r11
-        blr
-1:      mtspr   SPRN_IBAT3L,r8
-        mtspr   SPRN_IBAT3U,r11
-        blr
-
-#endif /* !defined(CONFIG_APUS) && defined(CONFIG_BOOTX_TEXT) */
-
 
 #ifdef CONFIG_8260
 /* Jump into the system reset for the rom.