diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-04-08 00:06:31 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-04-08 00:06:31 +0200 |
| commit | 6a1f7e54c2dd8888dbc118e8de372dec29a0a9c5 (patch) | |
| tree | df5b6d67be790d75e60f8fcd97360fc1f179ab0d /cpu/arm1176/start.S | |
| parent | d8bc0a2889700ba063598de6d4e7d135360b537e (diff) | |
| parent | b5045cdda556c73e2697cd1d3ea6563315cbf490 (diff) | |
| download | u-boot-imx-6a1f7e54c2dd8888dbc118e8de372dec29a0a9c5.zip u-boot-imx-6a1f7e54c2dd8888dbc118e8de372dec29a0a9c5.tar.gz u-boot-imx-6a1f7e54c2dd8888dbc118e8de372dec29a0a9c5.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'cpu/arm1176/start.S')
| -rw-r--r-- | cpu/arm1176/start.S | 4 |
1 files changed, 4 insertions, 0 deletions
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. |