summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6c71a8f)
raw | patch | inline | side by side (parent: 6c71a8f)
author | Joonyoung Shim <jy0922.shim@samsung.com> | |
Mon, 8 Feb 2010 13:00:52 +0000 (22:00 +0900) | ||
committer | trix <trix@windriver.com> | |
Sat, 3 Apr 2010 20:24:25 +0000 (15:24 -0500) |
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>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
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>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
cpu/arm1176/cpu.c | patch | blob | history | |
cpu/arm1176/start.S | patch | blob | history |
diff --git a/cpu/arm1176/cpu.c b/cpu/arm1176/cpu.c
index 2c0014f2bd5a4856a3cefc3202774867547beca4..befa0cdcc436eec15c4d654e2a1b8ba3d8e5f601 100644 (file)
--- a/cpu/arm1176/cpu.c
+++ b/cpu/arm1176/cpu.c
#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 68a356d13e9a2d9069961d56286040bf4adeda39..e2b6c9b08d916d1c8caff4a17fed5609d0e35b06 100644 (file)
--- a/cpu/arm1176/start.S
+++ b/cpu/arm1176/start.S
#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
#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.