[U-Boot] [PATCH 02/29] Convert CONFIG_SCSI to Kconfig

Bin Meng bmeng.cn at gmail.com
Tue Jun 13 02:12:45 UTC 2017


Hi Simon,

On Tue, Jun 6, 2017 at 3:14 AM, Simon Glass <sjg at chromium.org> wrote:
> This converts the following to Kconfig:
>    CONFIG_SCSI
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
>  README                                      |  1 -
>  arch/Kconfig                                |  1 +
>  arch/arm/Kconfig                            | 10 ++++++++++
>  arch/arm/cpu/armv7/ls102xa/Kconfig          |  1 +
>  arch/arm/cpu/armv8/fsl-layerscape/Kconfig   |  2 ++
>  arch/arm/include/asm/arch-ls102xa/config.h  |  1 -
>  arch/arm/mach-mvebu/Kconfig                 |  2 ++
>  arch/arm/mach-omap2/omap5/Kconfig           |  2 ++
>  arch/powerpc/cpu/mpc85xx/Kconfig            |  1 +
>  arch/powerpc/cpu/mpc86xx/Kconfig            |  1 +
>  board/congatec/Kconfig                      |  1 +
>  board/dfi/Kconfig                           |  1 +
>  configs/A10-OLinuXino-Lime_defconfig        |  1 +
>  configs/A20-OLinuXino-Lime2_defconfig       |  1 +
>  configs/A20-OLinuXino-Lime_defconfig        |  1 +
>  configs/A20-OLinuXino_MICRO_defconfig       |  1 +
>  configs/A20-Olimex-SOM-EVB_defconfig        |  1 +
>  configs/Bananapi_M2_Ultra_defconfig         |  1 +
>  configs/Bananapi_defconfig                  |  1 +
>  configs/Bananapro_defconfig                 |  1 +
>  configs/Cubieboard2_defconfig               |  1 +
>  configs/Cubieboard_defconfig                |  1 +
>  configs/Cubietruck_defconfig                |  1 +
>  configs/Itead_Ibox_A20_defconfig            |  1 +
>  configs/Lamobo_R1_defconfig                 |  1 +
>  configs/Linksprite_pcDuino3_Nano_defconfig  |  1 +
>  configs/Linksprite_pcDuino3_defconfig       |  1 +
>  configs/MPC8544DS_defconfig                 |  1 +
>  configs/MPC8610HPCD_defconfig               |  1 +
>  configs/Marsboard_A10_defconfig             |  1 +
>  configs/Mele_A1000_defconfig                |  1 +
>  configs/Mele_M5_defconfig                   |  1 +
>  configs/Orangepi_defconfig                  |  1 +
>  configs/Orangepi_mini_defconfig             |  1 +
>  configs/PIP405_defconfig                    |  1 +
>  configs/Wits_Pro_A20_DKT_defconfig          |  1 +
>  configs/bayleybay_defconfig                 |  1 +
>  configs/chromebook_link64_defconfig         |  1 +
>  configs/chromebook_link_defconfig           |  1 +
>  configs/chromebook_samus_defconfig          |  1 +
>  configs/chromebox_panther_defconfig         |  1 +
>  configs/cm_t54_defconfig                    |  1 +
>  configs/controlcenterdc_defconfig           |  1 +
>  configs/cougarcanyon2_defconfig             |  1 +
>  configs/crownbay_defconfig                  |  1 +
>  configs/db-88f6820-gp_defconfig             |  1 +
>  configs/highbank_defconfig                  |  1 +
>  configs/ls1012aqds_qspi_defconfig           |  1 +
>  configs/ls2081ardb_defconfig                |  1 +
>  configs/minnowmax_defconfig                 |  1 +
>  configs/omap5_uevm_defconfig                |  1 +
>  configs/som-db5800-som-6867_defconfig       |  1 +
>  configs/xilinx_zynqmp_ep_defconfig          |  1 +
>  configs/xilinx_zynqmp_zcu102_defconfig      |  1 +
>  configs/xilinx_zynqmp_zcu102_revB_defconfig |  1 +
>  drivers/block/Kconfig                       |  9 +++++++++
>  include/config_cmd_all.h                    |  1 -
>  include/configs/MPC8544DS.h                 |  1 -
>  include/configs/MPC8572DS.h                 |  1 -
>  include/configs/MPC8610HPCD.h               |  1 -
>  include/configs/MPC8641HPCN.h               |  1 -
>  include/configs/PIP405.h                    |  1 -
>  include/configs/am57xx_evm.h                |  1 -
>  include/configs/cm_t54.h                    |  1 -
>  include/configs/controlcenterdc.h           |  1 -
>  include/configs/db-88f6820-gp.h             |  1 -
>  include/configs/dra7xx_evm.h                |  1 -
>  include/configs/efi-x86.h                   |  1 -
>  include/configs/galileo.h                   |  1 -
>  include/configs/highbank.h                  |  1 -
>  include/configs/ls1012aqds.h                |  1 -
>  include/configs/ls1012ardb.h                |  1 -
>  include/configs/ls1043aqds.h                |  1 -
>  include/configs/ls1046aqds.h                |  1 -
>  include/configs/ls1046ardb.h                |  1 -
>  include/configs/ls2080aqds.h                |  1 -
>  include/configs/ls2080ardb.h                |  1 -
>  include/configs/mvebu_armada-37xx.h         |  1 -
>  include/configs/mvebu_armada-8k.h           |  1 -
>  include/configs/omap5_uevm.h                |  1 -
>  include/configs/qemu-x86.h                  |  1 -
>  include/configs/sandbox.h                   |  1 -
>  include/configs/sunxi-common.h              |  1 -
>  include/configs/x86-common.h                |  1 -
>  include/configs/xilinx_zynqmp.h             |  1 -
>  scripts/config_whitelist.txt                |  1 -
>  86 files changed, 74 insertions(+), 32 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn at gmail.com>

