summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2018-03-16 19:20:43 +0300
committerTom Rini <trini@konsulko.com>2018-04-06 23:30:37 +0300
commit18f8d4c60d26e6cd113461c5d716c64897c3f112 (patch)
tree4c740c87c179ab09a8a5cbaefb6786b803d40832
parentee1e600c13d16febd517ab7d0d2c243db174789b (diff)
downloadu-boot-18f8d4c60d26e6cd113461c5d716c64897c3f112.tar.xz
powercp: mpc8xx: move commproc.h
include/commproc.h is dedicated to the 8xx, rename it cpm_8xx.h and move it into arch/powerpc/include/asm Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
-rw-r--r--arch/powerpc/cpu/mpc8xx/cpu.c2
-rw-r--r--arch/powerpc/cpu/mpc8xx/cpu_init.c2
-rw-r--r--arch/powerpc/cpu/mpc8xx/immap.c2
-rw-r--r--arch/powerpc/cpu/mpc8xx/interrupts.c2
-rw-r--r--arch/powerpc/include/asm/cpm_8xx.h (renamed from include/commproc.h)0
-rw-r--r--drivers/net/mpc8xx_fec.c2
-rw-r--r--drivers/serial/serial_mpc8xx.c2
-rw-r--r--drivers/spi/mpc8xx_spi.c2
8 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index 78874926e3..6a1bd8dce4 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -21,9 +21,9 @@
#include <watchdog.h>
#include <command.h>
#include <mpc8xx.h>
-#include <commproc.h>
#include <netdev.h>
#include <asm/cache.h>
+#include <asm/cpm_8xx.h>
#include <linux/compiler.h>
#include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c
index dc601a1297..6127c9f771 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
@@ -9,7 +9,7 @@
#include <watchdog.h>
#include <mpc8xx.h>
-#include <commproc.h>
+#include <asm/cpm_8xx.h>
#include <asm/io.h>
/*
diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
index dfe5dc2125..6164de281b 100644
--- a/arch/powerpc/cpu/mpc8xx/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -13,7 +13,7 @@
#include <command.h>
#include <asm/immap_8xx.h>
-#include <commproc.h>
+#include <asm/cpm_8xx.h>
#include <asm/iopin_8xx.h>
#include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c
index 846148ab98..20f9664f06 100644
--- a/arch/powerpc/cpu/mpc8xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc8xx/interrupts.c
@@ -8,9 +8,9 @@
#include <common.h>
#include <mpc8xx.h>
#include <mpc8xx_irq.h>
+#include <asm/cpm_8xx.h>
#include <asm/processor.h>
#include <asm/io.h>
-#include <commproc.h>
/************************************************************************/
diff --git a/include/commproc.h b/arch/powerpc/include/asm/cpm_8xx.h
index bd8adec6b0..bd8adec6b0 100644
--- a/include/commproc.h
+++ b/arch/powerpc/include/asm/cpm_8xx.h
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 71fe984a5d..1dd41df18b 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -7,10 +7,10 @@
#include <common.h>
#include <command.h>
-#include <commproc.h>
#include <malloc.h>
#include <net.h>
#include <netdev.h>
+#include <asm/cpm_8xx.h>
#include <asm/io.h>
#include <phy.h>
diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c
index 26a8085a69..7a5908f464 100644
--- a/drivers/serial/serial_mpc8xx.c
+++ b/drivers/serial/serial_mpc8xx.c
@@ -6,10 +6,10 @@
*/
#include <common.h>
-#include <commproc.h>
#include <command.h>
#include <serial.h>
#include <watchdog.h>
+#include <asm/cpm_8xx.h>
#include <linux/compiler.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/spi/mpc8xx_spi.c b/drivers/spi/mpc8xx_spi.c
index b5bd558526..eb035e9510 100644
--- a/drivers/spi/mpc8xx_spi.c
+++ b/drivers/spi/mpc8xx_spi.c
@@ -19,7 +19,7 @@
#include <common.h>
#include <mpc8xx.h>
-#include <commproc.h>
+#include <asm/cpm_8xx.h>
#include <linux/ctype.h>
#include <malloc.h>
#include <post.h>