|
@@ -1,46 +0,0 @@
|
|
|
-From 2918cea58111d0b5e7bdcbb8a1b2aa67bfe26155 Mon Sep 17 00:00:00 2001
|
|
|
-From: osy <osy@turing.llc>
|
|
|
-Date: Sun, 6 Jul 2025 23:05:39 -0700
|
|
|
-Subject: [PATCH 1/2] Revert "hw/arm: Do not build VMapple machine by default"
|
|
|
-
|
|
|
-This reverts commit 49551752e860f5e403cdacac11ee1d218141fd3d.
|
|
|
----
|
|
|
- configs/devices/aarch64-softmmu/default.mak | 1 -
|
|
|
- 1 file changed, 1 deletion(-)
|
|
|
-
|
|
|
-diff --git a/configs/devices/aarch64-softmmu/default.mak b/configs/devices/aarch64-softmmu/default.mak
|
|
|
-index ad8028cfd4..93f4022ad6 100644
|
|
|
---- a/configs/devices/aarch64-softmmu/default.mak
|
|
|
-+++ b/configs/devices/aarch64-softmmu/default.mak
|
|
|
-@@ -9,4 +9,3 @@ include ../arm-softmmu/default.mak
|
|
|
- # CONFIG_XLNX_VERSAL=n
|
|
|
- # CONFIG_SBSA_REF=n
|
|
|
- # CONFIG_NPCM8XX=n
|
|
|
--CONFIG_VMAPPLE=n
|
|
|
---
|
|
|
-2.41.0
|
|
|
-
|
|
|
-From cbe21c61515350b6c33e63665e345a4153b21c32 Mon Sep 17 00:00:00 2001
|
|
|
-From: osy <osy@turing.llc>
|
|
|
-Date: Mon, 7 Jul 2025 07:28:13 -0700
|
|
|
-Subject: [PATCH 2/2] vmapple: disable when MAC_PVG is not supported
|
|
|
-
|
|
|
----
|
|
|
- hw/vmapple/Kconfig | 1 +
|
|
|
- 1 file changed, 1 insertion(+)
|
|
|
-
|
|
|
-diff --git a/hw/vmapple/Kconfig b/hw/vmapple/Kconfig
|
|
|
-index 2382b29767..37c27473e2 100644
|
|
|
---- a/hw/vmapple/Kconfig
|
|
|
-+++ b/hw/vmapple/Kconfig
|
|
|
-@@ -16,6 +16,7 @@ config VMAPPLE
|
|
|
- bool
|
|
|
- depends on ARM
|
|
|
- depends on HVF
|
|
|
-+ depends on MAC_PVG
|
|
|
- default y if ARM
|
|
|
- imply PCI_DEVICES
|
|
|
- select ARM_GICV3
|
|
|
---
|
|
|
-2.41.0
|
|
|
-
|