diff options
Diffstat (limited to 'arch/arm/mach-clps711x/edb7211-arch.c')
-rw-r--r-- | arch/arm/mach-clps711x/edb7211-arch.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-clps711x/edb7211-arch.c b/arch/arm/mach-clps711x/edb7211-arch.c index dc81cc68595d..4a7a2322979a 100644 --- a/arch/arm/mach-clps711x/edb7211-arch.c +++ b/arch/arm/mach-clps711x/edb7211-arch.c | |||
@@ -18,6 +18,7 @@ | |||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/memblock.h> | ||
21 | #include <linux/types.h> | 22 | #include <linux/types.h> |
22 | #include <linux/string.h> | 23 | #include <linux/string.h> |
23 | 24 | ||
@@ -29,6 +30,12 @@ | |||
29 | 30 | ||
30 | extern void edb7211_map_io(void); | 31 | extern void edb7211_map_io(void); |
31 | 32 | ||
33 | /* Reserve screen memory region at the start of main system memory. */ | ||
34 | static void __init edb7211_reserve(void) | ||
35 | { | ||
36 | memblock_reserve(PHYS_OFFSET, 0x00020000); | ||
37 | } | ||
38 | |||
32 | static void __init | 39 | static void __init |
33 | fixup_edb7211(struct machine_desc *desc, struct tag *tags, | 40 | fixup_edb7211(struct machine_desc *desc, struct tag *tags, |
34 | char **cmdline, struct meminfo *mi) | 41 | char **cmdline, struct meminfo *mi) |
@@ -43,10 +50,8 @@ fixup_edb7211(struct machine_desc *desc, struct tag *tags, | |||
43 | */ | 50 | */ |
44 | mi->bank[0].start = 0xc0000000; | 51 | mi->bank[0].start = 0xc0000000; |
45 | mi->bank[0].size = 8*1024*1024; | 52 | mi->bank[0].size = 8*1024*1024; |
46 | mi->bank[0].node = 0; | ||
47 | mi->bank[1].start = 0xc1000000; | 53 | mi->bank[1].start = 0xc1000000; |
48 | mi->bank[1].size = 8*1024*1024; | 54 | mi->bank[1].size = 8*1024*1024; |
49 | mi->bank[1].node = 1; | ||
50 | mi->nr_banks = 2; | 55 | mi->nr_banks = 2; |
51 | } | 56 | } |
52 | 57 | ||
@@ -57,6 +62,7 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") | |||
57 | .boot_params = 0xc0020100, /* 0xc0000000 - 0xc001ffff can be video RAM */ | 62 | .boot_params = 0xc0020100, /* 0xc0000000 - 0xc001ffff can be video RAM */ |
58 | .fixup = fixup_edb7211, | 63 | .fixup = fixup_edb7211, |
59 | .map_io = edb7211_map_io, | 64 | .map_io = edb7211_map_io, |
65 | .reserve = edb7211_reserve, | ||
60 | .init_irq = clps711x_init_irq, | 66 | .init_irq = clps711x_init_irq, |
61 | .timer = &clps711x_timer, | 67 | .timer = &clps711x_timer, |
62 | MACHINE_END | 68 | MACHINE_END |