summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2024-01-08 09:11:53 -0500
committerTom Rini <[email protected]>2024-01-08 09:11:53 -0500
commitf28a77589e7505535a4eebdc7269df98f67dbe68 (patch)
tree69bb9a116ba839ffc101d1ae923485401332294f /board
parentc2c598e87cfe56f5991730762c00733c5aa9a994 (diff)
parent8c4b37ce97c27ad4e7f83b028d4cd1396a51a36f (diff)
Merge tag 'dm-next-7jan23' of https://source.denx.de/u-boot/custodians/u-boot-dm into next
switch to SMBIOS3 tables allow devicetree from bloblist ACPI support for ARM and RISC-V
Diffstat (limited to 'board')
-rw-r--r--board/emulation/configs/acpi.config3
-rw-r--r--board/emulation/qemu-arm/Kconfig1
-rw-r--r--board/emulation/qemu-riscv/Kconfig2
3 files changed, 6 insertions, 0 deletions
diff --git a/board/emulation/configs/acpi.config b/board/emulation/configs/acpi.config
new file mode 100644
index 00000000000..b7ed811e333
--- /dev/null
+++ b/board/emulation/configs/acpi.config
@@ -0,0 +1,3 @@
+CONFIG_CMD_QFW=y
+CONFIG_ACPI=y
+CONFIG_GENERATE_ACPI_TABLE=y
diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig
index ac2d078f42a..e21c135e86f 100644
--- a/board/emulation/qemu-arm/Kconfig
+++ b/board/emulation/qemu-arm/Kconfig
@@ -5,6 +5,7 @@ config TEXT_BASE
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
+ select QFW if ACPI
select QFW_MMIO if CMD_QFW
imply VIRTIO_MMIO
imply VIRTIO_PCI
diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig
index cdd0d0d95f6..d5f302ffdab 100644
--- a/board/emulation/qemu-riscv/Kconfig
+++ b/board/emulation/qemu-riscv/Kconfig
@@ -33,6 +33,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select GENERIC_RISCV
select SUPPORT_SPL
+ select QFW if ACPI
+ select QFW_MMIO if QFW
imply AHCI
imply SMP
imply BOARD_LATE_INIT