emulation: Rename ARCH_QEMU to ARCH_QEMU_ARM

This option looks generic but in fact is specific to ARM. Rename it to reflect this. Signed-off-by: Simon Glass <sjg@chromium.org>
2025-07-02 14:00:09 -06:00
parent a9d552407a
commit ab3b9d1d88
14 changed files with 20 additions and 20 deletions
--- a/api/Kconfig
+++ b/api/Kconfig
@@ -14,7 +14,7 @@ config SYS_MMC_MAX_DEVICE
 config EXAMPLES
 	bool "Compile API examples"
 	depends on !SANDBOX
-	default y if ARCH_QEMU
+	default y if ARCH_QEMU_ARM
 	help
 	  U-Boot provides an API for standalone applications. Examples are
 	  provided in directory examples/.
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -53,7 +53,7 @@ config POSITION_INDEPENDENT
 config INIT_SP_RELATIVE
 	bool "Specify the early stack pointer relative to the .bss section"
 	depends on ARM64
-	default n if ARCH_QEMU
+	default n if ARCH_QEMU_ARM
 	default y if POSITION_INDEPENDENT
 	help
 	  U-Boot typically uses a hard-coded value for the stack pointer
@@ -1045,7 +1045,7 @@ config ARCH_OWL
 	select SYS_RELOC_GD_ENV_ADDR
 	imply CMD_DM

-config ARCH_QEMU
+config ARCH_QEMU_ARM
 	bool "QEMU Virtual Platform"
 	select DM
 	select DM_SERIAL
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1266,7 +1266,7 @@ endif

 dtb-$(CONFIG_TARGET_EA_LPC3250DEVKITV2) += lpc3250-ea3250.dtb

-dtb-$(CONFIG_ARCH_QEMU) += qemu-arm.dtb qemu-arm64.dtb
+dtb-$(CONFIG_ARCH_QEMU_ARM) += qemu-arm.dtb qemu-arm64.dtb

 dtb-$(CONFIG_TARGET_CORSTONE1000) += corstone1000-mps3.dtb \
 				corstone1000-fvp.dtb
--- a/arch/arm/mach-qemu/Kconfig
+++ b/arch/arm/mach-qemu/Kconfig
@@ -1,4 +1,4 @@
-if ARCH_QEMU
+if ARCH_QEMU_ARM

 config SYS_VENDOR
 	default "emulation"
--- a/board/emulation/qemu-arm/Kconfig
+++ b/board/emulation/qemu-arm/Kconfig
@@ -1,4 +1,4 @@
-if ARCH_QEMU && !TARGET_QEMU_ARM_SBSA
+if ARCH_QEMU_ARM && !TARGET_QEMU_ARM_SBSA

 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
--- a/configs/qemu-arm-sbsa_defconfig
+++ b/configs/qemu-arm-sbsa_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
-CONFIG_ARCH_QEMU=y
+CONFIG_ARCH_QEMU_ARM=y
 CONFIG_BLOBLIST_SIZE_RELOC=0x20000
 CONFIG_TARGET_QEMU_ARM_SBSA=y
 CONFIG_EFI_VARIABLE_NO_STORE=y
--- a/configs/qemu_arm64_defconfig
+++ b/configs/qemu_arm64_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_POSITION_INDEPENDENT=y
-CONFIG_ARCH_QEMU=y
+CONFIG_ARCH_QEMU_ARM=y
 CONFIG_SYS_MALLOC_LEN=0x1000000
 CONFIG_BLOBLIST_SIZE_RELOC=0x2000
 CONFIG_NR_DRAM_BANKS=1
--- a/configs/qemu_arm64_lwip_defconfig
+++ b/configs/qemu_arm64_lwip_defconfig
@@ -1,7 +1,7 @@
 #include <configs/qemu_arm64_defconfig>

 CONFIG_ARM=y
-CONFIG_ARCH_QEMU=y
+CONFIG_ARCH_QEMU_ARM=y

 CONFIG_NET_LWIP=y
 CONFIG_CMD_DNS=y
--- a/configs/qemu_arm64_spl_defconfig
+++ b/configs/qemu_arm64_spl_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_POSITION_INDEPENDENT=y
-CONFIG_ARCH_QEMU=y
+CONFIG_ARCH_QEMU_ARM=y
 CONFIG_SYS_MALLOC_LEN=0x1000000
 CONFIG_BLOBLIST_SIZE_RELOC=0x4000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
