[PPC] Move include/asm-ppc/arch-* to arch/ppc/*/include/mach

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

17 files changed, 24 insertions, 39 deletions

diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index ab79a6506d..72eb36bad2 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -21,29 +21,17 @@ ifndef CONFIG_MODULE
 CPPFLAGS += -fdata-sections -ffunction-sections
 endif
 
-ifeq ($(incdir-y),)
-incdir-y := $(machine-y)
-endif
-INCDIR   := arch-$(incdir-y)
-
-#	Update machine arch and proc symlinks if something which affects
-#	them changed.  We use .arch to indicate when they were updated
-#	last, otherwise make uses the target directory mtime.
+machdirs := $(patsubst %,arch/ppc/mach-%/,$(cpu-y))
 
-include/asm-ppc/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
-	@echo '  SYMLINK include/asm-ppc/arch -> include/asm-ppc/$(INCDIR)'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-ppc
-	$(Q)ln -fsn $(srctree)/include/asm-ppc/$(INCDIR) include/asm-ppc/arch
+ifeq ($(KBUILD_SRC),)
+CPPFLAGS += $(patsubst %,-I%include,$(machdirs))
 else
-	$(Q)ln -fsn $(INCDIR) include/asm-ppc/arch
+CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
 endif
-	@touch $@
 
 archprepare: maketools
 
 PHONY += maketools
-maketools: include/asm-ppc/.arch
 
 
 ifneq ($(board-y),)
@@ -62,5 +50,3 @@ common-y += $(BOARD) $(CPU)
 common-y += arch/ppc/lib/
 
 lds-y += $(BOARD)/u-boot.lds
-
-MRPROPER_FILES += include/asm-ppc/arch
diff --git a/arch/ppc/lib/time.c b/arch/ppc/lib/time.c
index 9db04601c0..ee6cbdf676 100644
--- a/arch/ppc/lib/time.c
+++ b/arch/ppc/lib/time.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <clock.h>
 #include <init.h>
-#include <asm/arch/clocks.h>
+#include <mach/clocks.h>
 #include <asm/common.h>
 
 /* ------------------------------------------------------------------------- */
diff --git a/arch/ppc/mach-mpc5xxx/cpu.c b/arch/ppc/mach-mpc5xxx/cpu.c
index eebe53e83f..59b1538cd0 100644
--- a/arch/ppc/mach-mpc5xxx/cpu.c
+++ b/arch/ppc/mach-mpc5xxx/cpu.c
@@ -27,12 +27,12 @@
 
 #include <common.h>
 #include <command.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 #include <asm/processor.h>
 #include <asm/byteorder.h>
 #include <init.h>
 #include <types.h>
-#include <asm/arch/clocks.h>
+#include <mach/clocks.h>
 
 #if defined(CONFIG_OF_FLAT_TREE)
 #include <ft_build.h>
diff --git a/arch/ppc/mach-mpc5xxx/cpu_init.c b/arch/ppc/mach-mpc5xxx/cpu_init.c
index 8eb00f05f3..fc5db0ec3e 100644
--- a/arch/ppc/mach-mpc5xxx/cpu_init.c
+++ b/arch/ppc/mach-mpc5xxx/cpu_init.c
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 #include <types.h>
 #include <reloc.h>
 
diff --git a/include/asm-ppc/arch-mpc5200/clocks.h b/arch/ppc/mach-mpc5xxx/include/mach/clocks.h
index 4e1a903e79..4e1a903e79 100644
--- a/include/asm-ppc/arch-mpc5200/clocks.h
+++ b/arch/ppc/mach-mpc5xxx/include/mach/clocks.h
diff --git a/include/asm-ppc/arch-mpc5200/fec.h b/arch/ppc/mach-mpc5xxx/include/mach/fec.h
index a3e04b4e9d..a3e04b4e9d 100644
--- a/include/asm-ppc/arch-mpc5200/fec.h
+++ b/arch/ppc/mach-mpc5xxx/include/mach/fec.h
diff --git a/include/asm-ppc/arch-mpc5200/mpc5xxx.h b/arch/ppc/mach-mpc5xxx/include/mach/mpc5xxx.h
index 0638df157c..d7d081137b 100644
--- a/include/asm-ppc/arch-mpc5200/mpc5xxx.h
+++ b/arch/ppc/mach-mpc5xxx/include/mach/mpc5xxx.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-ppc/mpc5xxx.h
+ * arch/ppc/mach-mpc5xxx/include/mach/mpc5xxx.h
  *
  * Prototypes, etc. for the Motorola MGT5xxx/MPC5xxx
  * embedded cpu chips
