diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2017-07-06 08:33:09 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-08 19:55:27 (GMT) |
| commit | debd1f3c336ae85915421f6da0d1cc90fc1d7a1a (patch) | |
| tree | df2bcc612c894e098ffdd815e4992d2d0ee00a95 /arch/powerpc | |
| parent | 907208c452999427cb2f43450308045bf8b42958 (diff) | |
| download | u-boot-debd1f3c336ae85915421f6da0d1cc90fc1d7a1a.tar.xz | |
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>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/Kconfig | 9 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/Makefile | 1 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/immap.c (renamed from arch/powerpc/lib/immap.c) | 3 | ||||
| -rw-r--r-- | arch/powerpc/lib/Kconfig | 7 | ||||
| -rw-r--r-- | arch/powerpc/lib/Makefile | 1 |
6 files changed, 10 insertions, 13 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a7558d5..e9002a7 100644 --- 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 a425cba..cb15dc5 100644 --- 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 5dd801d..eae02da 100644 --- 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 index 1beed1f..5ff6aa5 100644 --- 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 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 4aa4183..9a3043a 100644 --- 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 |