From a9d125925f07e915ef79456d34da0a6a2a6d468a Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Tue, 21 Oct 2008 14:06:45 +0100
Subject: [PATCH] --- yaml --- r: 123837 b: refs/heads/master c:
 e1a2bd1d2f368faaf377fdf8404a685280a3d0a3 h: refs/heads/master i:   123835:
 987b88462a02b284afb71e8ee3a490cb6d410a47 v: v3

---
 [refs]                                        |  2 +-
 .../mach-s3c2410/include/mach/uncompress.h    |  1 +
 .../mach-s3c6400/include/mach/uncompress.h    | 26 +++++++++++++++++++
 .../arm/plat-s3c/include/plat/uncompress.h    |  2 +-
 .../arch/arm/plat-s3c24xx/include/plat/map.h  |  1 +
 5 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 trunk/arch/arm/mach-s3c6400/include/mach/uncompress.h

diff --git a/[refs] b/[refs]
index 9784b0ad1033..b1028c37fc80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0660fed465849160531f4179664922e3b0d8ba96
+refs/heads/master: e1a2bd1d2f368faaf377fdf8404a685280a3d0a3
diff --git a/trunk/arch/arm/mach-s3c2410/include/mach/uncompress.h b/trunk/arch/arm/mach-s3c2410/include/mach/uncompress.h
index ab39491beee2..c9432103750d 100644
--- a/trunk/arch/arm/mach-s3c2410/include/mach/uncompress.h
+++ b/trunk/arch/arm/mach-s3c2410/include/mach/uncompress.h
@@ -1,3 +1,4 @@
+
 /* arch/arm/mach-s3c2410/include/mach/uncompress.h
  *
  * Copyright (c) 2003, 2007 Simtec Electronics
diff --git a/trunk/arch/arm/mach-s3c6400/include/mach/uncompress.h b/trunk/arch/arm/mach-s3c6400/include/mach/uncompress.h
new file mode 100644
index 000000000000..cc822c57cc1c
--- /dev/null
+++ b/trunk/arch/arm/mach-s3c6400/include/mach/uncompress.h
@@ -0,0 +1,26 @@
+/* arch/arm/mach-s3c6400/include/mach/uncompress.h
+ *
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ *	http://armlinux.simtec.co.uk/
+ *	Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C6400 - uncompress code
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __ASM_ARCH_UNCOMPRESS_H
+#define __ASM_ARCH_UNCOMPRESS_H
+
+#include <mach/map.h>
+#include <plat/uncompress.h>
+
+static void arch_detect_cpu(void)
+{
+	/* we do not need to do any cpu detection here at the moment. */
+}
+
+#endif /* __ASM_ARCH_UNCOMPRESS_H */
diff --git a/trunk/arch/arm/plat-s3c/include/plat/uncompress.h b/trunk/arch/arm/plat-s3c/include/plat/uncompress.h
index 8a8a927292e0..eeef32c4312d 100644
--- a/trunk/arch/arm/plat-s3c/include/plat/uncompress.h
+++ b/trunk/arch/arm/plat-s3c/include/plat/uncompress.h
@@ -37,7 +37,7 @@ static void arch_detect_cpu(void);
 /* how many bytes we allow into the FIFO at a time in FIFO mode */
 #define FIFO_MAX	 (14)
 
-#define uart_base S3C24XX_PA_UART + (0x4000*CONFIG_S3C_LOWLEVEL_UART_PORT)
+#define uart_base S3C_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT)
 
 static __inline__ void
 uart_wr(unsigned int reg, unsigned int val)
diff --git a/trunk/arch/arm/plat-s3c24xx/include/plat/map.h b/trunk/arch/arm/plat-s3c24xx/include/plat/map.h
index 6222ba8341d4..e7be0c0d3702 100644
--- a/trunk/arch/arm/plat-s3c24xx/include/plat/map.h
+++ b/trunk/arch/arm/plat-s3c24xx/include/plat/map.h
@@ -29,6 +29,7 @@
 #define S3C24XX_VA_UART	   S3C_VA_UART
 #define S3C2410_PA_UART	   (0x50000000)
 #define S3C24XX_SZ_UART	   SZ_1M
+#define S3C_UART_OFFSET	   (0x4000)
 
 /* Timers */
 #define S3C24XX_VA_TIMER   S3C_VA_TIMER