[PATCH 4/5] Removing dead CONFIG_SERIAL_TEXT_DEBUG

2010-06-09 Thread Christoph Egger
CONFIG_SERIAL_TEXT_DEBUG doesn't exist in Kconfig, therefore removing all
references for it from the source code.

Signed-off-by: Christoph Egger sicce...@cs.fau.de
---
 arch/powerpc/kernel/head_40x.S |   19 ---
 1 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S
index a90625f..1a10e4d 100644
--- a/arch/powerpc/kernel/head_40x.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -939,25 +939,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_b...@h
-   ori r3,r3,serial_debug_io_b...@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
-- 
1.6.3.3

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev


Re: [PATCH 4/5] Removing dead CONFIG_SERIAL_TEXT_DEBUG

2010-06-09 Thread Josh Boyer
On Wed, Jun 09, 2010 at 12:00:46PM +0200, Christoph Egger wrote:
CONFIG_SERIAL_TEXT_DEBUG doesn't exist in Kconfig, therefore removing all
references for it from the source code.

Signed-off-by: Christoph Egger sicce...@cs.fau.de

It would be better to conver this to work with CONFIG_PPC_EARLY_DEBUG and
CONFIG_PPC_EARLY_DEBUG_40x.  I'd rather just leave this for now until we can
get it switched over.

josh

---
 arch/powerpc/kernel/head_40x.S |   19 ---
 1 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S
index a90625f..1a10e4d 100644
--- a/arch/powerpc/kernel/head_40x.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -939,25 +939,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_b...@h
-  ori r3,r3,serial_debug_io_b...@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
-- 
1.6.3.3

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev