xen: Fix Kconfig dependencies

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@amd.com>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/Kconfig b/Kconfig
index f24e4f0a331e3285fd0d09938b8f3203414cc45c..b4de17afac7ad0234ad53e9159b6b25b3247b105 100644 (file)
--- 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 d7e6578060515eee264c09d27f30ce0d466b731a..ab22c0e657d9450cf3be01dd553527a8b6c17bcd 100644 (file)
--- 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 0ee74d036c7453b8daf95db5c684baadfaf95ebf..6cb9149fa772effaf17b56f62db159ecf624bb41 100644 (file)
--- 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