Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94314290 authored by Paul Bolle's avatar Paul Bolle Committed by Benjamin Herrenschmidt
Browse files

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: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent dd58a092

arch/powerpc/kernel/head_40x.S

+0 −19
Original line number Diff line number Diff line
@@ -930,25 +930,6 @@ initial_mmu: 
	tlbwe	r4,r0,TLB_DATA		/* Load the data portion of the entry */

	tlbwe	r3,r0,TLB_TAG		/* Load the tag portion of the entry */



#if defined(CONFIG_SERIAL_TEXT_DEBUG) && defined(SERIAL_DEBUG_IO_BASE)



	/* Load a TLB entry for the UART, so that ppc4xx_progress() can use

	 * the UARTs nice and early.  We use a 4k real==virtual mapping. */



	lis	r3,SERIAL_DEBUG_IO_BASE@h

	ori	r3,r3,SERIAL_DEBUG_IO_BASE@l

	mr	r4,r3

	clrrwi	r4,r4,12

	ori	r4,r4,(TLB_WR|TLB_I|TLB_M|TLB_G)



	clrrwi	r3,r3,12

	ori	r3,r3,(TLB_VALID | TLB_PAGESZ(PAGESZ_4K))



	li	r0,0			/* TLB slot 0 */

	tlbwe	r4,r0,TLB_DATA

	tlbwe	r3,r0,TLB_TAG

#endif /* CONFIG_SERIAL_DEBUG_TEXT && SERIAL_DEBUG_IO_BASE */



	isync



	/* Establish the exception vector base