summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2025-04-22 12:27:07 -0600
committerTom Rini <trini@konsulko.com>2025-04-22 12:54:53 -0600
commitbf2db18116137bb2f82165206be3f16baf314feb (patch)
tree6f144fe6f66d300060ecc90e2c1b5271e7d31269
parent9adeadfbf756a57922a68cdac147e416ca02f239 (diff)
parentd7820b1cc6d7cbd36fd7b4fb51bf5accacade983 (diff)
Merge patch series "configs: ACPI enabled QEMU defconfigs"
Heinrich Schuchardt <heinrich.schuchardt@canonical.com> says: For QEMU we have developed supporting passsing through ACPI tables. This functionality has been broken multipled times due to missing CI builds. * Two new defconfigs qemu_arm64_acpi and qemu-riscv64_smode_acpi. * Assign the defconfigs to the respective maintainers. Link: https://lore.kernel.org/r/20250420085929.36226-1-heinrich.schuchardt@canonical.com
-rw-r--r--board/emulation/qemu-arm/MAINTAINERS3
-rw-r--r--board/emulation/qemu-riscv/MAINTAINERS7
-rw-r--r--configs/qemu-riscv64_smode_acpi_defconfig2
-rw-r--r--configs/qemu_arm64_acpi_defconfig2
4 files changed, 6 insertions, 8 deletions
diff --git a/board/emulation/qemu-arm/MAINTAINERS b/board/emulation/qemu-arm/MAINTAINERS
index 7bc0ee698c5..538769f8040 100644
--- a/board/emulation/qemu-arm/MAINTAINERS
+++ b/board/emulation/qemu-arm/MAINTAINERS
@@ -5,6 +5,5 @@ F: board/emulation/qemu-arm/
F: board/emulation/common/
F: include/configs/qemu-arm.h
F: include/configs/qemu-sbsa.h
-F: configs/qemu_arm_defconfig
-F: configs/qemu_arm64_defconfig
+F: configs/qemu_arm*
F: configs/qemu-arm-sbsa_defconfig
diff --git a/board/emulation/qemu-riscv/MAINTAINERS b/board/emulation/qemu-riscv/MAINTAINERS
index 3d7453f1b43..d75d1b5f190 100644
--- a/board/emulation/qemu-riscv/MAINTAINERS
+++ b/board/emulation/qemu-riscv/MAINTAINERS
@@ -4,9 +4,4 @@ S: Maintained
F: board/emulation/qemu-riscv/
F: board/emulation/common/
F: include/configs/qemu-riscv.h
-F: configs/qemu-riscv32_defconfig
-F: configs/qemu-riscv32_smode_defconfig
-F: configs/qemu-riscv32_spl_defconfig
-F: configs/qemu-riscv64_defconfig
-F: configs/qemu-riscv64_smode_defconfig
-F: configs/qemu-riscv64_spl_defconfig
+F: configs/qemu-riscv*
diff --git a/configs/qemu-riscv64_smode_acpi_defconfig b/configs/qemu-riscv64_smode_acpi_defconfig
new file mode 100644
index 00000000000..e78e5ffb390
--- /dev/null
+++ b/configs/qemu-riscv64_smode_acpi_defconfig
@@ -0,0 +1,2 @@
+#include <configs/qemu-riscv64_smode_defconfig>
+#include <board/emulation/configs/acpi.config>
diff --git a/configs/qemu_arm64_acpi_defconfig b/configs/qemu_arm64_acpi_defconfig
new file mode 100644
index 00000000000..f85f2913530
--- /dev/null
+++ b/configs/qemu_arm64_acpi_defconfig
@@ -0,0 +1,2 @@
+#include <configs/qemu_arm64_defconfig>
+#include <board/emulation/configs/acpi.config>