plat/linuxu: Integrate `bootinfo` into `linuxu` builds

Add into the build process the sources required for integrating
the `struct ukplat_bootinfo` structure into `linuxu` images, as well
as the call to `build_bootinfo` method.

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/linuxu/Linker.uk b/plat/linuxu/Linker.uk
index 5e014289f7e21c527b33567e57436f7d5c11448d..1929aaa75728025924af67fe42572e890b6b0e6f 100644 (file)
--- a/plat/linuxu/Linker.uk
+++ b/plat/linuxu/Linker.uk
@@ -30,6 +30,7 @@ $(LINUXU_IMAGE): $(LINUXU_IMAGE).dbg
                        $(SECT_STRIP_FLAGS) $(SECT_STRIP_FLAGS-y) \
                        $< -o $@ 2>&1 | \
                        { grep -v "Empty loadable segment detected" || true; })
+       $(call build_bootinfo,$@)
 
 $(LINUXU_IMAGE).sym: $(LINUXU_DEBUG_IMAGE)
        $(call build_cmd,NM,,$@, $(NM) -n $< > $@)

diff --git a/plat/linuxu/Makefile.uk b/plat/linuxu/Makefile.uk
index 9490c1a31d3fe2838145e5f6899aeae273e2a601..9e2e1b8eaa18c516f410acddb3b6b144eb5d5c75 100644 (file)
--- a/plat/linuxu/Makefile.uk
+++ b/plat/linuxu/Makefile.uk
@@ -40,6 +40,8 @@ LIBLINUXUPLAT_SRCS-y              += $(LIBLINUXUPLAT_BASE)/time.c
 LIBLINUXUPLAT_SRCS-y              += $(UK_PLAT_COMMON_BASE)/lcpu.c|common
 LIBLINUXUPLAT_SRCS-y              += $(UK_PLAT_COMMON_BASE)/memory.c|common
 LIBLINUXUPLAT_SRCS-y              += $(UK_PLAT_COMMON_BASE)/tls.c|common
+LIBLINUXUPLAT_SRCS-y              += $(UK_PLAT_COMMON_BASE)/bootinfo.c|common
+LIBLINUXUPLAT_SRCS-y              += $(UK_PLAT_COMMON_BASE)/bootinfo.lds.S|common
 
 LIBLINUXUPLAT_SRCS-y              += $(LIBLINUXUPLAT_BASE)/io.c
 LIBLINUXUPLAT_SRCS-$(CONFIG_TAP_NET) += $(LIBLINUXUPLAT_BASE)/tap_io.c