Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-27 16:01:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge patch series "efi_loader: select BLK not depends on BLK"

Browse source 
Tom Rini <trini@konsulko.com> says:

Rework how the BLK symbol is used now that so much DM migration has been
completed.
This commit is contained in:
Tom Rini 2024-06-14 10:39:40 -06:00
commit 281a80c483
40 changed files with 53 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/spl/Kconfig
View file

@ -1294,7 +1294,7 @@ config SPL_SATA_RAW_U_BOOT_SECTOR
config SPL_NVME config SPL_NVME
bool "NVM Express device support" bool "NVM Express device support"
depends on BLK depends on SPL_BLK
select FS_LOADER select FS_LOADER
select SPL_BLK_FS select SPL_BLK_FS
help help

1
configs/cortina_presidio-asic-base_defconfig
View file

@ -38,3 +38,4 @@ CONFIG_DM_SERIAL=y
CONFIG_CORTINA_UART=y CONFIG_CORTINA_UART=y
CONFIG_WDT=y CONFIG_WDT=y
CONFIG_WDT_CORTINA=y CONFIG_WDT_CORTINA=y
# CONFIG_EFI_LOADER is not set

1
configs/cortina_presidio-asic-pnand_defconfig
View file

@ -43,3 +43,4 @@ CONFIG_DM_SERIAL=y
CONFIG_CORTINA_UART=y CONFIG_CORTINA_UART=y
CONFIG_WDT=y CONFIG_WDT=y
CONFIG_WDT_CORTINA=y CONFIG_WDT_CORTINA=y
# CONFIG_EFI_LOADER is not set

1
configs/crs305-1g-4s-bit_defconfig
View file

@ -47,3 +47,4 @@ CONFIG_SPI_FLASH_MTD=y
CONFIG_PCI_MVEBU=y CONFIG_PCI_MVEBU=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_KIRKWOOD_SPI=y CONFIG_KIRKWOOD_SPI=y
# CONFIG_EFI_LOADER is not set

1
configs/crs305-1g-4s_defconfig
View file

@ -48,3 +48,4 @@ CONFIG_SPI_FLASH_MTD=y
CONFIG_PCI_MVEBU=y CONFIG_PCI_MVEBU=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_KIRKWOOD_SPI=y CONFIG_KIRKWOOD_SPI=y
# CONFIG_EFI_LOADER is not set

1
configs/crs326-24g-2s-bit_defconfig
View file

@ -47,3 +47,4 @@ CONFIG_SPI_FLASH_MTD=y
CONFIG_PCI_MVEBU=y CONFIG_PCI_MVEBU=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_KIRKWOOD_SPI=y CONFIG_KIRKWOOD_SPI=y
# CONFIG_EFI_LOADER is not set

1
configs/crs326-24g-2s_defconfig
View file

@ -47,3 +47,4 @@ CONFIG_SPI_FLASH_MTD=y
CONFIG_PCI_MVEBU=y CONFIG_PCI_MVEBU=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_KIRKWOOD_SPI=y CONFIG_KIRKWOOD_SPI=y
# CONFIG_EFI_LOADER is not set

1
configs/crs328-4c-20s-4s-bit_defconfig
View file

@ -47,3 +47,4 @@ CONFIG_SPI_FLASH_MTD=y
CONFIG_PCI_MVEBU=y CONFIG_PCI_MVEBU=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_KIRKWOOD_SPI=y CONFIG_KIRKWOOD_SPI=y
# CONFIG_EFI_LOADER is not set

1
configs/crs328-4c-20s-4s_defconfig
View file

@ -47,3 +47,4 @@ CONFIG_SPI_FLASH_MTD=y
CONFIG_PCI_MVEBU=y CONFIG_PCI_MVEBU=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_KIRKWOOD_SPI=y CONFIG_KIRKWOOD_SPI=y
# CONFIG_EFI_LOADER is not set

1
configs/gxp_defconfig
View file

@ -59,3 +59,4 @@ CONFIG_TIMER=y
CONFIG_GXP_TIMER=y CONFIG_GXP_TIMER=y
# CONFIG_RANDOM_UUID is not set # CONFIG_RANDOM_UUID is not set
CONFIG_SHA512=y CONFIG_SHA512=y
# CONFIG_EFI_LOADER is not set

