powerpc, 8xx: move immap.c in arch/powerpc/cpu/mpc8xx/

immap.c used to be common to several CPUs. It is now
only linked to the 8xx, so this patch moves it into
arch/powerpc/cpu/mpc8xx/

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: Heiko Schocher <hs@denx.de>

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a7558d59b250b2d9b9d338bb38ff93017b62bfe7..e9002a76ab1a9472210c59d7268db9675fc6de31 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -34,8 +34,6 @@ config 8xx
 
 endchoice
 
-source "arch/powerpc/lib/Kconfig"
-
 source "arch/powerpc/cpu/mpc83xx/Kconfig"
 source "arch/powerpc/cpu/mpc85xx/Kconfig"
 source "arch/powerpc/cpu/mpc86xx/Kconfig"

diff --git a/arch/powerpc/cpu/mpc8xx/Kconfig b/arch/powerpc/cpu/mpc8xx/Kconfig
index a425cba8aa4b961ab00b66e23a0c2522dd8f1ba1..cb15dc5ebc99dabbd165ae24bc9220b40d6d4faa 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/Kconfig
+++ b/arch/powerpc/cpu/mpc8xx/Kconfig
@@ -10,4 +10,13 @@ choice
 
 endchoice
 
+comment "Specific commands"
+
+config CMD_IMMAP
+       bool "Enable various commands to dump IMMR information"
+       help
+         This enables various commands such as:
+
+           siuinfo - print System Interface Unit (SIU) registers
+           memcinfo - print Memory Controller registers
 endmenu

diff --git a/arch/powerpc/cpu/mpc8xx/Makefile b/arch/powerpc/cpu/mpc8xx/Makefile
index 5dd801d76e8e90f5a774ea5586a66c1e5912ed3a..eae02da6369a909ad27a83dddef979df8c87da48 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/Makefile
+++ b/arch/powerpc/cpu/mpc8xx/Makefile
@@ -11,6 +11,7 @@ obj-y += cpu.o
 obj-y  += cpu_init.o
 obj-y  += fec.o
 obj-$(CONFIG_OF_LIBFDT) += fdt.o
+obj-$(CONFIG_CMD_IMMAP) += immap.o
 obj-y  += interrupts.o
 obj-y  += serial.o
 obj-y  += speed.o

diff --git a/arch/powerpc/lib/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
similarity index 99%
rename from arch/powerpc/lib/immap.c
rename to arch/powerpc/cpu/mpc8xx/immap.c
index 1beed1fa40f9a5c8ac9d126f975c80786bc7db73..5ff6aa5e3b6bbdb07a6589e3f919e765dce173b9 100644 (file)
--- a/arch/powerpc/lib/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -12,8 +12,6 @@
 #include <common.h>
 #include <command.h>
 
-#if defined(CONFIG_8xx)
-
 #include <asm/8xx_immap.h>
 #include <commproc.h>
 #include <asm/iopin_8xx.h>
@@ -394,4 +392,3 @@ U_BOOT_CMD(
        "print Baud Rate Generator (BRG) registers",
        ""
 );
-#endif

diff --git a/arch/powerpc/lib/Kconfig b/arch/powerpc/lib/Kconfig
deleted file mode 100644 (file)
index 7c8ea97..0000000
--- a/arch/powerpc/lib/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-config CMD_IMMAP
-       bool "Enable various commands to dump IMMR information"
-       help
-         This enables various commands such as:
-
-           siuinfo - print System Interface Unit (SIU) registers
-           memcinfo - print Memory Controller registers

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 4aa41836a25876007b1361d69d1828d43d5b2542..9a3043abf8c6d8aad750b43e13d538a7d96977ce 100644 (file)
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -32,7 +32,6 @@ obj-$(CONFIG_BAT_RW) += bat_rw.o
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-y  += cache.o
 obj-y  += extable.o
-obj-$(CONFIG_CMD_IMMAP) += immap.o
 obj-y  += interrupts.o
 obj-$(CONFIG_CMD_KGDB) += kgdb.o
 obj-y  += stack.o