--- a/configs/qemu_arm_defconfig
+++ b/configs/qemu_arm_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARM_SMCCC=y
-CONFIG_ARCH_QEMU=y
+CONFIG_ARCH_QEMU_ARM=y
 CONFIG_SYS_MALLOC_LEN=0x1000000
 CONFIG_BLOBLIST_SIZE_RELOC=0x2000
 CONFIG_NR_DRAM_BANKS=1
--- a/configs/qemu_arm_spl_defconfig
+++ b/configs/qemu_arm_spl_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_SYS_ICACHE_OFF=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARM_SMCCC=y
-CONFIG_ARCH_QEMU=y
+CONFIG_ARCH_QEMU_ARM=y
 CONFIG_SYS_MALLOC_LEN=0x1000000
 CONFIG_BLOBLIST_SIZE_RELOC=0x4000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -6,7 +6,7 @@ menu "File systems"

 config FS
 	bool "Support for filesystems"
-	default y if SANDBOX || VENDOR_EMULATION || ARCH_QEMU
+	default y if SANDBOX || VENDOR_EMULATION || ARCH_QEMU_ARM
 	depends on EXPERT
 	help
 	  Provides an interface for filesystems, allowing them to be
@@ -15,14 +15,14 @@ config FS
 config DIR
 	bool "Support for directories"
 	depends on FS
-	default y if SANDBOX || VENDOR_EMULATION || ARCH_QEMU
+	default y if SANDBOX || VENDOR_EMULATION || ARCH_QEMU_ARM
 	help
 	  Provides an interface for directories within filesystems, allowing
 	  them to be listed.

 config FILE
 	bool "Support for files"
-	default y if SANDBOX || VENDOR_EMULATION || ARCH_QEMU
+	default y if SANDBOX || VENDOR_EMULATION || ARCH_QEMU_ARM
 	help
 	  Provides an interface for files, allowing them to be opened, read,
 	  written and modified. Files are children of a filesystem device
--- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig
@@ -85,7 +85,7 @@ config EFI_GET_TIME
 config EFI_SET_TIME
 	bool "SetTime() runtime service"
 	depends on EFI_GET_TIME
-	default y if ARCH_QEMU || SANDBOX
+	default y if ARCH_QEMU_ARM || SANDBOX
 	help
 	  Provide the SetTime() runtime service at boottime. This service
 	  can be used by an EFI application to adjust the real time clock.
@@ -473,7 +473,7 @@ config EFI_RISCV_BOOT_PROTOCOL

 config EFI_IP4_CONFIG2_PROTOCOL
 	bool "EFI_IP4_CONFIG2_PROTOCOL support"
-	default y if ARCH_QEMU || SANDBOX
+	default y if ARCH_QEMU_ARM || SANDBOX
 	depends on NET || NET_LWIP
 	help
 	  Provides an implementation of the EFI_IP4_CONFIG2_PROTOCOL, this
@@ -482,7 +482,7 @@ config EFI_IP4_CONFIG2_PROTOCOL

 config EFI_HTTP_PROTOCOL
 	bool "EFI_HTTP_PROTOCOL support"
-	default y if ARCH_QEMU || SANDBOX
+	default y if ARCH_QEMU_ARM || SANDBOX
 	depends on WGET
 	help
 	  Provides an EFI HTTP driver implementing the EFI_HTTP_PROTOCOL. and
@@ -500,7 +500,7 @@ config EFI_LOADER_BOUNCE_BUFFER

 config EFI_GRUB_ARM32_WORKAROUND
 	bool "Workaround for GRUB on 32bit ARM"
-	default n if ARCH_BCM283X || ARCH_SUNXI || ARCH_QEMU
+	default n if ARCH_BCM283X || ARCH_SUNXI || ARCH_QEMU_ARM
 	default y
 	depends on ARM && !ARM64
 	help
--- a/net/lwip/Kconfig
+++ b/net/lwip/Kconfig
@@ -44,7 +44,7 @@ config PROT_UDP_LWIP

 config LWIP_TCP_WND
 	int "Value of TCP_WND"
-	default 32768 if ARCH_QEMU
+	default 32768 if ARCH_QEMU_ARM
 	default 3000000
 	help
 	  Default value for TCP_WND in the lwIP configuration