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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
niw · Dec 4, 2008 · 5de18cd · 5de18cd
1 parent 708d4f0
commit 5de18cd
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 11 deletions.
diff --git 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
@@ -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 → arch/sparc/prom/bootstr_64.c b/arch/sparc64/prom/bootstr.c → arch/sparc/prom/bootstr_64.c
diff --git a/arch/sparc64/prom/cif.S → arch/sparc/prom/cif.S b/arch/sparc64/prom/cif.S → arch/sparc/prom/cif.S
diff --git a/arch/sparc64/prom/console.c → arch/sparc/prom/console_64.c b/arch/sparc64/prom/console.c → arch/sparc/prom/console_64.c
diff --git a/arch/sparc64/prom/devops.c → arch/sparc/prom/devops_64.c b/arch/sparc64/prom/devops.c → arch/sparc/prom/devops_64.c
diff --git a/arch/sparc64/prom/init.c → arch/sparc/prom/init_64.c b/arch/sparc64/prom/init.c → arch/sparc/prom/init_64.c
diff --git a/arch/sparc64/prom/misc.c → arch/sparc/prom/misc_64.c b/arch/sparc64/prom/misc.c → arch/sparc/prom/misc_64.c
diff --git a/arch/sparc64/prom/p1275.c → arch/sparc/prom/p1275.c b/arch/sparc64/prom/p1275.c → arch/sparc/prom/p1275.c
diff --git a/arch/sparc64/prom/printf.c → arch/sparc/prom/printf_64.c b/arch/sparc64/prom/printf.c → arch/sparc/prom/printf_64.c
diff --git a/arch/sparc64/prom/tree.c → arch/sparc/prom/tree_64.c b/arch/sparc64/prom/tree.c → arch/sparc/prom/tree_64.c
diff --git a/arch/sparc64/prom/Makefile b/arch/sparc64/prom/Makefile