powerpc: clean up after powermac build merge

Complete moving arch/ppc64/kernel/mpic.h,
        include/asm-ppc/reg.h, include/asm-ppc64/kdebug.h
	        and include/asm-ppc64/kprobes.h
Add arch/powerpc/platforms/Makefile and use it from
	arch/powerpc/Makefile
Introduce OLDARCH temporarily so we can point back to
	the originating architecture

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

3 files changed, 14 insertions, 29 deletions

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 8a65e112211b..d94878193cd9 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -18,6 +18,7 @@ KERNELLOAD	:= $(CONFIG_KERNEL_START)
 HAS_BIARCH      := $(call cc-option-yn, -m32)
 
 ifeq ($(CONFIG_PPC64),y)
+OLDARCH := ppc64
 SZ      := 64
 
 # Set default 32 bits cross compilers for vdso and boot wrapper
@@ -46,6 +47,7 @@ NM		:= $(NM) --synthetic
 endif
 
 else
+OLDARCH := ppc
 SZ      := 32
 endif
 
@@ -61,11 +63,9 @@ LDFLAGS_vmlinux	:= -Ttext $(KERNELLOAD) -Bstatic -e $(KERNELLOAD)
 CPPFLAGS        += -Iarch/$(ARCH) -Iarch/$(ARCH)/include
 AFLAGS          += -Iarch/$(ARCH)
 CFLAGS          += -Iarch/$(ARCH) -msoft-float -pipe
-ifeq ($(CONFIG_PPC64),y)
-CFLAGS          += -mminimal-toc -mtraceback=none  -mcall-aixdesc
-else
-CFLAGS          += -ffixed-r2 -mmultiple
-endif
+CFLAGS-$(CONFIG_PPC64)  := -mminimal-toc -mtraceback=none  -mcall-aixdesc
+CFLAGS-$(CONFIG_PPC32)  := -ffixed-r2 -mmultiple
+CFLAGS          += $(CFLAGS-y)
 CPP             = $(CC) -E $(CFLAGS)
 # Temporary hack until we have migrated to asm-powerpc
 LINUXINCLUDE    += -Iarch/$(ARCH)/include
@@ -126,16 +126,12 @@ head-$(CONFIG_PPC_FPU)		+= arch/powerpc/kernel/fpu.o
 endif
 
 core-y                          += arch/powerpc/kernel/ \
+                                   arch/$(OLDARCH)/kernel/ \
                                    arch/powerpc/mm/ \
                                    arch/powerpc/lib/ \
-                                   arch/powerpc/sysdev/
-core-$(CONFIG_PPC32)            += arch/ppc/kernel/ \
-                                   arch/ppc/syslib/
-core-$(CONFIG_PPC64)            += arch/ppc64/kernel/
-core-$(CONFIG_PPC_PMAC)         += arch/powerpc/platforms/powermac/
-core-$(CONFIG_4xx)              += arch/ppc/platforms/4xx/
-core-$(CONFIG_83xx)             += arch/ppc/platforms/83xx/
-core-$(CONFIG_85xx)             += arch/ppc/platforms/85xx/
+                                   arch/powerpc/sysdev/ \
+                                   arch/powerpc/platforms/
+core-$(CONFIG_PPC32)            += arch/ppc/syslib/
 core-$(CONFIG_MATH_EMULATION)   += arch/ppc/math-emu/
 core-$(CONFIG_XMON)             += arch/powerpc/xmon/
 core-$(CONFIG_APUS)             += arch/ppc/amiga/
@@ -182,17 +178,10 @@ archclean:
 archprepare: checkbin
 
 # Temporary hack until we have migrated to asm-powerpc
-ifeq ($(CONFIG_PPC64),y)
 include/asm: arch/$(ARCH)/include/asm
 arch/$(ARCH)/include/asm:
         $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
-        $(Q)ln -fsn $(srctree)/include/asm-ppc64 arch/$(ARCH)/include/asm
-else
-include/asm: arch/$(ARCH)/include/asm
-arch/$(ARCH)/include/asm:
-        $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
-        $(Q)ln -fsn $(srctree)/include/asm-ppc arch/$(ARCH)/include/asm
-endif
+        $(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm
 
 # Use the file '.tmp_gas_check' for binutils tests, as gas won't output
 # to stdout and these checks are run even on install targets.
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
new file mode 100644
index 000000000000..dbc093759a89
--- /dev/null
+++ b/arch/powerpc/platforms/Makefile
@@ -0,0 +1,4 @@
+obj-$(CONFIG_PPC_PMAC)  += powermac/
+obj-$(CONFIG_4xx)       += 4xx/
+obj-$(CONFIG_83xx)      += 83xx/
+obj-$(CONFIG_85xx)      += 85xx/
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 4f3551430596..2d755b79d51f 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -2,14 +2,6 @@ choice
         prompt "Machine Type"
         depends on EMBEDDED6xx
 
-config APUS
-        bool "Amiga-APUS"
-        depends on BROKEN
-        help
-          Select APUS if configuring for a PowerUP Amiga.
-          More information is available at:
-          <http://linux-apus.sourceforge.net/>.
-
 config KATANA
         bool "Artesyn-Katana"
         help