1
configs/maxbcm_defconfig
View file

@ -63,3 +63,4 @@ CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_KIRKWOOD_SPI=y CONFIG_KIRKWOOD_SPI=y
# CONFIG_EFI_LOADER is not set

1
configs/mt7981_rfb_defconfig
View file

@ -64,4 +64,5 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_MTK_SPIM=y CONFIG_MTK_SPIM=y
CONFIG_HEXDUMP=y CONFIG_HEXDUMP=y
# CONFIG_EFI_LOADER is not set
CONFIG_LMB_MAX_REGIONS=64 CONFIG_LMB_MAX_REGIONS=64

1
configs/mt7986_rfb_defconfig
View file

@ -64,4 +64,5 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_MTK_SPIM=y CONFIG_MTK_SPIM=y
CONFIG_HEXDUMP=y CONFIG_HEXDUMP=y
# CONFIG_EFI_LOADER is not set
CONFIG_LMB_MAX_REGIONS=64 CONFIG_LMB_MAX_REGIONS=64

1
configs/mx6memcal_defconfig
View file

@ -44,3 +44,4 @@ CONFIG_BOUNCE_BUFFER=y
CONFIG_FSL_USDHC=y CONFIG_FSL_USDHC=y
CONFIG_MXC_UART=y CONFIG_MXC_UART=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
# CONFIG_EFI_LOADER is not set

1
configs/pg_wcom_expu1_defconfig
View file

@ -104,5 +104,6 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_LZO=y CONFIG_LZO=y
# CONFIG_EFI_LOADER is not set
CONFIG_POST=y CONFIG_POST=y
CONFIG_HUSH_OLD_PARSER=y CONFIG_HUSH_OLD_PARSER=y

1
configs/pg_wcom_expu1_update_defconfig
View file

@ -102,5 +102,6 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_LZO=y CONFIG_LZO=y
# CONFIG_EFI_LOADER is not set
CONFIG_POST=y CONFIG_POST=y
CONFIG_HUSH_OLD_PARSER=y CONFIG_HUSH_OLD_PARSER=y

1
configs/pg_wcom_seli8_defconfig
View file

@ -104,5 +104,6 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_LZO=y CONFIG_LZO=y
# CONFIG_EFI_LOADER is not set
CONFIG_POST=y CONFIG_POST=y
CONFIG_HUSH_OLD_PARSER=y CONFIG_HUSH_OLD_PARSER=y

1
configs/pg_wcom_seli8_update_defconfig
View file

@ -102,5 +102,6 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_LZO=y CONFIG_LZO=y
# CONFIG_EFI_LOADER is not set
CONFIG_POST=y CONFIG_POST=y
CONFIG_HUSH_OLD_PARSER=y CONFIG_HUSH_OLD_PARSER=y

1
configs/r8a77970_eagle_defconfig
View file

@ -81,3 +81,4 @@ CONFIG_DM_SPI=y
CONFIG_RENESAS_RPC_SPI=y CONFIG_RENESAS_RPC_SPI=y
CONFIG_TEE=y CONFIG_TEE=y
CONFIG_OPTEE=y CONFIG_OPTEE=y
# CONFIG_EFI_LOADER is not set

1
configs/smdkc100_defconfig
View file

@ -39,3 +39,4 @@ CONFIG_ENV_IS_IN_ONENAND=y
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_SAMSUNG_ONENAND=y CONFIG_SAMSUNG_ONENAND=y
CONFIG_SMC911X=y CONFIG_SMC911X=y
# CONFIG_EFI_LOADER is not set

1
configs/socfpga_is1_defconfig
View file

@ -68,3 +68,4 @@ CONFIG_SPI=y
CONFIG_CADENCE_QSPI=y CONFIG_CADENCE_QSPI=y
# CONFIG_SPL_WDT is not set # CONFIG_SPL_WDT is not set
CONFIG_SYS_TIMER_COUNTS_DOWN=y CONFIG_SYS_TIMER_COUNTS_DOWN=y
# CONFIG_EFI_LOADER is not set

1
configs/stm32mp25_defconfig
View file

