[PATCH] xen: Fix Kconfig dependencies

[Michal Simek]

čt 6. 4. 2023 v 10:04 odesílatel Michal Simek <michal.simek at amd.com> napsal:
>
> XEN config can be enabled by other platforms (even it doesn't need to make
> sense) that's why fix dependencies. XEN (xenbus.c) requires sscanf (also
> pvblock needs it). And PVBLOCK is inside drivers/xen folder which requires
> XEN to be enabled.
>
> Signed-off-by: Michal Simek <michal.simek at amd.com>
> ---
>
> If XEN should be enabled only for
>
> ---
>  Kconfig             | 1 +
>  arch/arm/Kconfig    | 1 -
>  drivers/xen/Kconfig | 2 +-
>  3 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Kconfig b/Kconfig
> index 7a8c190a7bd1..d18a13c923f4 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -175,6 +175,7 @@ config CC_HAS_ASM_INLINE
>
>  config XEN
>         bool "Select U-Boot be run as a bootloader for XEN Virtual Machine"
> +       select SSCANF
>         help
>           Enabling this option will make U-Boot be run as a bootloader
>           for XEN [1] Virtual Machine.
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index f0118e225419..24ef470169c7 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -2044,7 +2044,6 @@ config TARGET_XENGUEST_ARM64
>         select OF_CONTROL
>         select LINUX_KERNEL_IMAGE_HEADER
>         select XEN_SERIAL
> -       select SSCANF
>         imply OF_HAS_PRIOR_STAGE
>
>  config ARCH_GXP
> diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
> index 0ee74d036c74..6cb9149fa772 100644
> --- a/drivers/xen/Kconfig
> +++ b/drivers/xen/Kconfig
> @@ -1,6 +1,6 @@
>  config PVBLOCK
>         bool "Xen para-virtualized block device"
> -       depends on DM
> +       depends on DM && XEN
>         select BLK
>         help
>           This driver implements the front-end of the Xen virtual
> --
> 2.36.1
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs