[PATCH 1/1] efi_loader: require CONFIG_BLK

[Simon Glass]

Hi Heinrich,

On Tue, 7 Sept 2021 at 17:35, Heinrich Schuchardt <xypron.glpk at gmx.de> wrote:
>
> On 9/7/21 1:25 PM, AKASHI Takahiro wrote:
> > On Tue, Sep 07, 2021 at 09:01:08AM +0200, Heinrich Schuchardt wrote:
> >> The move to driver model should by now be completed. To be able to remove
> >> pre-driver model code from our block IO code require CONFIG_BLK=y for UEFI
> >> support.
> >
> > If so, we can safely remove !CONFIG_BLK-related code
> > from efi_disk.c and efi_device_path.c.
>
> Yes, that was my intent. As we want to improve the integration with the
> driver model we should get rid of the outdated non-BLK code. Let's merge
> that into the next branch.

I have a patch locally for that. I hope to send the series out soon.

Regards,
Simon

>
> Best regards
>
> Heinrich
>
> >
> > -Takahiro Akashi
> >
> >
> >> Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
> >> ---
> >>   lib/efi_loader/Kconfig | 1 +
> >>   1 file changed, 1 insertion(+)
> >>
> >> diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
> >> index dacc3b5881..692cf5ced0 100644
> >> --- a/lib/efi_loader/Kconfig
> >> +++ b/lib/efi_loader/Kconfig
> >> @@ -10,6 +10,7 @@ config EFI_LOADER
> >>      depends on !EFI_STUB || !X86_64 || EFI_STUB_64BIT
> >>      # 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 BLK
> >>      default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8
> >>      select LIB_UUID
> >>      select PARTITION_UUIDS
> >> --
> >> 2.30.2
> >>
>