[U-Boot] [PATCH v2] s3c64xx: Add ifdef at the S3C64XX only codes

[U-Boot] [PATCH v2] s3c64xx: Add ifdef at the S3C64XX only codes

[Joonyoung Shim]

The s3c6400.h file is only for S3C64XX cpu and the pheripheral port
address(0x70000000 - 0x7fffffff) exists at only S3C64XX cpu, so they
should be included by only S3C64XX cpu.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
---
 cpu/arm1176/cpu.c   |    2 ++
 cpu/arm1176/start.S |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/cpu/arm1176/cpu.c b/cpu/arm1176/cpu.c
index 2c0014f..befa0cd 100644
--- a/cpu/arm1176/cpu.c
+++ b/cpu/arm1176/cpu.c
@@ -33,7 +33,9 @@
 
 #include <common.h>
 #include <command.h>
+#ifdef CONFIG_S3C64XX
 #include <asm/arch/s3c6400.h>
+#endif
 #include <asm/system.h>
 
 static void cache_flush (void);
diff --git a/cpu/arm1176/start.S b/cpu/arm1176/start.S
index 68a356d..e2b6c9b 100644
--- a/cpu/arm1176/start.S
+++ b/cpu/arm1176/start.S
@@ -35,7 +35,9 @@
 #ifdef CONFIG_ENABLE_MMU
 #include <asm/proc/domain.h>
 #endif
+#ifdef CONFIG_S3C64XX
 #include <asm/arch/s3c6400.h>
+#endif
 
 #if !defined(CONFIG_ENABLE_MMU) && !defined(CONFIG_SYS_PHY_UBOOT_BASE)
 #define CONFIG_SYS_PHY_UBOOT_BASE	CONFIG_SYS_UBOOT_BASE
@@ -190,10 +192,12 @@ mmu_disable:
 #endif
 
 mmu_disable_phys:
+#ifdef CONFIG_S3C64XX
 	/* Peri port setup */
 	ldr	r0, =0x70000000
 	orr	r0, r0, #0x13
 	mcr	p15,0,r0,c15,c2,4       @ 256M (0x70000000 - 0x7fffffff)
+#endif
 
 	/*
 	 * Go setup Memory and board specific bits prior to relocation.
-- 
1.6.3.3

[U-Boot] [PATCH v2] s3c64xx: Add ifdef at the S3C64XX only codes

[Minkyu Kang]

Dear Joonyoung Shim,

On 8 February 2010 22:00, Joonyoung Shim <jy0922.shim@samsung.com> wrote:
> The s3c6400.h file is only for S3C64XX cpu and the pheripheral port
> address(0x70000000 - 0x7fffffff) exists at only S3C64XX cpu, so they
> should be included by only S3C64XX cpu.
>
> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
> ---
> ?cpu/arm1176/cpu.c ? | ? ?2 ++
> ?cpu/arm1176/start.S | ? ?4 ++++
> ?2 files changed, 6 insertions(+), 0 deletions(-)
>

applied to u-boot-samsung

Thanks
Minkyu Kang
-- 
from. prom.
www.promsoft.net