diff --git a/include/asm-ppc/arch-mpc5200/sdma.h b/arch/ppc/mach-mpc5xxx/include/mach/sdma.h
index 17f22f0add..5e7ff5fffa 100644
--- a/include/asm-ppc/arch-mpc5200/sdma.h
+++ b/arch/ppc/mach-mpc5xxx/include/mach/sdma.h
@@ -12,7 +12,7 @@
 #define __MPC5XXX_SDMA_H
 
 #include <common.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 
 /* Task number assignment */
 #define FEC_RECV_TASK_NO            0
diff --git a/arch/ppc/mach-mpc5xxx/interrupts.c b/arch/ppc/mach-mpc5xxx/interrupts.c
index 8665a066b0..58f4530dc4 100644
--- a/arch/ppc/mach-mpc5xxx/interrupts.c
+++ b/arch/ppc/mach-mpc5xxx/interrupts.c
@@ -41,9 +41,9 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <command.h>
-#include <asm/arch/sdma.h>
+#include <mach/sdma.h>
 #include <asm/bitops.h>
-#include <asm/arch/clocks.h>
+#include <mach/clocks.h>
 
 struct irq_action {
 	interrupt_handler_t *handler;
diff --git a/arch/ppc/mach-mpc5xxx/loadtask.c b/arch/ppc/mach-mpc5xxx/loadtask.c
index 77ba8c89d2..1458cf7218 100644
--- a/arch/ppc/mach-mpc5xxx/loadtask.c
+++ b/arch/ppc/mach-mpc5xxx/loadtask.c
@@ -7,7 +7,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 #include <types.h>
 
 /* BestComm/SmartComm microcode */
diff --git a/arch/ppc/mach-mpc5xxx/reginfo.c b/arch/ppc/mach-mpc5xxx/reginfo.c
index 130e0357d6..92a1b59512 100644
--- a/arch/ppc/mach-mpc5xxx/reginfo.c
+++ b/arch/ppc/mach-mpc5xxx/reginfo.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <config.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 
 void reginfo(void)
 {
diff --git a/arch/ppc/mach-mpc5xxx/speed.c b/arch/ppc/mach-mpc5xxx/speed.c
index 7207016831..46efc6c24f 100644
--- a/arch/ppc/mach-mpc5xxx/speed.c
+++ b/arch/ppc/mach-mpc5xxx/speed.c
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 #include <init.h>
 #include <asm/processor.h>
 #include <types.h>
diff --git a/board/pcm030/config.h b/board/pcm030/config.h
index 16b7ba8518..a772ee6d96 100644
--- a/board/pcm030/config.h
+++ b/board/pcm030/config.h
@@ -27,7 +27,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 
 /* #define DEBUG */
 
diff --git a/board/pcm030/pcm030.c b/board/pcm030/pcm030.c
index c0c9a33a7d..23c1be3944 100644
--- a/board/pcm030/pcm030.c
+++ b/board/pcm030/pcm030.c
@@ -31,8 +31,8 @@
 #include <driver.h>
 #include <cfi_flash.h>
 #include <init.h>
-#include <asm/arch/mpc5xxx.h>
-#include <asm/arch/fec.h>
+#include <mach/mpc5xxx.h>
+#include <mach/fec.h>
 #include <types.h>
 #include <partition.h>
 #include <mem_malloc.h>
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index 05f63d7801..d803ddf603 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -7,15 +7,15 @@
  */
 
 #include <common.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 #include <malloc.h>
 #include <net.h>
 #include <init.h>
 #include <miiphy.h>
 #include <driver.h>
-#include <asm/arch/sdma.h>
-#include <asm/arch/fec.h>
-#include <asm/arch/clocks.h>
+#include <mach/sdma.h>
+#include <mach/fec.h>
+#include <mach/clocks.h>
 #include <miiphy.h>
 #include "fec_mpc5200.h"
 
diff --git a/drivers/serial/serial_mpc5xxx.c b/drivers/serial/serial_mpc5xxx.c
index a86c655bc8..2509708863 100644
--- a/drivers/serial/serial_mpc5xxx.c
+++ b/drivers/serial/serial_mpc5xxx.c
@@ -34,13 +34,13 @@
  */
 
 #include <common.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 #include <driver.h>
 #include <init.h>
 #include <console.h>
 #include <xfuncs.h>
 #include <reloc.h>
-#include <asm/arch/clocks.h>
+#include <mach/clocks.h>
 
 static int __mpc5xxx_serial_setbaudrate(struct mpc5xxx_psc *psc, int baudrate)
 {
diff --git a/include/asm-ppc/.gitignore b/include/asm-ppc/.gitignore
deleted file mode 100644
index aca8da44fb..0000000000
--- a/include/asm-ppc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-arch
\ No newline at end of file