plat: Move `build_bootinfo` to a platform common place

Since `build_bootinfo` can be used for other platforms as well, move
it to a more platform agnostic location.

Signed-off-by: Sergiu Moga <sergiu.moga@protonmail.com>
Reviewed-by: Michalis Pappas <michalis@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #848

diff --git a/plat/common/Makefile.rules b/plat/common/Makefile.rules
index 9b6fe2b243aa188da60d61c53285ddc736903e47..e52c521029ae0aa3236e9901ff6025da94fc5eef 100644 (file)
--- a/plat/common/Makefile.rules
+++ b/plat/common/Makefile.rules
@@ -1,3 +1,15 @@
 define build_elf64_to_32 =
        @$(SCRIPTS_DIR)/elf64_to_32.py $(1)
 endef
+
+BINFO_FLAGS := -a $(CONFIG_UK_ARCH)
+
+ifeq ($(CONFIG_UKPLAT_MEMRNAME),y)
+BINFO_FLAGS += -n
+endif
+
+define build_bootinfo =
+       $(call build_cmd,UKBI,,$(1).bootinfo,\
+               $(SCRIPTS_DIR)/mkbootinfo.py $(1) $(1).bootinfo $(BINFO_FLAGS) && \
+               $(OBJCOPY) $(1) --update-section .uk_bootinfo=$(1).bootinfo)
+endef

diff --git a/plat/kvm/Linker.uk b/plat/kvm/Linker.uk
index 373e9b3f54e991867fa6ab6dd58903feb8627b24..16791925b65495800dcc4b659c6a62dab489aa5f 100644 (file)
--- a/plat/kvm/Linker.uk
+++ b/plat/kvm/Linker.uk
@@ -10,7 +10,6 @@ else ifeq (arm64,$(CONFIG_UK_ARCH))
 KVM_LDFLAGS-y += -Wl,-m,aarch64elf
 KVM_LINK_LIBGCC_FLAG := -lgcc
 endif
-KVM_BINFO_FLAGS := -a $(CONFIG_UK_ARCH)
 
 ##
 ## Link image
@@ -31,16 +30,6 @@ KVM_LD_SCRIPT_FLAGS := $(addprefix -Wl$(comma)-dT$(comma),\
 KVM_LD_SCRIPT_FLAGS += $(addprefix -Wl$(comma)-T$(comma),\
                        $(KVM_LD_SCRIPT-y) $(EXTRA_LD_SCRIPT-y))
 
-ifeq ($(CONFIG_UKPLAT_MEMRNAME),y)
-KVM_BINFO_FLAGS += -n
-endif
-
-define build_bootinfo =
-       $(call build_cmd,UKBI,,$(1).bootinfo,\
-               $(SCRIPTS_DIR)/mkbootinfo.py $(1) $(1).bootinfo $(KVM_BINFO_FLAGS) && \
-               $(OBJCOPY) $(1) --update-section .uk_bootinfo=$(1).bootinfo)
-endef
-
 $(KVM_DEBUG_IMAGE): $(KVM_ALIBS) $(KVM_ALIBS-y) $(KVM_OLIBS) $(KVM_OLIBS-y) \
                    $(UK_ALIBS) $(UK_ALIBS-y) $(UK_OLIBS) $(UK_OLIBS-y) \
                    $(KVM_LD_SCRIPT-y) $(EXTRA_LD_SCRIPT-y) \