From: "Pratyush Yadav (Google)" kho_block.o is part of the KHO infrastructure, but is currently built as part of luo.o, which ties it to CONFIG_LIVEUPDATE. Group all KHO objects into a composite kho.o, built for CONFIG_KEXEC_HANDOVER, the same way the LUO objects are grouped into luo.o. This also gives a single place to add new KHO objects. Signed-off-by: Pratyush Yadav (Google) --- kernel/liveupdate/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kernel/liveupdate/Makefile b/kernel/liveupdate/Makefile index d9f4694625567..bc679905ce3f2 100644 --- a/kernel/liveupdate/Makefile +++ b/kernel/liveupdate/Makefile @@ -1,13 +1,17 @@ # SPDX-License-Identifier: GPL-2.0 +kho-y := \ + kexec_handover.o \ + kho_block.o + +kho-$(CONFIG_KEXEC_HANDOVER_DEBUGFS) += kexec_handover_debugfs.o + +obj-$(CONFIG_KEXEC_HANDOVER) += kho.o + luo-y := \ - kho_block.o \ luo_core.o \ luo_file.o \ luo_flb.o \ luo_session.o -obj-$(CONFIG_KEXEC_HANDOVER) += kexec_handover.o -obj-$(CONFIG_KEXEC_HANDOVER_DEBUGFS) += kexec_handover_debugfs.o - obj-$(CONFIG_LIVEUPDATE) += luo.o -- 2.56.0.611.g1030f0b940-goog