[ARM PATCH] 2247/1: S3C2410 - serial low-level updates

Patch from Ben Dooks

Move the configuration for the UART to use for the low-level
messages generated by the uncompressor out of the kernel debug
section, which means the system builds properly without having
kernel debug enabled.

Also remove the use of including <config/xxx.h> headers,
and the default configuration updates

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

arch/arm/boot/compressed/head.S

@@ -118,10 +118,9 @@
 		str	\rb, [r3, #0]
 		.endm
 #elif defined(CONFIG_ARCH_S3C2410)
-#include <config/debug/s3c2410/port.h>
 			.macro loadsp, rb
 		mov	\rb, #0x50000000
-		add	\rb, \rb, #0x4000 * CONFIG_DEBUG_S3C2410_UART
+		add	\rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT
 		.endm
 		.macro	writeb, rb
 		strb	\rb, [r3, #0x20]

arch/arm/configs/bast_defconfig

 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.10-rc2
-# Mon Nov 15 12:14:56 2004
+# Mon Nov 15 15:32:48 2004
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -97,6 +97,7 @@ CONFIG_S3C2410_DMA=y
 # CONFIG_S3C2410_DMA_DEBUG is not set
 # CONFIG_S3C2410_PM_DEBUG is not set
 # CONFIG_S3C2410_PM_CHECK is not set
+CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
 
 #
 # Processor Type

arch/arm/configs/s3c2410_defconfig

 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.10-rc2
-# Mon Nov 15 12:26:18 2004
+# Mon Nov 15 15:29:42 2004
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -98,6 +98,7 @@ CONFIG_S3C2410_DMA=y
 # CONFIG_S3C2410_DMA_DEBUG is not set
 # CONFIG_S3C2410_PM_DEBUG is not set
 # CONFIG_S3C2410_PM_CHECK is not set
+CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
 
 #
 # Processor Type

include/asm-arm/arch-s3c2410/uncompress.h

@@ -14,12 +14,13 @@
  *  08-Sep-2003 BJD  Moved to linux v2.6
  *  12-Mar-2004 BJD  Updated header protection
  *  12-Oct-2004 BJD  Take account of debug uart configuration
+ *  15-Nov-2004 BJD  Fixed uart configuration
 */
 
 #ifndef __ASM_ARCH_UNCOMPRESS_H
 #define __ASM_ARCH_UNCOMPRESS_H
 
-#include <config/debug/s3c2410/port.h>
+#include <linux/config.h>
 
 /* defines for UART registers */
 #include "asm/arch/regs-serial.h"
@@ -34,11 +35,7 @@
 /* how many bytes we allow into the FIFO at a time in FIFO mode */
 #define FIFO_MAX	 (14)
 
-#if 1
-#define uart_base S3C2410_PA_UART + (0x4000 * CONFIG_DEBUG_S3C2410_UART)
-#else
-static unsigned int uart_base = S3C2410_PA_UART;
-#endif
+#define uart_base S3C2410_PA_UART + (0x4000*CONFIG_S3C2410_LOWLEVEL_UART_PORT)
 
 static __inline__ void
 uart_wr(unsigned int reg, unsigned int val)