@ -48,6 +48,7 @@ CONFIG_WDT=y
CONFIG_WDT_STM32MP=y CONFIG_WDT_STM32MP=y
CONFIG_WDT_ARM_SMC=y CONFIG_WDT_ARM_SMC=y
CONFIG_ERRNO_STR=y CONFIG_ERRNO_STR=y
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB_USE_MAX_REGIONS is not set # CONFIG_LMB_USE_MAX_REGIONS is not set
CONFIG_LMB_MEMORY_REGIONS=2 CONFIG_LMB_MEMORY_REGIONS=2
CONFIG_LMB_RESERVED_REGIONS=32 CONFIG_LMB_RESERVED_REGIONS=32

1
configs/thunderx_88xx_defconfig
View file

@ -36,3 +36,4 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_DEBUG_UART_SKIP_INIT=y
# CONFIG_EFI_LOADER is not set

1
configs/xilinx_versal_mini_defconfig
View file

@ -62,4 +62,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_ARM_DCC=y CONFIG_ARM_DCC=y
# CONFIG_GZIP is not set # CONFIG_GZIP is not set
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
configs/xilinx_versal_mini_ospi_defconfig
View file

@ -72,4 +72,5 @@ CONFIG_CADENCE_QSPI=y
CONFIG_HAS_CQSPI_REF_CLK=y CONFIG_HAS_CQSPI_REF_CLK=y
CONFIG_CQSPI_REF_CLK=200000000 CONFIG_CQSPI_REF_CLK=200000000
CONFIG_CADENCE_OSPI_VERSAL=y CONFIG_CADENCE_OSPI_VERSAL=y
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
configs/xilinx_versal_mini_qspi_defconfig
View file

@ -76,4 +76,5 @@ CONFIG_ARM_DCC=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_ZYNQMP_GQSPI=y CONFIG_ZYNQMP_GQSPI=y
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
configs/xilinx_versal_net_mini_defconfig
View file

@ -71,4 +71,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ARM_DCC=y CONFIG_ARM_DCC=y
CONFIG_PL01X_SERIAL=y CONFIG_PL01X_SERIAL=y
# CONFIG_GZIP is not set # CONFIG_GZIP is not set
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
configs/xilinx_versal_net_mini_ospi_defconfig
View file

@ -70,4 +70,5 @@ CONFIG_CADENCE_QSPI=y
CONFIG_HAS_CQSPI_REF_CLK=y CONFIG_HAS_CQSPI_REF_CLK=y
CONFIG_CQSPI_REF_CLK=200000000 CONFIG_CQSPI_REF_CLK=200000000
CONFIG_CADENCE_OSPI_VERSAL=y CONFIG_CADENCE_OSPI_VERSAL=y
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
configs/xilinx_versal_net_mini_qspi_defconfig
View file

@ -74,4 +74,5 @@ CONFIG_ARM_DCC=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_ZYNQMP_GQSPI=y CONFIG_ZYNQMP_GQSPI=y
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
configs/xilinx_zynqmp_mini_defconfig
View file

@ -60,4 +60,5 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ARM_DCC=y CONFIG_ARM_DCC=y
CONFIG_PANIC_HANG=y CONFIG_PANIC_HANG=y
# CONFIG_GZIP is not set # CONFIG_GZIP is not set
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
configs/xilinx_zynqmp_mini_nand_defconfig
View file

@ -60,4 +60,5 @@ CONFIG_SYS_NAND_MAX_CHIPS=2
CONFIG_ARM_DCC=y CONFIG_ARM_DCC=y
CONFIG_PANIC_HANG=y CONFIG_PANIC_HANG=y
# CONFIG_GZIP is not set # CONFIG_GZIP is not set
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
configs/xilinx_zynqmp_mini_nand_single_defconfig
View file

@ -59,4 +59,5 @@ CONFIG_SYS_NAND_ONFI_DETECTION=y
CONFIG_ARM_DCC=y CONFIG_ARM_DCC=y
CONFIG_PANIC_HANG=y CONFIG_PANIC_HANG=y
# CONFIG_GZIP is not set # CONFIG_GZIP is not set
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
configs/xilinx_zynqmp_mini_qspi_defconfig
View file

