On Tue Jul 15, 2025 at 6:11 PM CEST, Alejandro Vallejo wrote: > This allows bootfdt.c and device-tree.c to be usable without > CONFIG_HAS_DEVICE_TREE_DISCOVERY. > > Gate everything else on CONFIG_HAS_DEVICE_TREE_DISCOVERY. > > Signed-off-by: Alejandro Vallejo <alejandro.garciavall...@amd.com> > --- > xen/common/Makefile | 2 +- > xen/common/device-tree/Makefile | 4 +++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/xen/common/Makefile b/xen/common/Makefile > index d541fbcf49..265468d751 100644 > --- a/xen/common/Makefile > +++ b/xen/common/Makefile > @@ -8,7 +8,7 @@ obj-y += cpu.o > obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o > obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device.o > obj-$(filter-out $(CONFIG_X86),$(CONFIG_ACPI)) += device.o > -obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device-tree/ > +obj-$(CONFIG_DEVICE_TREE_PARSE) += device-tree/ > obj-$(CONFIG_IOREQ_SERVER) += dm.o > obj-y += domain.o > obj-y += event_2l.o > diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile > index 8abc069c4b..1459e63c85 100644 > --- a/xen/common/device-tree/Makefile > +++ b/xen/common/device-tree/Makefile > @@ -1,11 +1,13 @@ > obj-y += bootfdt.init.o
Bah. From here... > obj-y += bootinfo-fdt.init.o > obj-y += bootinfo.init.o ... to here should have been deletions. > +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += bootinfo-fdt.init.o > +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += bootinfo.init.o > obj-y += device-tree.o > obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += domain-build.init.o > obj-$(CONFIG_DOM0LESS_BOOT) += dom0less-build.init.o > obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o > -obj-y += intc.o > +obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += intc.o > obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += kernel.o > obj-$(CONFIG_STATIC_EVTCHN) += static-evtchn.init.o > obj-$(CONFIG_STATIC_MEMORY) += static-memory.init.o
