From patchwork Tue May 16 23:38:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 763285 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 3wSGwd0hYfz9s84 for ; Wed, 17 May 2017 11:30:40 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="mRRKiO8L"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 9EFBDC22336; Tue, 16 May 2017 23:58:01 +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, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 5E56EC221F1; Tue, 16 May 2017 23:44:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1886FC22182; Tue, 16 May 2017 23:41:24 +0000 (UTC) Received: from mail-oi0-f47.google.com (mail-oi0-f47.google.com [209.85.218.47]) by lists.denx.de (Postfix) with ESMTPS id B5C32C22190 for ; Tue, 16 May 2017 23:39:44 +0000 (UTC) Received: by mail-oi0-f47.google.com with SMTP id h4so45030970oib.3 for ; Tue, 16 May 2017 16:39:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=tOdyPLrVuYPjWnfCTEug5AuCtObwJxiSvSsAyhucxGQ=; b=mRRKiO8LpPiVwE/x6T49MC32N48DK7+OmbAL2pJNsgkh+9WmqvCw0+SEn9tZnujZqO sMxTpNYs+0hcsGAEkT8zrpZFRPIVqBeARA+tnzrk9x/pso6gjVLkYuddoGH94KN9ZM0I aytJPST7/X0+bhhyN2Sj0+P9NuPKS0KeqYc/FcGI+1uyhhBLU+TN54OHnJuHUJ06TQ01 VycZMq2SjxqPijNEte9O0bidlkuICUfBqQFLe7JGdcy5MFysUCAWo/8+dKTsf7thBbuN CVrtaHjCFDcAGQ8rOerV+zrhE4aXKfZCt6SZheugGk1TF30qGu1s9Pd1g+YTN4BQxTGA 8SEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=tOdyPLrVuYPjWnfCTEug5AuCtObwJxiSvSsAyhucxGQ=; b=s87+mawSCSucKeTwtauOVEPBp7SBMGZjBFuaMvMo8s6cwE7qYtJvsRTj2l9hq34L+6 paEqLQ3bxwItqBM9YWsXdx3/WLLY6SdxQhmnG98FMmDauiV1UfYrrwq2vfMuI/i70BWg +duPPlGjWYARUpl2yV3964/8cps1SP3l6P9pFNNl3DNBU/jhpl9zQ3ezu1GrpTA3OVMj UaP3g7Mj0+R5J4ig8B5AIsdNHNk3CQh7ab2mFDbe+50cPOsqsLGgNJHcHwFokd1/hkl2 iv37HJNgo6J7QihmzT8EQxXSCOpY01QIpD+la4tQpiUUnvFD84EGpNRBGb3qv2swrhzA lUWA== X-Gm-Message-State: AODbwcBhvv6DYJ2TLZDV4PIBLJAsE2g4uyDyVY5q+SvDX7MMtC4s/bnV nXWP8hsRfjNmeUgh X-Received: by 10.157.19.40 with SMTP id f37mr370228ote.118.1494977983409; Tue, 16 May 2017 16:39:43 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:1005:11:f934:5ed:f6d9:d017]) by smtp.gmail.com with ESMTPSA id h27sm172916ote.27.2017.05.16.16.39.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 May 2017 16:39:41 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 7A36D40550; Tue, 16 May 2017 17:39:40 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Tue, 16 May 2017 17:38:55 -0600 Message-Id: <20170516233908.2337-36-sjg@chromium.org> X-Mailer: git-send-email 2.13.0.303.g4ebf302169-goog In-Reply-To: <20170516233908.2337-1-sjg@chromium.org> References: <20170516233908.2337-1-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH v2 35/48] Convert CONFIG_CMD_IMMAP to Kconfig 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" This converts the following to Kconfig: CONFIG_CMD_IMMAP Also move this command out of the cmd/ directory since it is PowerPC-specific. Signed-off-by: Simon Glass --- Changes in v2: None README | 1 - arch/powerpc/Kconfig | 2 ++ arch/powerpc/lib/Kconfig | 8 ++++++++ arch/powerpc/lib/Makefile | 1 + {cmd => arch/powerpc/lib}/immap.c | 0 cmd/Makefile | 1 - configs/canmb_defconfig | 1 + configs/kmcoge4_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/mgcoge3ne_defconfig | 1 + configs/mgcoge_defconfig | 1 + configs/motionpro_defconfig | 1 + configs/munices_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/canmb.h | 1 - include/configs/km/keymile-common.h | 1 - include/configs/motionpro.h | 1 - include/configs/munices.h | 1 - scripts/config_whitelist.txt | 1 - 29 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 arch/powerpc/lib/Kconfig rename {cmd => arch/powerpc/lib}/immap.c (100%) diff --git a/README b/README index 2dafe21f0d..5f3ccbe112 100644 --- a/README +++ b/README @@ -850,7 +850,6 @@ The following options need to be configured: CONFIG_CMD_IMI iminfo CONFIG_CMD_IMLS List all images found in NOR flash CONFIG_CMD_IMLS_NAND * List all images found in NAND flash - CONFIG_CMD_IMMAP * IMMR dump support CONFIG_CMD_IOTRACE * I/O tracing for debugging CONFIG_CMD_IMPORTENV * import an environment CONFIG_CMD_INI * import data from an ini file into the env diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 3d2c1319c9..eae94c8fd5 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -49,6 +49,8 @@ config 4xx endchoice +source "arch/powerpc/lib/Kconfig" + source "arch/powerpc/cpu/mpc512x/Kconfig" source "arch/powerpc/cpu/mpc5xx/Kconfig" source "arch/powerpc/cpu/mpc5xxx/Kconfig" diff --git a/arch/powerpc/lib/Kconfig b/arch/powerpc/lib/Kconfig new file mode 100644 index 0000000000..987cec99cb --- /dev/null +++ b/arch/powerpc/lib/Kconfig @@ -0,0 +1,8 @@ +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 + sitinfo - print System Integration Timers (SIT) registers diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 88adb26e2e..e09bd9a88a 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -33,6 +33,7 @@ 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-$(CONFIG_IDE) += ide.o diff --git a/cmd/immap.c b/arch/powerpc/lib/immap.c similarity index 100% rename from cmd/immap.c rename to arch/powerpc/lib/immap.c diff --git a/cmd/Makefile b/cmd/Makefile index f043407656..1293d24e39 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -68,7 +68,6 @@ obj-$(CONFIG_CMD_I2C) += i2c.o obj-$(CONFIG_CMD_IOTRACE) += iotrace.o obj-$(CONFIG_CMD_HASH) += hash.o obj-$(CONFIG_CMD_IDE) += ide.o disk.o -obj-$(CONFIG_CMD_IMMAP) += immap.o obj-$(CONFIG_CMD_INI) += ini.o obj-$(CONFIG_CMD_IRQ) += irq.o obj-$(CONFIG_CMD_ITEST) += itest.o diff --git a/configs/canmb_defconfig b/configs/canmb_defconfig index 1f6f18d601..87eb205d0c 100644 --- a/configs/canmb_defconfig +++ b/configs/canmb_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC5xxx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_CANMB=y CONFIG_BOOTDELAY=5 CONFIG_CMD_ASKENV=y diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig index 4d6718dd31..63ad7edf48 100644 --- a/configs/kmcoge4_defconfig +++ b/configs/kmcoge4_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC85xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KMP204X=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index 233943c0d7..31cad022ef 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KM8360=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index d92e6b2934..bb8a0fe292 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KM8360=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig index 13f5c1e304..e5b7ba67a4 100644 --- a/configs/kmlion1_defconfig +++ b/configs/kmlion1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC85xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KMP204X=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index 0b112ffb48..9e9c0b9843 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index ba02124ccb..5235530725 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig index 16b7b18062..464a125c39 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_SUVD3=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index 3f73346208..ca64a6e99e 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index 8b9180b6a6..04a3e48d53 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_SUVD3=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig index d66fffe47e..0d4a1e102d 100644 --- a/configs/mgcoge3ne_defconfig +++ b/configs/mgcoge3ne_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC8260=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KM82XX=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig index c9f07d11a4..f4f8ae5452 100644 --- a/configs/mgcoge_defconfig +++ b/configs/mgcoge_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC8260=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KM82XX=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig index ab9ea81021..5521e6d01b 100644 --- a/configs/motionpro_defconfig +++ b/configs/motionpro_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC5xxx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_MOTIONPRO=y CONFIG_OF_BOARD_SETUP=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/munices_defconfig b/configs/munices_defconfig index ddd5c43de2..0e2b188a51 100644 --- a/configs/munices_defconfig +++ b/configs/munices_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC5xxx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_MUNICES=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index 68fee8ce79..68cfe65a5e 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_SUVD3=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index a5579e4f33..3cb1404c92 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index 519472f247..18b124a58c 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index b00f96ef6e..8ab46ca47e 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */ -#define CONFIG_CMD_IMMAP /* IMMR dump support */ #define CONFIG_CMD_IO /* Access to X86 IO space */ #define CONFIG_CMD_IRQ /* irqinfo */ #define CONFIG_CMD_JFFS2 /* JFFS2 Support */ diff --git a/include/configs/canmb.h b/include/configs/canmb.h index c70979ed1a..b7c74b4264 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 506ce51236..08ccaa200c 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -13,7 +13,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 02ac7b3089..035f1dc5f9 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,7 +33,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO diff --git a/include/configs/munices.h b/include/configs/munices.h index 1679430951..ad2d69e6a5 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -26,7 +26,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP #define CONFIG_CMD_REGINFO #if defined(CONFIG_CMD_KGDB) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index bf8e9d5024..3d5e45da73 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IMMAP CONFIG_CMD_IMXOTP CONFIG_CMD_IMX_FUSE CONFIG_CMD_IO