@ -92,4 +92,5 @@ CONFIG_SPI=y
CONFIG_ZYNQMP_GQSPI=y CONFIG_ZYNQMP_GQSPI=y
CONFIG_PANIC_HANG=y CONFIG_PANIC_HANG=y
# CONFIG_GZIP is not set # CONFIG_GZIP is not set
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
configs/zynq_cse_nand_defconfig
View file

@ -79,4 +79,5 @@ CONFIG_SYS_NAND_ONFI_DETECTION=y
CONFIG_ARM_DCC=y CONFIG_ARM_DCC=y
CONFIG_SYS_TIMER_COUNTS_DOWN=y CONFIG_SYS_TIMER_COUNTS_DOWN=y
# CONFIG_GZIP is not set # CONFIG_GZIP is not set
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
configs/zynq_cse_nor_defconfig
View file

@ -83,4 +83,5 @@ CONFIG_SYS_FLASH_QUIET_TEST=y
CONFIG_ARM_DCC=y CONFIG_ARM_DCC=y
CONFIG_SYS_TIMER_COUNTS_DOWN=y CONFIG_SYS_TIMER_COUNTS_DOWN=y
# CONFIG_GZIP is not set # CONFIG_GZIP is not set
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
configs/zynq_cse_qspi_defconfig
View file

@ -93,4 +93,5 @@ CONFIG_ARM_DCC=y
CONFIG_ZYNQ_QSPI=y CONFIG_ZYNQ_QSPI=y
CONFIG_SYS_TIMER_COUNTS_DOWN=y CONFIG_SYS_TIMER_COUNTS_DOWN=y
# CONFIG_GZIP is not set # CONFIG_GZIP is not set
# CONFIG_EFI_LOADER is not set
# CONFIG_LMB is not set # CONFIG_LMB is not set

1
drivers/ata/Kconfig
View file

@ -61,7 +61,6 @@ config DWC_AHCI
config DWC_AHSATA config DWC_AHSATA
bool "Enable DWC AHSATA driver support" bool "Enable DWC AHSATA driver support"
select LIBATA select LIBATA
depends on BLK
help help
Enable this driver to support the DWC AHSATA SATA controller found Enable this driver to support the DWC AHSATA SATA controller found
in i.MX5 and i.MX6 SoCs. in i.MX5 and i.MX6 SoCs.

4
drivers/block/Kconfig
View file

@ -1,8 +1,8 @@
config BLK config BLK
bool # "Support block devices" bool # "Support block devices"
depends on DM depends on DM
default y if MMC || USB || SCSI || NVME || IDE || AHCI || SATA def_bool y if MMC || USB || SCSI || NVME || IDE || AHCI || SATA
default y if EFI_MEDIA || VIRTIO_BLK || PVBLOCK def_bool y if EFI_MEDIA || VIRTIO_BLK || PVBLOCK
help help
Enable support for block devices, such as SCSI, MMC and USB Enable support for block devices, such as SCSI, MMC and USB
flash sticks. These provide a block-level interface which permits flash sticks. These provide a block-level interface which permits

30
drivers/mmc/Kconfig
View file

