From patchwork Fri Aug 4 22:34:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 798073 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="HJ5p92BL"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xPMNm5pcDz9sN7 for ; Sat, 5 Aug 2017 08:41:44 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 74B1CC21E76; Fri, 4 Aug 2017 22:40:44 +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_H3, RCVD_IN_MSPIKE_WL, 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 EED7AC21F22; Fri, 4 Aug 2017 22:35:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9CFC1C21EED; Fri, 4 Aug 2017 22:35:57 +0000 (UTC) Received: from mail-oi0-f54.google.com (mail-oi0-f54.google.com [209.85.218.54]) by lists.denx.de (Postfix) with ESMTPS id 14AB6C21EC9 for ; Fri, 4 Aug 2017 22:35:35 +0000 (UTC) Received: by mail-oi0-f54.google.com with SMTP id e124so27094045oig.2 for ; Fri, 04 Aug 2017 15:35:35 -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=E2I0+Z81IVwBLMiFx6LQsiKnogXrTAyXH0JiD2QFsis=; b=HJ5p92BLEjrMcPuiGrnlBjIrGVpkl7XSnLIZZrTcnRZVCm/7TVtGc77ChBLil37giS ardWWoU+V0ORP6RIcUK0JuvPSmSRB/MIAPMf47AE3vbn8hrc6t8lonTrXGVwKM7b15ID kywpelmpSyHj8wMEEBVC//ExHigO3Vq6K2Eoa7lC5q4kZVzHL2J7i94obq3vQxHZvOUz Stp4bcYm+vF6hqPO6Hffo+ViiiE8NKY4HQrhNVa5NB2SdHEJae1acPcK/XDbDvLh5UID w3N8hQ7NPbTfxSDEx9iD6oGJYDta40AtjOyXnT1/Cuu85nQWau1JC4Y7vV/wxeuf36iU EN1w== 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=E2I0+Z81IVwBLMiFx6LQsiKnogXrTAyXH0JiD2QFsis=; b=WdVg76BlqMnT0gKX5b7OK9cmHwGdlQd0vE+aMg7jEM8+N4+qYK+FId/O59n0UzWNvz yEyvFkiu52NhyEBovvI4ZDUEdUNRTUJo4Ts3U15apdA89OpY2dH6iTxH0g6er0rWCjcZ Ivg4Mis/mGiAcwD62fS/qjgPea/Oi15K7IePlfHv+R33kWHBvcFxMkWRnQ+/j7yV+2rW NjvaJmQlLy3S+Z5xZJMWfmNVtlQBOUl+3A1k++zCxxf1hTpKCb88+dKENdbG6fzO3DZ8 leUtw0+Vin3ZGHITI8e6kS6D9rm+MtS+byd1GExuuKKD4n9bFtE6dXhC++fRXE+VGnOw eOqg== X-Gm-Message-State: AHYfb5hIF9zciNF+TZZyuRneJEHx/0JhkP0KDK630d6YhJ27ywIgyadu AORQ9T+XXF1R0uwx X-Received: by 10.202.79.6 with SMTP id d6mr3159468oib.178.1501886133659; Fri, 04 Aug 2017 15:35:33 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([100.101.164.89]) by smtp.gmail.com with ESMTPSA id q206sm3098278oic.11.2017.08.04.15.35.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Aug 2017 15:35:33 -0700 (PDT) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id 684D81407B8; Fri, 4 Aug 2017 16:35:32 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Fri, 4 Aug 2017 16:34:35 -0600 Message-Id: <20170804223506.105306-12-sjg@chromium.org> X-Mailer: git-send-email 2.14.0.rc1.383.gd1ce394fe2-goog In-Reply-To: <20170804223506.105306-1-sjg@chromium.org> References: <20170804223506.105306-1-sjg@chromium.org> Cc: Stefan Roese , Tom Rini Subject: [U-Boot] [PATCH v2 11/42] Kconfig: Drop CONFIG_CMD_PCI_ENUM 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 option enables the 'pci enum' command. It is only enabled by a few board and these have not yet been converted to driver model, which always enables this command. It seems easiest to just remove this option. The affected boards can be converted to use driver model for PCI if needed. Signed-off-by: Simon Glass Reviewed-by: Bin Meng Reviewed-by: Philipp Tomsich --- Changes in v2: None cmd/pci.c | 4 ++-- include/config_distro_bootcmd.h | 2 +- include/configs/ds414.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - scripts/config_whitelist.txt | 1 - 8 files changed, 3 insertions(+), 9 deletions(-) diff --git a/cmd/pci.c b/cmd/pci.c index fe27b4f761..b8c799f9bd 100644 --- a/cmd/pci.c +++ b/cmd/pci.c @@ -694,7 +694,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if ((bdf = get_pci_dev(argv[2])) == -1) return 1; break; -#if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) +#if defined(CONFIG_DM_PCI) case 'e': pci_init(); return 0; @@ -782,7 +782,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static char pci_help_text[] = "[bus] [long]\n" " - short or long list of PCI devices on bus 'bus'\n" -#if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) +#if defined(CONFIG_DM_PCI) "pci enum\n" " - Enumerate PCI buses\n" #endif diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index d8dab8e46a..9ed6b9892c 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -198,7 +198,7 @@ BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_IDE #endif -#if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) +#if defined(CONFIG_DM_PCI) #define BOOTENV_RUN_NET_PCI_ENUM "run boot_net_pci_enum; " #define BOOTENV_SHARED_PCI \ "boot_net_pci_enum=pci enum\0" diff --git a/include/configs/ds414.h b/include/configs/ds414.h index f5998b4a52..0b84acdee8 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -48,7 +48,6 @@ /* PCIe support */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_PCI_ENUM #define CONFIG_PCI_MVEBU #define CONFIG_PCI_SCAN_SHOW #endif diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 58325f2ec8..57fc16812e 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -484,7 +484,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 2bf12120b3..628de82767 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -287,7 +287,6 @@ /* * Command configuration. */ -#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 2a345d4ac6..c599b22bc8 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -337,7 +337,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 0a09ded4d1..c387d951c1 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -336,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ea59f44733..9819f02985 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_PCI_ENUM CONFIG_CMD_PCMCIA CONFIG_CMD_PORTIO CONFIG_CMD_READ