But please see nits below.

> diff --git a/README b/README
> index 075d919df3..750b7351fe 100644
> --- a/README
> +++ b/README
> @@ -881,7 +881,6 @@ The following options need to be configured:
>                 CONFIG_CMD_RUN            run command in env variable
>                 CONFIG_CMD_SANDBOX      * sb command to access sandbox features
>                 CONFIG_CMD_SAVES        * save S record dump
> -               CONFIG_SCSI             * SCSI Support
>                 CONFIG_CMD_SDRAM        * print SDRAM configuration information
>                                           (requires CONFIG_CMD_I2C)
>                 CONFIG_CMD_SETGETDCR      Support for DCR Register access
> diff --git a/arch/Kconfig b/arch/Kconfig
> index e44767113d..1f874a3e32 100644
> --- a/arch/Kconfig
> +++ b/arch/Kconfig
> @@ -79,6 +79,7 @@ config SANDBOX
>         imply FAT_WRITE
>         imply HASH_VERIFY
>         imply LZMA
> +       imply SCSI
>
>  config SH
>         bool "SuperH architecture"
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index deb7b24682..24bb0baeee 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -787,6 +787,7 @@ config TARGET_LS2080AQDS
>           The LS2080A Development System (QDS) is a high-performance
>           development platform that supports the QorIQ LS2080A
>           Layerscape Architecture processor.
> +       imply SCSI

nits: can we move the "imply SCSI" to before the "help" message?

>
>  config TARGET_LS2080ARDB
>         bool "Support ls2080ardb"
> @@ -801,6 +802,7 @@ config TARGET_LS2080ARDB
>           The LS2080A Reference design board (RDB) is a high-performance
>           development platform that supports the QorIQ LS2080A
>           Layerscape Architecture processor.
> +       imply SCSI
>

nits: can we move the "imply SCSI" to before the "help" message?

>  config TARGET_LS2081ARDB
>         bool "Support ls2081ardb"
> @@ -843,6 +845,7 @@ config TARGET_LS1012ARDB
>         select ARCH_LS1012A
>         select ARM64
>         select BOARD_LATE_INIT
> +       imply SCSI
>         help
>           Support for Freescale LS1012ARDB platform.
>           The LS1012A Reference design board (RDB) is a high-performance
> @@ -871,6 +874,7 @@ config TARGET_LS1021AQDS
>         select LS1_DEEP_SLEEP
>         select SYS_FSL_DDR
>         select BOARD_EARLY_INIT_F
> +       imply SCSI
>
>  config TARGET_LS1021ATWR
>         bool "Support ls1021atwr"
> @@ -883,6 +887,7 @@ config TARGET_LS1021ATWR
>         select ARCH_SUPPORT_PSCI
>         select LS1_DEEP_SLEEP
>         select BOARD_EARLY_INIT_F
> +       imply SCSI
>
>  config TARGET_LS1021AIOT
>         bool "Support ls1021aiot"
> @@ -893,6 +898,7 @@ config TARGET_LS1021AIOT
>         select SUPPORT_SPL
>         select ARCH_LS1021A
>         select ARCH_SUPPORT_PSCI
> +       imply SCSI
>         help
>           Support for Freescale LS1021AIOT platform.
>           The LS1021A Freescale board (IOT) is a high-performance
> @@ -907,6 +913,7 @@ config TARGET_LS1043AQDS
>         select BOARD_LATE_INIT
>         select SUPPORT_SPL
>         select BOARD_EARLY_INIT_F
> +       imply SCSI
>         help
>           Support for Freescale LS1043AQDS platform.
>
> @@ -918,6 +925,7 @@ config TARGET_LS1043ARDB
>         select BOARD_LATE_INIT
>         select SUPPORT_SPL
>         select BOARD_EARLY_INIT_F
> +       imply SCSI
>         help
>           Support for Freescale LS1043ARDB platform.
>
> @@ -930,6 +938,7 @@ config TARGET_LS1046AQDS
>         select SUPPORT_SPL
>         select DM_SPI_FLASH if DM_SPI
>         select BOARD_EARLY_INIT_F
> +       imply SCSI
>         help
>           Support for Freescale LS1046AQDS platform.
>           The LS1046A Development System (QDS) is a high-performance
> @@ -951,6 +960,7 @@ config TARGET_LS1046ARDB
>           The LS1046A Reference Design Board (RDB) is a high-performance
>           development platform that supports the QorIQ LS1046A
>           Layerscape Architecture processor.
> +       imply SCSI
>

