payloads/bareflank: load Bareflank before main payload

Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>

Author: krystian-hebel

payloads/Kconfig

@@ -129,8 +129,7 @@ config BAREFLANK_SECONDARY_PAYLOAD
 	default n
 	depends on ARCH_X86
 	help
-	  Bareflank can be loaded as a secondary payload under SeaBIOS, GRUB,
-	  or any other payload that can load additional payloads.
+	  Bareflank can be loaded before primary payload.
 
 config MEMTEST_SECONDARY_PAYLOAD
 	bool "Load Memtest86+ as a secondary payload"

payloads/Makefile.inc

@@ -13,10 +13,10 @@
 ## GNU General Public License for more details.
 ##
 
-cbfs-files-$(CONFIG_BAREFLANK_SECONDARY_PAYLOAD) += img/bareflank
-img/bareflank-file := payloads/bareflank/build/bareflank.elf
-img/bareflank-type := payload
-img/bareflank-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
+cbfs-files-$(CONFIG_BAREFLANK_SECONDARY_PAYLOAD) += $(CONFIG_CBFS_PREFIX)/payload
+$(CONFIG_CBFS_PREFIX)/payload-file := payloads/bareflank/build/bareflank.elf
+$(CONFIG_CBFS_PREFIX)/payload-type := payload
+$(CONFIG_CBFS_PREFIX)/payload-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
 
 cbfs-files-$(CONFIG_COREINFO_SECONDARY_PAYLOAD) += img/coreinfo
 img/coreinfo-file := payloads/coreinfo/build/coreinfo.elf
@@ -45,7 +45,7 @@ payloads/external/LinuxBoot \
 payloads/external/Yabits \
 
 payloads/bareflank/build/bareflank.elf bareflank:
-	$(MAKE) -C payloads/bareflank defaultbuild
+	$(MAKE) -C payloads/bareflank defaultbuild CONFIG_CBFS_PREFIX=$(CONFIG_CBFS_PREFIX)
 
 payloads/coreinfo/build/coreinfo.elf coreinfo:
 	$(MAKE) -C payloads/coreinfo defaultbuild

payloads/bareflank/Makefile

@@ -100,7 +100,7 @@ $(coreinfo_obj)/%.S.o: $(src)/%.S libpayload
 
 $(coreinfo_obj)/%.o: $(src)/%.c libpayload
 	printf "    LPCC       $(subst $(CURDIR)/,,$(@))\n"
-	$(LPCC) $(CFLAGS) -c -o $@ $<
+	$(LPCC) $(CFLAGS) -c -o $@ $< -DCONFIG_CBFS_PREFIX=\"$(CONFIG_CBFS_PREFIX)\"
 
 else
 real-all: config

payloads/bareflank/entry.c

@@ -195,8 +195,11 @@ int main(void)
     ioctl_load_vmm();
     ioctl_start_vmm();
 
-    payload = cbfs_load_payload(CBFS_DEFAULT_MEDIA, "img/seabios");
+    payload = cbfs_load_payload(CBFS_DEFAULT_MEDIA, CONFIG_CBFS_PREFIX "/realpayload");
 
     cbfs_run_payload(payload);
+
+    printf("Should not get here...\n");
+
     return 0;
 }

payloads/external/Makefile.inc

@@ -47,6 +47,17 @@ ifneq ($(strip $(call strip_quotes,$(CONFIG_PAYLOAD_OPTIONS))),)
       ADDITIONAL_PAYLOAD_CONFIG+=$(strip $(call strip_quotes,$(CONFIG_PAYLOAD_OPTIONS)))
 endif
 
+ifeq ($(CONFIG_BAREFLANK_SECONDARY_PAYLOAD),y)
+cbfs-files-y += $(CONFIG_CBFS_PREFIX)/realpayload
+$(CONFIG_CBFS_PREFIX)/realpayload-file := $(CONFIG_PAYLOAD_FILE)
+ifeq ($(CONFIG_PAYLOAD_IS_FLAT_BINARY),y)
+$(CONFIG_CBFS_PREFIX)/realpayload-type := flat-binary
+else
+$(CONFIG_CBFS_PREFIX)/realpayload-type := payload
+endif
+$(CONFIG_CBFS_PREFIX)/realpayload-compression := $(CBFS_PAYLOAD_COMPRESS_FLAG)
+$(CONFIG_CBFS_PREFIX)/realpayload-options := $(ADDITIONAL_PAYLOAD_CONFIG)
+else
 cbfs-files-y += $(CONFIG_CBFS_PREFIX)/payload
 $(CONFIG_CBFS_PREFIX)/payload-file := $(CONFIG_PAYLOAD_FILE)
 ifeq ($(CONFIG_PAYLOAD_IS_FLAT_BINARY),y)
@@ -56,6 +67,7 @@ $(CONFIG_CBFS_PREFIX)/payload-type := payload
 endif
 $(CONFIG_CBFS_PREFIX)/payload-compression := $(CBFS_PAYLOAD_COMPRESS_FLAG)
 $(CONFIG_CBFS_PREFIX)/payload-options := $(ADDITIONAL_PAYLOAD_CONFIG)
+endif
 
 cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_config
 payload_config-file := $(PAYLOAD_CONFIG)