From patchwork Thu Jul 6 08:33:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 785033 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3x39xs0zmrz9s7F for ; Thu, 6 Jul 2017 18:33:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DB246C21EE8; Thu, 6 Jul 2017 08:33:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0E1EEC21F3D; Thu, 6 Jul 2017 08:33:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AFFDCC21EBF; Thu, 6 Jul 2017 08:33:14 +0000 (UTC) Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by lists.denx.de (Postfix) with ESMTPS id 8F536C21EBF for ; Thu, 6 Jul 2017 08:33:10 +0000 (UTC) Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 3x39wm6s11z9ttBn; Thu, 6 Jul 2017 10:32:56 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id ooBrxM13kkNQ; Thu, 6 Jul 2017 10:32:56 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 3x39wm6FFFz9ttBT; Thu, 6 Jul 2017 10:32:56 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id D029B8B7A7; Thu, 6 Jul 2017 10:33:09 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id Gyp4Nm7sFFGh; Thu, 6 Jul 2017 10:33:09 +0200 (CEST) Received: from pc13941vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.8]) by messagerie.si.c-s.fr (Postfix) with ESMTP id B01A48B7A6; Thu, 6 Jul 2017 10:33:09 +0200 (CEST) Received: by pc13941vm.idsi0.si.c-s.fr (Postfix, from userid 0) id A908C69745; Thu, 6 Jul 2017 10:33:09 +0200 (CEST) Message-Id: <0f6b1b9c0d4d1c29559bfd579591bc77506ddc19.1499329461.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy To: Wolfgang Denk , Heiko Schocher , Tom Rini Date: Thu, 6 Jul 2017 10:33:09 +0200 (CEST) Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH v2 01/10] powerpc, 8xx: move immap.c in arch/powerpc/cpu/mpc8xx/ X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Reviewed-by: Heiko Schocher --- arch/powerpc/Kconfig | 2 -- arch/powerpc/cpu/mpc8xx/Kconfig | 9 +++++++++ arch/powerpc/cpu/mpc8xx/Makefile | 1 + arch/powerpc/{lib => cpu/mpc8xx}/immap.c | 3 --- arch/powerpc/lib/Kconfig | 7 ------- arch/powerpc/lib/Makefile | 1 - 6 files changed, 10 insertions(+), 13 deletions(-) rename arch/powerpc/{lib => cpu/mpc8xx}/immap.c (99%) delete mode 100644 arch/powerpc/lib/Kconfig diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a7558d59b2..e9002a76ab 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 a425cba8aa..cb15dc5ebc 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 5dd801d76e..eae02da636 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 similarity index 99% rename from arch/powerpc/lib/immap.c rename to arch/powerpc/cpu/mpc8xx/immap.c index 1beed1fa40..5ff6aa5e3b 100644 --- a/arch/powerpc/lib/immap.c +++ b/arch/powerpc/cpu/mpc8xx/immap.c @@ -12,8 +12,6 @@ #include #include -#if defined(CONFIG_8xx) - #include #include #include @@ -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 7c8ea971c3..0000000000 --- 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 4aa41836a2..9a3043abf8 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