From: Michal Simek <michal.simek@amd.com>
Date: Thu, 6 Apr 2023 08:04:15 +0000 (+0200)
Subject: xen: Fix Kconfig dependencies
X-Git-Tag: v2025.01-rc5-pxa1908~1028^2~12
X-Git-Url: http://git.dujemihanovic.xyz/img/html/static/git-logo.png?a=commitdiff_plain;h=44cd761ad665f38f87f064ed0df5c013ec5f88cb;p=u-boot.git

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 f24e4f0a33..b4de17afac 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 d7e6578060..ab22c0e657 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 0ee74d036c..6cb9149fa7 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