From 85bbbefc67e69fc26a7cee1c6e7468aabfcca729 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Tue, 3 Aug 2010 18:53:50 +0200 Subject: [PATCH] --- yaml --- r: 207145 b: refs/heads/master c: 32e7a8ba8d435d03752be818a82748c5e3eadc36 h: refs/heads/master i: 207143: 0686dc670ea1a5428c235a6e9851aa01b3cb8c3f v: v3 --- [refs] | 2 +- .../arch/cris/include/arch-v32/arch/memmap.h | 25 +------------------ .../include/arch-v32/mach-fs/mach/memmap.h | 24 ++++++++++++++++++ 3 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 trunk/arch/cris/include/arch-v32/mach-fs/mach/memmap.h diff --git a/[refs] b/[refs] index 8be815ceafed..9b358661161e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 243ba2fa461a22e01e5905dd299babeaeeb418e2 +refs/heads/master: 32e7a8ba8d435d03752be818a82748c5e3eadc36 diff --git a/trunk/arch/cris/include/arch-v32/arch/memmap.h b/trunk/arch/cris/include/arch-v32/arch/memmap.h index d29df5644d3e..81985c0a6789 100644 --- a/trunk/arch/cris/include/arch-v32/arch/memmap.h +++ b/trunk/arch/cris/include/arch-v32/arch/memmap.h @@ -1,24 +1 @@ -#ifndef _ASM_ARCH_MEMMAP_H -#define _ASM_ARCH_MEMMAP_H - -#define MEM_CSE0_START (0x00000000) -#define MEM_CSE0_SIZE (0x04000000) -#define MEM_CSE1_START (0x04000000) -#define MEM_CSE1_SIZE (0x04000000) -#define MEM_CSR0_START (0x08000000) -#define MEM_CSR1_START (0x0c000000) -#define MEM_CSP0_START (0x10000000) -#define MEM_CSP1_START (0x14000000) -#define MEM_CSP2_START (0x18000000) -#define MEM_CSP3_START (0x1c000000) -#define MEM_CSP4_START (0x20000000) -#define MEM_CSP5_START (0x24000000) -#define MEM_CSP6_START (0x28000000) -#define MEM_CSP7_START (0x2c000000) -#define MEM_INTMEM_START (0x38000000) -#define MEM_INTMEM_SIZE (0x00020000) -#define MEM_DRAM_START (0x40000000) - -#define MEM_NON_CACHEABLE (0x80000000) - -#endif +#include diff --git a/trunk/arch/cris/include/arch-v32/mach-fs/mach/memmap.h b/trunk/arch/cris/include/arch-v32/mach-fs/mach/memmap.h new file mode 100644 index 000000000000..d29df5644d3e --- /dev/null +++ b/trunk/arch/cris/include/arch-v32/mach-fs/mach/memmap.h @@ -0,0 +1,24 @@ +#ifndef _ASM_ARCH_MEMMAP_H +#define _ASM_ARCH_MEMMAP_H + +#define MEM_CSE0_START (0x00000000) +#define MEM_CSE0_SIZE (0x04000000) +#define MEM_CSE1_START (0x04000000) +#define MEM_CSE1_SIZE (0x04000000) +#define MEM_CSR0_START (0x08000000) +#define MEM_CSR1_START (0x0c000000) +#define MEM_CSP0_START (0x10000000) +#define MEM_CSP1_START (0x14000000) +#define MEM_CSP2_START (0x18000000) +#define MEM_CSP3_START (0x1c000000) +#define MEM_CSP4_START (0x20000000) +#define MEM_CSP5_START (0x24000000) +#define MEM_CSP6_START (0x28000000) +#define MEM_CSP7_START (0x2c000000) +#define MEM_INTMEM_START (0x38000000) +#define MEM_INTMEM_SIZE (0x00020000) +#define MEM_DRAM_START (0x40000000) + +#define MEM_NON_CACHEABLE (0x80000000) + +#endif