diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-11-29 22:16:52 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-04 09:17:17 -0800 |
commit | 5de18cde3b748aafc6d187d7655ba42f2260501d (patch) | |
tree | fa4805081e6663b10be678c924a0adc3c7a95107 | |
parent | 708d4f09647106d549c646dc459c7ccf2c237cc8 (diff) | |
download | linux-5de18cde3b748aafc6d187d7655ba42f2260501d.tar.bz2 |
sparc,sparc64: unify prom/
- all files with identical names copied and renamed to *_64.c
- the remaning files copied as is
- added sparc64 specific files to sparc/prom/Makefile
- teach sparc64 Makefile to look into sparc/prom/
- delete unused Makefile from sparc64/prom/
linking order was not kept for sparc64 with this change.
It was not possible to keep linking order for both sparc and sparc64
and as sparc64 see more testing than sparc it was natural to
break linking order on sparc64. Should it have any effect it
would be detected sooner this way.
printf_32.c and printf_64.c are obvious candidates to be merged
but they are not 100% equal so that was left for later
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/Makefile | 3 | ||||
-rw-r--r-- | arch/sparc/prom/Makefile | 4 | ||||
-rw-r--r-- | arch/sparc/prom/bootstr_64.c (renamed from arch/sparc64/prom/bootstr.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/cif.S (renamed from arch/sparc64/prom/cif.S) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/console_64.c (renamed from arch/sparc64/prom/console.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/devops_64.c (renamed from arch/sparc64/prom/devops.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/init_64.c (renamed from arch/sparc64/prom/init.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/misc_64.c (renamed from arch/sparc64/prom/misc.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/p1275.c (renamed from arch/sparc64/prom/p1275.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/printf_64.c (renamed from arch/sparc64/prom/printf.c) | 0 | ||||
-rw-r--r-- | arch/sparc/prom/tree_64.c (renamed from arch/sparc64/prom/tree.c) | 0 | ||||
-rw-r--r-- | arch/sparc64/prom/Makefile | 9 |
12 files changed, 5 insertions, 11 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index 3c043baf92bc..317aad600ed7 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile @@ -76,9 +76,8 @@ core-$(CONFIG_SPARC32) += arch/sparc/kernel/ core-$(CONFIG_SPARC64) += arch/sparc64/kernel/ core-y += arch/sparc/mm/ arch/sparc/math-emu/ -libs-$(CONFIG_SPARC32) += arch/sparc/prom/ +libs-y += arch/sparc/prom/ libs-$(CONFIG_SPARC32) += arch/sparc/lib/ -libs-$(CONFIG_SPARC64) += arch/sparc64/prom/ libs-$(CONFIG_SPARC64) += arch/sparc64/lib/ drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/ diff --git a/arch/sparc/prom/Makefile b/arch/sparc/prom/Makefile index 74ca9cceaeea..f8e0278b8b4f 100644 --- a/arch/sparc/prom/Makefile +++ b/arch/sparc/prom/Makefile @@ -1,6 +1,8 @@ # Makefile for the Sun Boot PROM interface library under # Linux. # +asflags := -ansi +ccflags := -Werror lib-y := bootstr_$(BITS).o lib-$(CONFIG_SPARC32) += devmap.o @@ -15,3 +17,5 @@ lib-$(CONFIG_SPARC32) += segment.o lib-y += console_$(BITS).o lib-y += printf_$(BITS).o lib-y += tree_$(BITS).o +lib-$(CONFIG_SPARC64) += p1275.o +lib-$(CONFIG_SPARC64) += cif.o diff --git a/arch/sparc64/prom/bootstr.c b/arch/sparc/prom/bootstr_64.c index ab9ccc63b388..ab9ccc63b388 100644 --- a/arch/sparc64/prom/bootstr.c +++ b/arch/sparc/prom/bootstr_64.c diff --git a/arch/sparc64/prom/cif.S b/arch/sparc/prom/cif.S index 5f27ad779c0c..5f27ad779c0c 100644 --- a/arch/sparc64/prom/cif.S +++ b/arch/sparc/prom/cif.S diff --git a/arch/sparc64/prom/console.c b/arch/sparc/prom/console_64.c index e1c3fc87484d..e1c3fc87484d 100644 --- a/arch/sparc64/prom/console.c +++ b/arch/sparc/prom/console_64.c diff --git a/arch/sparc64/prom/devops.c b/arch/sparc/prom/devops_64.c index 9dbd803e46e1..9dbd803e46e1 100644 --- a/arch/sparc64/prom/devops.c +++ b/arch/sparc/prom/devops_64.c diff --git a/arch/sparc64/prom/init.c b/arch/sparc/prom/init_64.c index 7b00f89490a4..7b00f89490a4 100644 --- a/arch/sparc64/prom/init.c +++ b/arch/sparc/prom/init_64.c diff --git a/arch/sparc64/prom/misc.c b/arch/sparc/prom/misc_64.c index 9b0c0760901e..9b0c0760901e 100644 --- a/arch/sparc64/prom/misc.c +++ b/arch/sparc/prom/misc_64.c diff --git a/arch/sparc64/prom/p1275.c b/arch/sparc/prom/p1275.c index 4b7c937bba61..4b7c937bba61 100644 --- a/arch/sparc64/prom/p1275.c +++ b/arch/sparc/prom/p1275.c diff --git a/arch/sparc64/prom/printf.c b/arch/sparc/prom/printf_64.c index 660943ee4c2a..660943ee4c2a 100644 --- a/arch/sparc64/prom/printf.c +++ b/arch/sparc/prom/printf_64.c diff --git a/arch/sparc64/prom/tree.c b/arch/sparc/prom/tree_64.c index 281aea44790b..281aea44790b 100644 --- a/arch/sparc64/prom/tree.c +++ b/arch/sparc/prom/tree_64.c diff --git a/arch/sparc64/prom/Makefile b/arch/sparc64/prom/Makefile deleted file mode 100644 index 8c94483ca54d..000000000000 --- a/arch/sparc64/prom/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# Makefile for the Sun Boot PROM interface library under -# Linux. -# - -EXTRA_AFLAGS := -ansi -EXTRA_CFLAGS := -Werror - -lib-y := bootstr.o devops.o init.o misc.o \ - tree.o console.o printf.o p1275.o cif.o |