diff options
Diffstat (limited to 'arch/arm/mach-clps711x')
-rw-r--r-- | arch/arm/mach-clps711x/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/clep7312.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/edb7211-arch.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/fortunet.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/memory.h | 2 |
5 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig index dbaae5f746a1..eb34bd1251d4 100644 --- a/arch/arm/mach-clps711x/Kconfig +++ b/arch/arm/mach-clps711x/Kconfig | |||
@@ -30,7 +30,6 @@ config ARCH_CLEP7312 | |||
30 | config ARCH_EDB7211 | 30 | config ARCH_EDB7211 |
31 | bool "EDB7211" | 31 | bool "EDB7211" |
32 | select ISA | 32 | select ISA |
33 | select ARCH_DISCONTIGMEM_ENABLE | ||
34 | select ARCH_SPARSEMEM_ENABLE | 33 | select ARCH_SPARSEMEM_ENABLE |
35 | select ARCH_SELECT_MEMORY_MODEL | 34 | select ARCH_SELECT_MEMORY_MODEL |
36 | help | 35 | help |
diff --git a/arch/arm/mach-clps711x/clep7312.c b/arch/arm/mach-clps711x/clep7312.c index 09fb57e45213..3c3bf45039ff 100644 --- a/arch/arm/mach-clps711x/clep7312.c +++ b/arch/arm/mach-clps711x/clep7312.c | |||
@@ -32,7 +32,6 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags, | |||
32 | mi->nr_banks=1; | 32 | mi->nr_banks=1; |
33 | mi->bank[0].start = 0xc0000000; | 33 | mi->bank[0].start = 0xc0000000; |
34 | mi->bank[0].size = 0x01000000; | 34 | mi->bank[0].size = 0x01000000; |
35 | mi->bank[0].node = 0; | ||
36 | } | 35 | } |
37 | 36 | ||
38 | 37 | ||
diff --git a/arch/arm/mach-clps711x/edb7211-arch.c b/arch/arm/mach-clps711x/edb7211-arch.c index dc81cc68595d..41a4425617c1 100644 --- a/arch/arm/mach-clps711x/edb7211-arch.c +++ b/arch/arm/mach-clps711x/edb7211-arch.c | |||
@@ -43,10 +43,8 @@ fixup_edb7211(struct machine_desc *desc, struct tag *tags, | |||
43 | */ | 43 | */ |
44 | mi->bank[0].start = 0xc0000000; | 44 | mi->bank[0].start = 0xc0000000; |
45 | mi->bank[0].size = 8*1024*1024; | 45 | mi->bank[0].size = 8*1024*1024; |
46 | mi->bank[0].node = 0; | ||
47 | mi->bank[1].start = 0xc1000000; | 46 | mi->bank[1].start = 0xc1000000; |
48 | mi->bank[1].size = 8*1024*1024; | 47 | mi->bank[1].size = 8*1024*1024; |
49 | mi->bank[1].node = 1; | ||
50 | mi->nr_banks = 2; | 48 | mi->nr_banks = 2; |
51 | } | 49 | } |
52 | 50 | ||
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c index 7430e4049d87..a696099aa4f8 100644 --- a/arch/arm/mach-clps711x/fortunet.c +++ b/arch/arm/mach-clps711x/fortunet.c | |||
@@ -39,7 +39,6 @@ struct meminfo memmap = { | |||
39 | { | 39 | { |
40 | .start = 0xC0000000, | 40 | .start = 0xC0000000, |
41 | .size = 0x01000000, | 41 | .size = 0x01000000, |
42 | .node = 0 | ||
43 | }, | 42 | }, |
44 | }, | 43 | }, |
45 | }; | 44 | }; |
diff --git a/arch/arm/mach-clps711x/include/mach/memory.h b/arch/arm/mach-clps711x/include/mach/memory.h index f70d52be48a2..f45c8e892cb5 100644 --- a/arch/arm/mach-clps711x/include/mach/memory.h +++ b/arch/arm/mach-clps711x/include/mach/memory.h | |||
@@ -20,7 +20,6 @@ | |||
20 | #ifndef __ASM_ARCH_MEMORY_H | 20 | #ifndef __ASM_ARCH_MEMORY_H |
21 | #define __ASM_ARCH_MEMORY_H | 21 | #define __ASM_ARCH_MEMORY_H |
22 | 22 | ||
23 | |||
24 | /* | 23 | /* |
25 | * Physical DRAM offset. | 24 | * Physical DRAM offset. |
26 | */ | 25 | */ |
@@ -72,7 +71,6 @@ | |||
72 | * node 2: 0xd0000000 - 0xd7ffffff | 71 | * node 2: 0xd0000000 - 0xd7ffffff |
73 | * node 3: 0xd8000000 - 0xdfffffff | 72 | * node 3: 0xd8000000 - 0xdfffffff |
74 | */ | 73 | */ |
75 | #define NODE_MEM_SIZE_BITS 24 | ||
76 | #define SECTION_SIZE_BITS 24 | 74 | #define SECTION_SIZE_BITS 24 |
77 | #define MAX_PHYSMEM_BITS 32 | 75 | #define MAX_PHYSMEM_BITS 32 |
78 | 76 | ||