Skip to contentSkip to conversation

hw: Have some targets select FDT on a per-machine basis

RFC PATCH New Philippe Mathieu-Daudé 1 participant 5 messages Oct 5, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

cover hw: Have some targets select FDT on a per-machine basis

PoC to have CONFIG_FDT per-machine set by Kconfig, looking at Paolo's "dtc: Convert Makefile bits to meson bits":
https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg00983.html

These files shouldn't be needed:
. default-configs/targets/mips64el-softmmu.mak
. default-configs/targets/ppc-softmmu.mak
. default-configs/targets/ppc64-softmmu.mak
. default-configs/targets/rx-softmmu.mak

The QEMU FTD API is used by these boot.c files, so for these it is easier to have a per-target config:
. hw/arm/boot.c
. hw/microblaze/boot.c
. hw/nios2/boot.c
. hw/riscv/boot.c

Philippe Mathieu-Daudé (4):
Kconfig.host: Declare FDT symbol
hw/ppc: Rename FDT_PPC as FDT
hw/mips/Kconfig: Let boston machine select FDT
hw/rx/Kconfig: Let gdbsim machine select FDT

 Kconfig.host       |  4 ++++
 hw/mips/Kconfig    |  1 +
 hw/ppc/Kconfig     | 15 ++++++---------
 hw/ppc/meson.build |  2 +-
 hw/rx/Kconfig      |  1 +
 5 files changed, 13 insertions(+), 10 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

RFC PATCH 1/4 Kconfig.host: Declare FDT symbol

Declare FDT symbol in the root Kconfig as it is
- dependent of libfdt
- used by various targets

---
 Kconfig.host | 4 ++++
 1 file changed, 4 insertions(+)
Kconfig.host +4 -0
index a9a55a9c31..c07a27220f 100644
@@ -37,3 +37,7 @@ config VIRTFS
 
 config PVRDMA
     bool
+
+config FDT
+    bool
+    #depends on LIBFDT
Signature · 1 line
2.26.2
#2 lore raw

RFC PATCH 2/4 hw/ppc: Rename FDT_PPC as FDT

In reply to Philippe Mathieu-Daudé

Use the generic FDT symbol.

---
 hw/ppc/Kconfig     | 15 ++++++---------
 hw/ppc/meson.build |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)
hw/ppc/Kconfig +6 -9
index dd86e664d2..e6b8957964 100644
@@ -10,7 +10,7 @@ config PSERIES
     select XICS_SPAPR
     select XIVE_SPAPR
     select MSI_NONBROKEN
-    select FDT_PPC
+    select FDT
     select CHRP_NVRAM
 
 config SPAPR_RNG
@@ -28,7 +28,7 @@ config POWERNV
     select MC146818RTC
     select XICS
     select XIVE
-    select FDT_PPC
+    select FDT
     select PCI_EXPRESS
     select MSI_NONBROKEN
 
@@ -47,7 +47,7 @@ config PPC440
     select PCI_EXPRESS
     select PPC4XX
     select SERIAL
-    select FDT_PPC
+    select FDT
 
 config PPC4XX
     bool
@@ -66,7 +66,7 @@ config SAM460EX
     select SMBUS_EEPROM
     select USB_EHCI_SYSBUS
     select USB_OHCI
-    select FDT_PPC
+    select FDT
 
 config PREP
     bool
@@ -117,7 +117,7 @@ config E500
     select PPCE500_PCI
     select SERIAL
     select MPC_I2C
-    select FDT_PPC
+    select FDT
 
 config VIRTEX
     bool
@@ -126,7 +126,7 @@ config VIRTEX
     select SERIAL
     select XILINX
     select XILINX_ETHLITE
-    select FDT_PPC
+    select FDT
 
 config XIVE
     bool
@@ -146,6 +146,3 @@ config XIVE_KVM
 # Only used by 64-bit targets
 config FW_CFG_PPC
     bool
-
-config FDT_PPC
-    bool
hw/ppc/meson.build +1 -1
index ffa2ec37fa..613a635bc4 100644
@@ -3,7 +3,7 @@ ppc_ss.add(files(
   'ppc.c',
   'ppc_booke.c',
 ))
-ppc_ss.add(when: 'CONFIG_FDT_PPC', if_true: [files(
+ppc_ss.add(when: 'CONFIG_FDT', if_true: [files(
   'fdt.c',
 ), fdt])
 ppc_ss.add(when: 'CONFIG_FW_CFG_PPC', if_true: files('fw_cfg.c'))
Signature · 1 line
2.26.2