diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-10-01 04:30:40 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-10-01 04:30:40 -0400 |
commit | 7786962beed5161717a299933dd08240e20b6e26 (patch) | |
tree | 41a52f78c80b6ea8103ceb8c45eed1a16c11084a /arch | |
parent | ced238f35b2dc9a0c53d0045ec42d818444946b8 (diff) |
sh64: mach-harp: Build fixes.
Get the ST50-HARP building again.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh64/mach-harp/Makefile | 13 | ||||
-rw-r--r-- | arch/sh64/mach-harp/setup.c | 25 |
2 files changed, 8 insertions, 30 deletions
diff --git a/arch/sh64/mach-harp/Makefile b/arch/sh64/mach-harp/Makefile index 63f065bad2f9..2f2963fa2131 100644 --- a/arch/sh64/mach-harp/Makefile +++ b/arch/sh64/mach-harp/Makefile | |||
@@ -1,14 +1 @@ | |||
1 | # | ||
2 | # Makefile for the ST50 Harp specific parts of the kernel | ||
3 | # | ||
4 | # Note! Dependencies are done automagically by 'make dep', which also | ||
5 | # removes any old dependencies. DON'T put your own dependencies here | ||
6 | # unless it's something special (ie not a .c file). | ||
7 | # | ||
8 | |||
9 | O_TARGET := harp.o | ||
10 | |||
11 | obj-y := setup.o | obj-y := setup.o | |
12 | |||
13 | include $(TOPDIR)/Rules.make | ||
14 | |||
diff --git a/arch/sh64/mach-harp/setup.c b/arch/sh64/mach-harp/setup.c index fcd90afac297..05011cb369bb 100644 --- a/arch/sh64/mach-harp/setup.c +++ b/arch/sh64/mach-harp/setup.c | |||
@@ -17,20 +17,10 @@ | |||
17 | * lethal@linux-sh.org: 15th May 2003 | 17 | * lethal@linux-sh.org: 15th May 2003 |
18 | * Use the generic procfs cpuinfo interface, just return a valid board name. | 18 | * Use the generic procfs cpuinfo interface, just return a valid board name. |
19 | */ | 19 | */ |
20 | |||
21 | #include <linux/stddef.h> | ||
22 | #include <linux/init.h> | 20 | #include <linux/init.h> |
23 | #include <linux/mm.h> | ||
24 | #include <linux/bootmem.h> | ||
25 | #include <linux/delay.h> | ||
26 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
27 | #include <asm/processor.h> | ||
28 | #include <asm/platform.h> | 22 | #include <asm/platform.h> |
29 | #include <asm/io.h> | ||
30 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
31 | #include <asm/page.h> | ||
32 | |||
33 | #define RES_COUNT(res) ((sizeof((res))/sizeof(struct resource))) | ||
34 | 24 | ||
35 | /* | 25 | /* |
36 | * Platform Dependent Interrupt Priorities. | 26 | * Platform Dependent Interrupt Priorities. |
@@ -78,8 +68,10 @@ struct resource io_resources[] = { | |||
78 | }; | 68 | }; |
79 | 69 | ||
80 | struct resource kram_resources[] = { | 70 | struct resource kram_resources[] = { |
81 | { "Kernel code", 0, 0 }, /* These must be last in the array */ | 71 | /* These must be last in the array */ |
82 | { "Kernel data", 0, 0 } /* These must be last in the array */ | 72 | { .name = "Kernel code", .start = 0, .end = 0 }, |
73 | /* These must be last in the array */ | ||
74 | { .name = "Kernel data", .start = 0, .end = 0 } | ||
83 | }; | 75 | }; |
84 | 76 | ||
85 | struct resource xram_resources[] = { | 77 | struct resource xram_resources[] = { |
@@ -95,13 +87,13 @@ struct sh64_platform platform_parms = { | |||
95 | .initial_root_dev = 0x0100, | 87 | .initial_root_dev = 0x0100, |
96 | .loader_type = 1, | 88 | .loader_type = 1, |
97 | .io_res_p = io_resources, | 89 | .io_res_p = io_resources, |
98 | .io_res_count = RES_COUNT(io_resources), | 90 | .io_res_count = ARRAY_SIZE(io_resources), |
99 | .kram_res_p = kram_resources, | 91 | .kram_res_p = kram_resources, |
100 | .kram_res_count = RES_COUNT(kram_resources), | 92 | .kram_res_count = ARRAY_SIZE(kram_resources), |
101 | .xram_res_p = xram_resources, | 93 | .xram_res_p = xram_resources, |
102 | .xram_res_count = RES_COUNT(xram_resources), | 94 | .xram_res_count = ARRAY_SIZE(xram_resources), |
103 | .rom_res_p = rom_resources, | 95 | .rom_res_p = rom_resources, |
104 | .rom_res_count = RES_COUNT(rom_resources), | 96 | .rom_res_count = ARRAY_SIZE(rom_resources), |
105 | }; | 97 | }; |
106 | 98 | ||
107 | int platform_int_priority[NR_INTC_IRQS] = { | 99 | int platform_int_priority[NR_INTC_IRQS] = { |
@@ -135,4 +127,3 @@ const char *get_system_type(void) | |||
135 | { | 127 | { |
136 | return "ST50 Harp"; | 128 | return "ST50 Harp"; |
137 | } | 129 | } |
138 | |||