diff options
| author | Joonyoung Shim <jy0922.shim@samsung.com> | 2010-02-08 22:00:52 +0900 |
|---|---|---|
| committer | trix <trix@windriver.com> | 2010-04-03 15:24:25 -0500 |
| commit | 7b92159bd9fc0acaddd65b314da252b715d1b44e (patch) | |
| tree | 9767b552b2029387ae4c7c8d57ab1100da3a47cb /cpu | |
| parent | 6c71a8fec95a9e0f90fbc47469c389c6f35d96bc (diff) | |
| download | blackbird-obmc-uboot-7b92159bd9fc0acaddd65b314da252b715d1b44e.tar.gz blackbird-obmc-uboot-7b92159bd9fc0acaddd65b314da252b715d1b44e.zip | |
s3c64xx: Add ifdef at the S3C64XX only codes
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>
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/arm1176/cpu.c | 2 | ||||
| -rw-r--r-- | 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 2c0014f2bd..befa0cdcc4 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 68a356d13e..e2b6c9b08d 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. |