@ -41,7 +41,6 @@ config MMC_BROKEN_CD
config DM_MMC config DM_MMC
bool "Enable MMC controllers using Driver Model" bool "Enable MMC controllers using Driver Model"
depends on DM depends on DM
select BLK
help help
This enables the MultiMediaCard (MMC) uclass which supports MMC and This enables the MultiMediaCard (MMC) uclass which supports MMC and
Secure Digital I/O (SDIO) cards. Both removable (SD, micro-SD, etc.) Secure Digital I/O (SDIO) cards. Both removable (SD, micro-SD, etc.)
@ -249,7 +248,6 @@ config MMC_DW_CORTINA
bool "Cortina specific extensions for Synopsys DW Memory Card Interface" bool "Cortina specific extensions for Synopsys DW Memory Card Interface"
depends on DM_MMC depends on DM_MMC
depends on MMC_DW depends on MMC_DW
depends on BLK
help help
This selects support for Cortina SoC specific extensions to the This selects support for Cortina SoC specific extensions to the
Synopsys DesignWare Memory Card Interface driver. Select this option Synopsys DesignWare Memory Card Interface driver. Select this option
@ -313,7 +311,7 @@ config NEXELL_DWMMC
config MMC_MESON_GX config MMC_MESON_GX
bool "Meson GX EMMC controller support" bool "Meson GX EMMC controller support"
depends on DM_MMC && BLK && ARCH_MESON depends on DM_MMC && ARCH_MESON
help help
Support for EMMC host controller on Meson GX ARM SoCs platform (S905) Support for EMMC host controller on Meson GX ARM SoCs platform (S905)
@ -367,7 +365,7 @@ config MMC_OCTEONTX
config MVEBU_MMC config MVEBU_MMC
bool "Kirkwood MMC controller support" bool "Kirkwood MMC controller support"
depends on DM_MMC && BLK && ARCH_KIRKWOOD depends on DM_MMC && ARCH_KIRKWOOD
help help
Support for MMC host controller on Kirkwood SoCs. Support for MMC host controller on Kirkwood SoCs.
If you are on a Kirkwood architecture, say Y here. If you are on a Kirkwood architecture, say Y here.
@ -420,7 +418,7 @@ config SH_MMCIF
config MMC_UNIPHIER config MMC_UNIPHIER
bool "UniPhier SD/MMC Host Controller support" bool "UniPhier SD/MMC Host Controller support"
depends on ARCH_UNIPHIER depends on ARCH_UNIPHIER
depends on BLK && DM_MMC depends on DM_MMC
depends on OF_CONTROL depends on OF_CONTROL
help help
This selects support for the Matsushita SD/MMC Host Controller on This selects support for the Matsushita SD/MMC Host Controller on
@ -429,7 +427,7 @@ config MMC_UNIPHIER
config RENESAS_SDHI config RENESAS_SDHI
bool "Renesas R-Car SD/MMC Host Controller support" bool "Renesas R-Car SD/MMC Host Controller support"
depends on ARCH_RENESAS depends on ARCH_RENESAS
depends on BLK && DM_MMC depends on DM_MMC
depends on OF_CONTROL depends on OF_CONTROL
select BOUNCE_BUFFER select BOUNCE_BUFFER
help help
@ -439,7 +437,7 @@ config RENESAS_SDHI
config MMC_BCM2835 config MMC_BCM2835
bool "BCM2835 family custom SD/MMC Host Controller support" bool "BCM2835 family custom SD/MMC Host Controller support"
depends on ARCH_BCM283X depends on ARCH_BCM283X
depends on BLK && DM_MMC depends on DM_MMC
depends on OF_CONTROL depends on OF_CONTROL
default y default y
help help
@ -459,7 +457,7 @@ config JZ47XX_MMC
config MMC_SANDBOX config MMC_SANDBOX
bool "Sandbox MMC support" bool "Sandbox MMC support"
depends on SANDBOX depends on SANDBOX
depends on BLK && DM_MMC && OF_CONTROL depends on DM_MMC && OF_CONTROL
help help
This select a dummy sandbox MMC driver. At present this does nothing This select a dummy sandbox MMC driver. At present this does nothing
other than allow sandbox to be build with MMC support. This other than allow sandbox to be build with MMC support. This
@ -561,7 +559,7 @@ config MMC_SDHCI_ASPEED
config MMC_SDHCI_ATMEL config MMC_SDHCI_ATMEL
bool "Atmel SDHCI controller support" bool "Atmel SDHCI controller support"
depends on ARCH_AT91 depends on ARCH_AT91
depends on DM_MMC && BLK && ARCH_AT91 depends on DM_MMC && ARCH_AT91
depends on MMC_SDHCI depends on MMC_SDHCI
help help
This enables support for the Atmel SDHCI controller, which supports This enables support for the Atmel SDHCI controller, which supports
@ -596,7 +594,7 @@ config MMC_SDHCI_BCMSTB
config MMC_SDHCI_CADENCE config MMC_SDHCI_CADENCE
bool "SDHCI support for the Cadence SD/SDIO/eMMC controller" bool "SDHCI support for the Cadence SD/SDIO/eMMC controller"
depends on BLK && DM_MMC depends on DM_MMC
depends on MMC_SDHCI depends on MMC_SDHCI
depends on OF_CONTROL depends on OF_CONTROL
help help
@ -608,7 +606,7 @@ config MMC_SDHCI_CADENCE
config MMC_SDHCI_CV1800B config MMC_SDHCI_CV1800B
bool "SDHCI support for the CV1800B SD/SDIO/eMMC controller" bool "SDHCI support for the CV1800B SD/SDIO/eMMC controller"
depends on BLK && DM_MMC depends on DM_MMC
depends on MMC_SDHCI depends on MMC_SDHCI
depends on OF_CONTROL depends on OF_CONTROL
help help
@ -643,7 +641,7 @@ config MMC_SDHCI_IPROC
config MMC_SDHCI_F_SDH30 config MMC_SDHCI_F_SDH30
bool "SDHCI support for Fujitsu Semiconductor/Socionext F_SDH30" bool "SDHCI support for Fujitsu Semiconductor/Socionext F_SDH30"
depends on BLK && DM_MMC depends on DM_MMC
depends on MMC_SDHCI depends on MMC_SDHCI
help help
This selects the Secure Digital Host Controller Interface (SDHCI) This selects the Secure Digital Host Controller Interface (SDHCI)
@ -663,7 +661,7 @@ config MMC_SDHCI_KONA
config MMC_SDHCI_MSM config MMC_SDHCI_MSM
bool "Qualcomm SDHCI controller" bool "Qualcomm SDHCI controller"
depends on BLK && DM_MMC depends on DM_MMC
depends on MMC_SDHCI depends on MMC_SDHCI
help help
Enables support for SDHCI 2.0 controller present on some Qualcomm Enables support for SDHCI 2.0 controller present on some Qualcomm
@ -829,7 +827,7 @@ config MMC_PITON
config GENERIC_ATMEL_MCI config GENERIC_ATMEL_MCI
bool "Atmel Multimedia Card Interface support" bool "Atmel Multimedia Card Interface support"
depends on DM_MMC && BLK && ARCH_AT91 depends on DM_MMC && ARCH_AT91
help help
This enables support for Atmel High Speed Multimedia Card Interface This enables support for Atmel High Speed Multimedia Card Interface
(HSMCI), which supports the MultiMedia Card (MMC) Specification V4.3, (HSMCI), which supports the MultiMedia Card (MMC) Specification V4.3,
@ -838,7 +836,7 @@ config GENERIC_ATMEL_MCI
config STM32_SDMMC2 config STM32_SDMMC2
bool "STMicroelectronics STM32H7 SD/MMC Host Controller support" bool "STMicroelectronics STM32H7 SD/MMC Host Controller support"
depends on DM_MMC && BLK && OF_CONTROL depends on DM_MMC && OF_CONTROL
help help
This selects support for the SD/MMC controller on STM32H7 SoCs. This selects support for the SD/MMC controller on STM32H7 SoCs.
If you have a board based on such a SoC and with a SD/MMC slot, If you have a board based on such a SoC and with a SD/MMC slot,
@ -858,7 +856,7 @@ config FTSDC010_SDIO
config MMC_MTK config MMC_MTK
bool "MediaTek SD/MMC Card Interface support" bool "MediaTek SD/MMC Card Interface support"
depends on ARCH_MEDIATEK || ARCH_MTMIPS depends on ARCH_MEDIATEK || ARCH_MTMIPS
depends on BLK && DM_MMC depends on DM_MMC
depends on OF_CONTROL depends on OF_CONTROL
help help
This selects the MediaTek(R) Secure digital and Multimedia card Interface. This selects the MediaTek(R) Secure digital and Multimedia card Interface.

2
lib/efi_loader/Kconfig
View file

@ -10,9 +10,9 @@ config EFI_LOADER
depends on !EFI_STUB || !X86_64 || EFI_STUB_64BIT depends on !EFI_STUB || !X86_64 || EFI_STUB_64BIT
# We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB # We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB
depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT
depends on BLK
depends on !EFI_APP depends on !EFI_APP
default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8
select BLK
select CHARSET select CHARSET
# We need to send DM events, dynamically, in the EFI block driver # We need to send DM events, dynamically, in the EFI block driver
select DM_EVENT select DM_EVENT