diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-11-30 01:15:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-04 12:17:16 -0500 |
commit | 708d4f09647106d549c646dc459c7ccf2c237cc8 (patch) | |
tree | 23657862535d88fcb71bc416c51c27cd480a93c4 | |
parent | 5e53879008b9acefe9f43498fd36db7376e08739 (diff) |
sparc: prepare prom/ for unification
- rename files where sparc64 uses identical names to *_32.c
- refactor Makefile (but keep linking order)
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/prom/Makefile | 15 | ||||
-rw-r--r-- | arch/sparc/prom/bootstr_32.c (renamed from arch/sparc/prom/bootstr.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/console_32.c (renamed from arch/sparc/prom/console.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/devops_32.c (renamed from arch/sparc/prom/devops.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/init_32.c (renamed from arch/sparc/prom/init.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/misc_32.c (renamed from arch/sparc/prom/misc.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/printf_32.c (renamed from arch/sparc/prom/printf.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/tree_32.c (renamed from arch/sparc/prom/tree.c) | 0 |
8 files changed, 13 insertions, 2 deletions
diff --git a/arch/sparc/prom/Makefile b/arch/sparc/prom/Makefile index 8f7e18546c97..74ca9cceaeea 100644 --- a/arch/sparc/prom/Makefile +++ b/arch/sparc/prom/Makefile | |||
@@ -2,5 +2,16 @@ | |||
2 | # Linux. | 2 | # Linux. |
3 | # | 3 | # |
4 | 4 | ||
5 | lib-y := bootstr.o devmap.o devops.o init.o memory.o misc.o mp.o \ | 5 | lib-y := bootstr_$(BITS).o |
6 | palloc.o ranges.o segment.o console.o printf.o tree.o | 6 | lib-$(CONFIG_SPARC32) += devmap.o |
7 | lib-y += devops_$(BITS).o | ||
8 | lib-y += init_$(BITS).o | ||
9 | lib-$(CONFIG_SPARC32) += memory.o | ||
10 | lib-y += misc_$(BITS).o | ||
11 | lib-$(CONFIG_SPARC32) += mp.o | ||
12 | lib-$(CONFIG_SPARC32) += palloc.o | ||
13 | lib-$(CONFIG_SPARC32) += ranges.o | ||
14 | lib-$(CONFIG_SPARC32) += segment.o | ||
15 | lib-y += console_$(BITS).o | ||
16 | lib-y += printf_$(BITS).o | ||
17 | lib-y += tree_$(BITS).o | ||
diff --git a/arch/sparc/prom/bootstr.c b/arch/sparc/prom/bootstr_32.c index 916831da7e67..916831da7e67 100644 --- a/arch/sparc/prom/bootstr.c +++ b/arch/sparc/prom/bootstr_32.c | |||
diff --git a/arch/sparc/prom/console.c b/arch/sparc/prom/console_32.c index b3075d73fc19..b3075d73fc19 100644 --- a/arch/sparc/prom/console.c +++ b/arch/sparc/prom/console_32.c | |||
diff --git a/arch/sparc/prom/devops.c b/arch/sparc/prom/devops_32.c index 9f1a95c91ad1..9f1a95c91ad1 100644 --- a/arch/sparc/prom/devops.c +++ b/arch/sparc/prom/devops_32.c | |||
diff --git a/arch/sparc/prom/init.c b/arch/sparc/prom/init_32.c index 873217c6d823..873217c6d823 100644 --- a/arch/sparc/prom/init.c +++ b/arch/sparc/prom/init_32.c | |||
diff --git a/arch/sparc/prom/misc.c b/arch/sparc/prom/misc_32.c index 49b5057b9601..49b5057b9601 100644 --- a/arch/sparc/prom/misc.c +++ b/arch/sparc/prom/misc_32.c | |||
diff --git a/arch/sparc/prom/printf.c b/arch/sparc/prom/printf_32.c index a36ab9c5ee08..a36ab9c5ee08 100644 --- a/arch/sparc/prom/printf.c +++ b/arch/sparc/prom/printf_32.c | |||
diff --git a/arch/sparc/prom/tree.c b/arch/sparc/prom/tree_32.c index f228fe057b24..f228fe057b24 100644 --- a/arch/sparc/prom/tree.c +++ b/arch/sparc/prom/tree_32.c | |||