aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2014-05-20 17:02:56 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-06-11 02:31:21 -0400
commit94314290ed719cf64619dfc42df8f84161a36892 (patch)
tree5477c7313f987149506080ada5553f6f4f410f16 /arch
parentdd58a092c4202f2bd490adab7285b3ff77f8e467 (diff)
powerpc: Remove check for CONFIG_SERIAL_TEXT_DEBUG
The Kconfig symbol SERIAL_TEXT_DEBUG was removed from arch/powerpc/Kconfig.debug in v2.6.22. (In v2.6.27 it was also removed from arch/ppc/Kconfig.debug.) So the check for its macro has evaluated to false for over five years now. Remove that check and the few lines of code hidden behind it. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/head_40x.S19
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S
index 67ee0d6c1070..7d7d8635227a 100644
--- a/arch/powerpc/kernel/head_40x.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -930,25 +930,6 @@ initial_mmu:
930 tlbwe r4,r0,TLB_DATA /* Load the data portion of the entry */ 930 tlbwe r4,r0,TLB_DATA /* Load the data portion of the entry */
931 tlbwe r3,r0,TLB_TAG /* Load the tag portion of the entry */ 931 tlbwe r3,r0,TLB_TAG /* Load the tag portion of the entry */
932 932
933#if defined(CONFIG_SERIAL_TEXT_DEBUG) && defined(SERIAL_DEBUG_IO_BASE)
934
935 /* Load a TLB entry for the UART, so that ppc4xx_progress() can use
936 * the UARTs nice and early. We use a 4k real==virtual mapping. */
937
938 lis r3,SERIAL_DEBUG_IO_BASE@h
939 ori r3,r3,SERIAL_DEBUG_IO_BASE@l
940 mr r4,r3
941 clrrwi r4,r4,12
942 ori r4,r4,(TLB_WR|TLB_I|TLB_M|TLB_G)
943
944 clrrwi r3,r3,12
945 ori r3,r3,(TLB_VALID | TLB_PAGESZ(PAGESZ_4K))
946
947 li r0,0 /* TLB slot 0 */
948 tlbwe r4,r0,TLB_DATA
949 tlbwe r3,r0,TLB_TAG
950#endif /* CONFIG_SERIAL_DEBUG_TEXT && SERIAL_DEBUG_IO_BASE */
951
952 isync 933 isync
953 934
954 /* Establish the exception vector base 935 /* Establish the exception vector base