diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2007-07-22 16:21:21 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-22 17:06:04 +0100 |
| commit | 0d685cad354b773fbb6a698e73097f8b5aa4a342 (patch) | |
| tree | 6b4d4deef4e2c75facd49c00b3bc520c74aeb639 /include/asm-arm | |
| parent | 530ef3c2a92b3c6a9901ac7e04d1e6c0077a9f2d (diff) | |
| download | op-kernel-dev-0d685cad354b773fbb6a698e73097f8b5aa4a342.zip op-kernel-dev-0d685cad354b773fbb6a698e73097f8b5aa4a342.tar.gz | |
[ARM] 4522/1: S3C: split include/asm-arm/arch/memory.h
Split the S3C2400 out of S3C2410 memory.h files
ready for S3C2400 support to be added.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-s3c2400/memory.h | 23 | ||||
| -rw-r--r-- | include/asm-arm/arch-s3c2410/memory.h | 13 |
2 files changed, 23 insertions, 13 deletions
diff --git a/include/asm-arm/arch-s3c2400/memory.h b/include/asm-arm/arch-s3c2400/memory.h new file mode 100644 index 0000000..fb0381d --- /dev/null +++ b/include/asm-arm/arch-s3c2400/memory.h @@ -0,0 +1,23 @@ +/* linux/include/asm-arm/arch-s3c2400/memory.h + * from linux/include/asm-arm/arch-rpc/memory.h + * + * Copyright 2007 Simtec Electronics + * http://armlinux.simtec.co.uk/ + * Ben Dooks <ben@simtec.co.uk> + * + * Copyright (C) 1996,1997,1998 Russell King. + * + * 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_MEMORY_H +#define __ASM_ARCH_MEMORY_H + +#define PHYS_OFFSET UL(0x0C000000) + +#define __virt_to_bus(x) __virt_to_phys(x) +#define __bus_to_virt(x) __phys_to_virt(x) + +#endif diff --git a/include/asm-arm/arch-s3c2410/memory.h b/include/asm-arm/arch-s3c2410/memory.h index 4be6a74..533e243 100644 --- a/include/asm-arm/arch-s3c2410/memory.h +++ b/include/asm-arm/arch-s3c2410/memory.h @@ -11,20 +11,7 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H -/* - * DRAM starts at 0x30000000 for S3C2410/S3C2440 - * and at 0x0C000000 for S3C2400 - */ -#ifdef CONFIG_CPU_S3C2400 -#define PHYS_OFFSET UL(0x0C000000) -#else #define PHYS_OFFSET UL(0x30000000) -#endif - -/* - * These are exactly the same on the S3C2410 as the - * physical memory view. -*/ #define __virt_to_bus(x) __virt_to_phys(x) #define __bus_to_virt(x) __phys_to_virt(x) |