nits: can we move the "imply SCSI" to before the "help" message?

>  config TARGET_H2200
>         bool "Support h2200"
> diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig
> index b61f3cdcde..6a013b2183 100644
> --- a/arch/arm/cpu/armv7/ls102xa/Kconfig
> +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
> @@ -14,6 +14,7 @@ config ARCH_LS1021A
>         select SYS_FSL_HAS_SEC
>         select SYS_FSL_SEC_COMPAT_5
>         select SYS_FSL_SEC_LE
> +       imply SCSI
>
>  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 d8b285dcd7..5825f9b726 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
> @@ -26,6 +26,7 @@ config ARCH_LS1043A
>         select SYS_FSL_HAS_DDR4
>         select ARCH_EARLY_INIT_R
>         select BOARD_EARLY_INIT_F
> +       imply SCSI
>
>  config ARCH_LS1046A
>         bool
> @@ -46,6 +47,7 @@ config ARCH_LS1046A
>         select SYS_FSL_SRDS_2
>         select ARCH_EARLY_INIT_R
>         select BOARD_EARLY_INIT_F
> +       imply SCSI
>
>  config ARCH_LS2080A
>         bool
> diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
> index 5c4da0f0e3..fc954c5366 100644
> --- a/arch/arm/include/asm/arch-ls102xa/config.h
> +++ b/arch/arm/include/asm/arch-ls102xa/config.h
> @@ -81,7 +81,6 @@
>
>  /* SATA */
>  #define AHCI_BASE_ADDR                         (CONFIG_SYS_IMMR + 0x02200000)
> -#define CONFIG_SCSI
>  #define CONFIG_LIBATA
>  #define CONFIG_SCSI_AHCI
>  #define CONFIG_SCSI_AHCI_PLAT
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index 6ae54ef46a..89476a663a 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -77,6 +77,7 @@ config TARGET_CLEARFOG
>  config TARGET_MVEBU_ARMADA_37XX
>         bool "Support Armada 37xx platforms"
>         select ARMADA_3700
> +       imply SCSI
>
>  config TARGET_DB_88F6720
>         bool "Support DB-88F6720 Armada 375"
> @@ -94,6 +95,7 @@ config TARGET_MVEBU_ARMADA_8K
>         bool "Support Armada 7k/8k platforms"
>         select ARMADA_8K
>         select BOARD_LATE_INIT
> +       imply SCSI
>
>  config TARGET_DB_MV784MP_GP
>         bool "Support db-mv784mp-gp"
> diff --git a/arch/arm/mach-omap2/omap5/Kconfig b/arch/arm/mach-omap2/omap5/Kconfig
> index 1a66abdeb2..08f45bc868 100644
> --- a/arch/arm/mach-omap2/omap5/Kconfig
> +++ b/arch/arm/mach-omap2/omap5/Kconfig
> @@ -25,12 +25,14 @@ config TARGET_DRA7XX_EVM
>         select DRA7XX
>         select TI_I2C_BOARD_DETECT
>         select PHYS_64BIT
> +       imply SCSI
>
>  config TARGET_AM57XX_EVM
>         bool "AM57XX"
>         select BOARD_LATE_INIT
>         select DRA7XX
>         select TI_I2C_BOARD_DETECT
> +       imply SCSI
>
>  endchoice
>

[snip]

> diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
> index 931defd2ae..b0e8602011 100644
> --- a/drivers/block/Kconfig
> +++ b/drivers/block/Kconfig
> @@ -19,6 +19,15 @@ config AHCI
>           operations at present. The block device interface has not been converted
>           to driver model.
>
> +config SCSI
> +       bool "Support SCSI controllers"
> +       help
> +         This enabled support for SCSI (Small Computer System Interface),

nits: enables

> +         a parallel interface widely used with storage peripherals such as
> +         hard drives and optical drives. The SCSI standards define physical
> +         interfaces as well as protocols for controlling devices and
> +         tranferring data.
> +
>  config DM_SCSI
>         bool "Support SCSI controllers with driver model"
>         depends on BLK

[snip]

Regards,
Bin


More information about the U-Boot mailing list