[U-Boot] [PATCH 10/41] Convert CONFIG_CMD_PCI to Kconfig
Bin Meng
bmeng.cn at gmail.com
Sat Jul 22 15:18:01 UTC 2017
Hi Simon,
On Sat, Jul 22, 2017 at 7:11 AM, Simon Glass <sjg at chromium.org> wrote:
> This converts the following to Kconfig:
> CONFIG_CMD_PCI
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> README | 1 -
> arch/arm/cpu/armv7/ls102xa/Kconfig | 1 +
> arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 1 +
> arch/powerpc/cpu/mpc85xx/Kconfig | 6 ++++
> cmd/Kconfig | 8 ++++++
> .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 1 +
> .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 1 +
> .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 1 +
> .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 1 +
> configs/M5235EVB_Flash32_defconfig | 1 +
> configs/M5235EVB_defconfig | 1 +
> configs/M5475AFE_defconfig | 1 +
> configs/M5475BFE_defconfig | 1 +
> configs/M5475CFE_defconfig | 1 +
> configs/M5475DFE_defconfig | 1 +
> configs/M5475EFE_defconfig | 1 +
> configs/M5475FFE_defconfig | 1 +
> configs/M5475GFE_defconfig | 1 +
> configs/M5485AFE_defconfig | 1 +
> configs/M5485BFE_defconfig | 1 +
> configs/M5485CFE_defconfig | 1 +
> configs/M5485DFE_defconfig | 1 +
> configs/M5485EFE_defconfig | 1 +
> configs/M5485FFE_defconfig | 1 +
> configs/M5485GFE_defconfig | 1 +
> configs/M5485HFE_defconfig | 1 +
> configs/MPC8308RDB_defconfig | 1 +
> configs/MPC8313ERDB_33_defconfig | 1 +
> configs/MPC8313ERDB_66_defconfig | 1 +
> configs/MPC8313ERDB_NAND_33_defconfig | 1 +
> configs/MPC8313ERDB_NAND_66_defconfig | 1 +
> configs/MPC8315ERDB_defconfig | 1 +
> configs/MPC8323ERDB_defconfig | 1 +
> configs/MPC832XEMDS_HOST_33_defconfig | 1 +
> configs/MPC832XEMDS_HOST_66_defconfig | 1 +
> configs/MPC832XEMDS_SLAVE_defconfig | 1 +
> configs/MPC8349ITXGP_defconfig | 1 +
> configs/MPC8349ITX_LOWBOOT_defconfig | 1 +
> configs/MPC8349ITX_defconfig | 1 +
> configs/MPC837XEMDS_HOST_defconfig | 1 +
> configs/MPC837XERDB_defconfig | 1 +
> configs/MPC8536DS_36BIT_defconfig | 1 +
> configs/MPC8536DS_SDCARD_defconfig | 1 +
> configs/MPC8536DS_SPIFLASH_defconfig | 1 +
> configs/MPC8536DS_defconfig | 1 +
> configs/MPC8541CDS_defconfig | 1 +
> configs/MPC8541CDS_legacy_defconfig | 1 +
> configs/MPC8544DS_defconfig | 1 +
> configs/MPC8548CDS_36BIT_defconfig | 1 +
> configs/MPC8548CDS_defconfig | 1 +
> configs/MPC8548CDS_legacy_defconfig | 1 +
> configs/MPC8555CDS_defconfig | 1 +
> configs/MPC8555CDS_legacy_defconfig | 1 +
> configs/MPC8568MDS_defconfig | 1 +
> configs/MPC8569MDS_ATM_defconfig | 1 +
> configs/MPC8569MDS_defconfig | 1 +
> configs/MPC8572DS_36BIT_defconfig | 1 +
> configs/MPC8572DS_defconfig | 1 +
> configs/MPC8610HPCD_defconfig | 1 +
> configs/MPC8641HPCN_36BIT_defconfig | 1 +
> configs/MPC8641HPCN_defconfig | 1 +
> .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 1 +
> .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 1 +
> configs/P1021RDB-PC_36BIT_NAND_defconfig | 1 +
> configs/P1021RDB-PC_36BIT_SDCARD_defconfig | 1 +
> configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
> configs/P1021RDB-PC_36BIT_defconfig | 1 +
> configs/P1021RDB-PC_NAND_defconfig | 1 +
> configs/P1021RDB-PC_SDCARD_defconfig | 1 +
> configs/P1021RDB-PC_SPIFLASH_defconfig | 1 +
> configs/P1021RDB-PC_defconfig | 1 +
> configs/P1022DS_36BIT_NAND_defconfig | 1 +
> configs/P1022DS_36BIT_SDCARD_defconfig | 1 +
> configs/P1022DS_36BIT_SPIFLASH_defconfig | 1 +
> configs/P1022DS_36BIT_defconfig | 1 +
> configs/P1022DS_NAND_defconfig | 1 +
> configs/P1022DS_SDCARD_defconfig | 1 +
> configs/P1022DS_SPIFLASH_defconfig | 1 +
> configs/P1022DS_defconfig | 1 +
> configs/P1023RDB_defconfig | 1 +
> configs/P1025RDB_36BIT_defconfig | 1 +
> configs/P1025RDB_NAND_defconfig | 1 +
> configs/P1025RDB_SDCARD_defconfig | 1 +
> configs/P1025RDB_SPIFLASH_defconfig | 1 +
> configs/P1025RDB_defconfig | 1 +
> configs/P2020RDB-PC_36BIT_NAND_defconfig | 1 +
> configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 1 +
> configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
> configs/P2020RDB-PC_36BIT_defconfig | 1 +
> configs/P2020RDB-PC_NAND_defconfig | 1 +
> configs/P2020RDB-PC_SDCARD_defconfig | 1 +
> configs/P2020RDB-PC_SPIFLASH_defconfig | 1 +
> configs/P2020RDB-PC_defconfig | 1 +
> configs/TQM834x_defconfig | 1 +
> configs/TWR-P1025_defconfig | 1 +
> configs/apalis-tk1_defconfig | 1 +
> configs/apalis_t30_defconfig | 1 +
> configs/bayleybay_defconfig | 1 +
> configs/beaver_defconfig | 1 +
> configs/boston32r2_defconfig | 1 +
> configs/boston32r2el_defconfig | 1 +
> configs/boston64r2_defconfig | 1 +
> configs/boston64r2el_defconfig | 1 +
> configs/caddy2_defconfig | 1 +
> configs/cardhu_defconfig | 1 +
> configs/cei-tk1-som_defconfig | 1 +
> configs/chromebook_link64_defconfig | 1 +
> configs/chromebook_link_defconfig | 1 +
> configs/chromebook_samus_defconfig | 1 +
> configs/chromebox_panther_defconfig | 1 +
> configs/clearfog_defconfig | 1 +
> ...conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 +
> configs/conga-qeval20-qa3-e3845_defconfig | 1 +
> .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 1 +
> configs/controlcenterd_36BIT_SDCARD_defconfig | 1 +
> configs/controlcenterdc_defconfig | 1 +
> configs/coreboot-x86_defconfig | 1 +
> configs/cougarcanyon2_defconfig | 1 +
> configs/crownbay_defconfig | 1 +
> configs/db-88f6820-amc_defconfig | 1 +
> configs/db-88f6820-gp_defconfig | 1 +
> configs/db-mv784mp-gp_defconfig | 1 +
> configs/dfi-bt700-q7x-151_defconfig | 1 +
> configs/ds414_defconfig | 1 +
> configs/efi-x86_defconfig | 1 +
> configs/galileo_defconfig | 1 +
> configs/gwventana_emmc_defconfig | 1 +
> configs/gwventana_gw5904_defconfig | 1 +
> configs/gwventana_nand_defconfig | 1 +
> configs/hrcon_defconfig | 1 +
> configs/hrcon_dh_defconfig | 1 +
> configs/integratorap_cm720t_defconfig | 1 +
> configs/integratorap_cm920t_defconfig | 1 +
> configs/integratorap_cm926ejs_defconfig | 1 +
> configs/integratorap_cm946es_defconfig | 1 +
> configs/jetson-tk1_defconfig | 1 +
> configs/ls1012aqds_qspi_defconfig | 3 +-
> configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 1 +
> configs/ls1012ardb_qspi_defconfig | 1 +
> .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 +
> configs/ls1046aqds_SECURE_BOOT_defconfig | 1 +
> configs/ls1046aqds_defconfig | 1 +
> configs/ls1046aqds_nand_defconfig | 1 +
> configs/ls1046aqds_qspi_defconfig | 1 +
> configs/ls1046aqds_sdcard_ifc_defconfig | 1 +
> configs/ls1046aqds_sdcard_qspi_defconfig | 1 +
> configs/ls1046ardb_emmc_defconfig | 1 +
> configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 1 +
> configs/ls1046ardb_qspi_defconfig | 1 +
> configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 +
> configs/ls1046ardb_sdcard_defconfig | 1 +
> configs/ls2080aqds_SECURE_BOOT_defconfig | 1 +
> configs/ls2080aqds_defconfig | 1 +
> configs/ls2080aqds_nand_defconfig | 1 +
> configs/ls2080aqds_qspi_defconfig | 1 +
> configs/ls2080aqds_sdcard_defconfig | 1 +
> configs/ls2080ardb_SECURE_BOOT_defconfig | 1 +
> configs/ls2080ardb_defconfig | 1 +
> configs/ls2080ardb_nand_defconfig | 1 +
> configs/ls2081ardb_defconfig | 1 +
> configs/ls2088ardb_qspi_defconfig | 1 +
> configs/malta64_defconfig | 1 +
> configs/malta64el_defconfig | 1 +
> configs/malta_defconfig | 1 +
> configs/maltael_defconfig | 1 +
> configs/minnowmax_defconfig | 1 +
> configs/mpc8308_p1m_defconfig | 1 +
> configs/mvebu_db_armada8k_defconfig | 1 +
> configs/mvebu_mcbin-88f8040_defconfig | 1 +
> configs/mx6sabresd_defconfig | 1 +
> configs/mx6sxsabresd_defconfig | 1 +
> configs/mx6sxsabresd_spl_defconfig | 1 +
> configs/novena_defconfig | 1 +
> configs/p2371-2180_defconfig | 1 +
> configs/p2771-0000-000_defconfig | 1 +
> configs/p2771-0000-500_defconfig | 1 +
> configs/qemu-ppce500_defconfig | 1 +
> configs/qemu-x86_64_defconfig | 1 +
> configs/qemu-x86_defconfig | 1 +
> configs/qemu-x86_efi_payload32_defconfig | 1 +
> configs/qemu-x86_efi_payload64_defconfig | 1 +
> configs/r2dplus_defconfig | 1 +
> configs/r7780mp_defconfig | 1 +
> configs/sandbox_defconfig | 1 +
> configs/sandbox_flattree_defconfig | 1 +
> configs/sandbox_noblk_defconfig | 1 +
> configs/sandbox_spl_defconfig | 1 +
> configs/sbc8349_PCI_33_defconfig | 1 +
> configs/sbc8349_PCI_66_defconfig | 1 +
> configs/sbc8548_PCI_33_PCIE_defconfig | 1 +
> configs/sbc8548_PCI_33_defconfig | 1 +
> configs/sbc8548_PCI_66_PCIE_defconfig | 1 +
> configs/sbc8548_PCI_66_defconfig | 1 +
> configs/sbc8641d_defconfig | 1 +
> configs/sh7785lcr_32bit_defconfig | 1 +
> configs/sh7785lcr_defconfig | 1 +
> configs/socrates_defconfig | 1 +
> configs/som-db5800-som-6867_defconfig | 1 +
> configs/strider_con_defconfig | 1 +
> configs/strider_con_dp_defconfig | 1 +
> configs/strider_cpu_defconfig | 1 +
> configs/strider_cpu_dp_defconfig | 1 +
> configs/tbs2910_defconfig | 1 +
> configs/theadorable-x86-dfi-bt700_defconfig | 1 +
> configs/theadorable_debug_defconfig | 1 +
> configs/trimslice_defconfig | 1 +
> configs/turris_omnia_defconfig | 32 +++++-----------------
> configs/ve8313_defconfig | 1 +
> configs/vining_2000_defconfig | 1 +
> configs/vme8349_defconfig | 1 +
> configs/xpedite517x_defconfig | 1 +
> configs/xpedite520x_defconfig | 1 +
> configs/xpedite537x_defconfig | 1 +
> configs/xpedite550x_defconfig | 1 +
> configs/zc5202_defconfig | 1 +
> include/config_cmd_all.h | 1 -
> include/configs/B4860QDS.h | 4 ---
> include/configs/BSC9132QDS.h | 2 --
> include/configs/C29XPCIE.h | 2 --
> include/configs/M5235EVB.h | 1 -
> include/configs/M54455EVB.h | 1 -
> include/configs/M5475EVB.h | 4 ---
> include/configs/M5485EVB.h | 4 ---
> include/configs/MPC8308RDB.h | 1 -
> include/configs/MPC8313ERDB.h | 1 -
> include/configs/MPC8315ERDB.h | 1 -
> include/configs/MPC8323ERDB.h | 4 ---
> include/configs/MPC832XEMDS.h | 4 ---
> include/configs/MPC8349EMDS.h | 4 ---
> include/configs/MPC8349ITX.h | 4 ---
> include/configs/MPC837XEMDS.h | 4 ---
> include/configs/MPC837XERDB.h | 4 ---
> include/configs/MPC8536DS.h | 4 ---
> include/configs/MPC8540ADS.h | 4 ---
> include/configs/MPC8541CDS.h | 4 ---
> include/configs/MPC8544DS.h | 4 ---
> include/configs/MPC8548CDS.h | 4 ---
> include/configs/MPC8555CDS.h | 4 ---
> include/configs/MPC8560ADS.h | 4 ---
> include/configs/MPC8568MDS.h | 4 ---
> include/configs/MPC8569MDS.h | 4 ---
> include/configs/MPC8572DS.h | 4 ---
> include/configs/MPC8610HPCD.h | 4 ---
> include/configs/MPC8641HPCN.h | 4 ---
> include/configs/P1010RDB.h | 2 --
> include/configs/P1022DS.h | 4 ---
> include/configs/P1023RDB.h | 4 ---
> include/configs/P2041RDB.h | 4 ---
> include/configs/T102xQDS.h | 4 ---
> include/configs/T102xRDB.h | 4 ---
> include/configs/T1040QDS.h | 4 ---
> include/configs/T104xRDB.h | 4 ---
> include/configs/T208xQDS.h | 4 ---
> include/configs/T208xRDB.h | 4 ---
> include/configs/T4240RDB.h | 4 ---
> include/configs/TQM834x.h | 4 ---
> include/configs/UCP1020.h | 2 --
> include/configs/advantech_dms-ba16.h | 1 -
> include/configs/apalis-tk1.h | 1 -
> include/configs/apalis_t30.h | 1 -
> include/configs/beaver.h | 1 -
> include/configs/boston.h | 1 -
> include/configs/cardhu.h | 1 -
> include/configs/cei-tk1-som.h | 1 -
> include/configs/clearfog.h | 1 -
> include/configs/controlcenterd.h | 1 -
> include/configs/controlcenterdc.h | 1 -
> include/configs/corenet_ds.h | 4 ---
> include/configs/cyrus.h | 4 ---
> include/configs/db-88f6820-amc.h | 1 -
> include/configs/db-88f6820-gp.h | 1 -
> include/configs/db-mv784mp-gp.h | 1 -
> include/configs/ds414.h | 1 -
> include/configs/ge_bx50v3.h | 1 -
> include/configs/gw_ventana.h | 1 -
> include/configs/hrcon.h | 1 -
> include/configs/integratorap.h | 2 --
> include/configs/jetson-tk1.h | 1 -
> include/configs/km/km83xx-common.h | 4 ---
> include/configs/km/kmp204x-common.h | 1 -
> include/configs/ls1012aqds.h | 1 -
> include/configs/ls1012ardb.h | 1 -
> include/configs/ls1021aiot.h | 1 -
> include/configs/ls1021aqds.h | 1 -
> include/configs/ls1021atwr.h | 1 -
> include/configs/ls1043a_common.h | 1 -
> include/configs/ls1046a_common.h | 1 -
> include/configs/ls2080aqds.h | 1 -
> include/configs/ls2080ardb.h | 1 -
> include/configs/malta.h | 1 -
> include/configs/mpc8308_p1m.h | 1 -
> include/configs/mvebu_armada-8k.h | 1 -
> include/configs/mx6sabresd.h | 1 -
> include/configs/mx6sxsabresd.h | 1 -
> include/configs/novena.h | 1 -
> include/configs/p1_p2_rdb_pc.h | 2 --
> include/configs/p1_twr.h | 2 --
> include/configs/p2371-2180.h | 1 -
> include/configs/p2771-0000.h | 1 -
> include/configs/qemu-ppce500.h | 4 ---
> include/configs/r2dplus.h | 1 -
> include/configs/r7780mp.h | 1 -
> include/configs/sandbox.h | 2 --
> include/configs/sbc8349.h | 4 ---
> include/configs/sbc8548.h | 4 ---
> include/configs/sbc8641d.h | 4 ---
> include/configs/sh7785lcr.h | 1 -
> include/configs/socrates.h | 4 ---
> include/configs/strider.h | 1 -
> include/configs/t4qds.h | 4 ---
> include/configs/tbs2910.h | 1 -
> include/configs/theadorable.h | 3 --
> include/configs/trimslice.h | 1 -
> include/configs/turris_omnia.h | 1 -
> include/configs/ve8313.h | 1 -
> include/configs/vining_2000.h | 1 -
> include/configs/vme8349.h | 4 ---
> include/configs/x86-common.h | 1 -
> include/configs/xpedite517x.h | 1 -
> include/configs/xpedite520x.h | 1 -
> include/configs/xpedite537x.h | 1 -
> include/configs/xpedite550x.h | 1 -
> include/configs/zc5202.h | 1 -
> scripts/config_whitelist.txt | 1 -
> 324 files changed, 233 insertions(+), 272 deletions(-)
>
> diff --git a/README b/README
> index 43691cc167..fe63a7090b 100644
> --- a/README
> +++ b/README
> @@ -813,7 +813,6 @@ The following options need to be configured:
> CONFIG_CMD_NAND * NAND support
> CONFIG_CMD_NET bootp, tftpboot, rarpboot
> CONFIG_CMD_NFS NFS support
> - CONFIG_CMD_PCI * pciinfo
> CONFIG_CMD_PCMCIA * PCMCIA support
> CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network
> host
> diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig
> index 6a013b2183..fadfce4f05 100644
> --- a/arch/arm/cpu/armv7/ls102xa/Kconfig
> +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
> @@ -15,6 +15,7 @@ config ARCH_LS1021A
> select SYS_FSL_SEC_COMPAT_5
> select SYS_FSL_SEC_LE
> imply SCSI
> + imply CMD_PCI
I assume this was converted by moveconfig. It seems some of the
Kconfig files are updated to "imply CMD_PCI", but some are not (eg:
all x86 boards defconfig files are updated instead). What's the logic
for when to use "imply" vs. updating board defconfig file?
>
> menu "LS102xA architecture"
> depends on ARCH_LS1021A
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
> index 5825f9b726..0ab138b707 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
> @@ -27,6 +27,7 @@ config ARCH_LS1043A
> select ARCH_EARLY_INIT_R
> select BOARD_EARLY_INIT_F
> imply SCSI
> + imply CMD_PCI
>
> config ARCH_LS1046A
> bool
> diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
> index 93bf274947..11030d6180 100644
> --- a/arch/powerpc/cpu/mpc85xx/Kconfig
> +++ b/arch/powerpc/cpu/mpc85xx/Kconfig
> @@ -485,6 +485,7 @@ config ARCH_BSC9132
> select FSL_IFC
> imply CMD_EEPROM
> imply CMD_MTDPARTS
> + imply CMD_PCI
>
> config ARCH_C29X
> bool
> @@ -498,6 +499,7 @@ config ARCH_C29X
> select SYS_FSL_SEC_COMPAT_6
> select SYS_PPC_E500_USE_DEBUG_TLB
> select FSL_IFC
> + imply CMD_PCI
>
> config ARCH_MPC8536
> bool
> @@ -622,6 +624,7 @@ config ARCH_P1010
> imply CMD_EEPROM
> imply CMD_SATA
> imply CMD_MTDPARTS
> + imply CMD_PCI
>
> config ARCH_P1011
> bool
> @@ -651,6 +654,7 @@ config ARCH_P1020
> select SYS_PPC_E500_USE_DEBUG_TLB
> select FSL_ELBC
> imply CMD_SATA
> + imply CMD_PCI
>
> config ARCH_P1021
> bool
> @@ -711,6 +715,7 @@ config ARCH_P1024
> select FSL_ELBC
> imply CMD_EEPROM
> imply CMD_SATA
> + imply CMD_PCI
>
> config ARCH_P1025
> bool
> @@ -1053,6 +1058,7 @@ config E500
>
> config E500MC
> bool
> + imply CMD_PCI
> help
> Enble PowerPC E500MC core
>
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index 3e994e46c9..007895c4ce 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -771,6 +771,14 @@ config CMD_MMC_SPI
> to 20MHz. It is useful since it reduces the amount of protocol code
> required.
>
> +config CMD_PCI
> + bool "pci - Access PCI devices"
> + help
> + Provide access to PCI (Peripheral Interconnect Bus), a type of bus
> + used on some devices to allow the CPU to communicate with its
nits: the indention is wrong for this line and the following two.
> + peripherals. Sub-commands allow bus enumeration, displaying and
> + changing configuration space and a few other features.
> +
> endmenu
>
>
[snip]
Regards,
Bin
More information about the U-Boot
mailing list