Fixes BR2_PACKAGE_SKIBOOT_EMBED_PAYLOAD and legal-info
Commit '898245e0 skiboot: Change to BR2_PACKAGE_SKIBOOT from
BR2_TARGET_SKIBOOT' broke the configuration to embed the Kernel
as part of Skiboot.
Additionally, commit '2aff5ba6 Build bootloader kernel seperate from skiboot'
incorrectly assumed that BR2_PACKAGE_SKIBOOT_EMBED_PAYLOAD could take the 'n'
value (when it's really just unset when not configured) and introduced a
'linux-rebuild-with-initramfs' dependency that was never exercised (and fails
when building legal-info).
Fixes: 898245e0 skiboot: Change to BR2_PACKAGE_SKIBOOT from BR2_TARGET_SKIBOOT
Fixes: 2aff5ba6 Build bootloader kernel seperate from skiboot
Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
diff --git a/openpower/package/skiboot/skiboot.mk b/openpower/package/skiboot/skiboot.mk
index 708cef7..0559214 100644
--- a/openpower/package/skiboot/skiboot.mk
+++ b/openpower/package/skiboot/skiboot.mk
@@ -27,17 +27,11 @@
OBJCOPY="$(TARGET_OBJCOPY)" OBJDUMP="$(TARGET_OBJDUMP)" \
SIZE="$(TARGET_CROSS)size"
-ifeq ($(BR2_TARGET_SKIBOOT_EMBED_PAYLOAD),y)
-SKIBOOT_MAKE_OPTS += KERNEL="$(BINARIES_DIR)/$(LINUX_IMAGE_NAME)"
-
-ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
-SKIBOOT_DEPENDENCIES += linux-rebuild-with-initramfs
-else
+ifeq ($(BR2_PACKAGE_SKIBOOT_EMBED_PAYLOAD),y)
+SKIBOOT_MAKE_OPTS += KERNEL=$(BINARIES_DIR)/$(LINUX_IMAGE_NAME)
SKIBOOT_DEPENDENCIES += linux
endif
-endif
-
define SKIBOOT_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) SKIBOOT_VERSION=`cat $(SKIBOOT_VERSION_FILE)` \
$(MAKE) $(SKIBOOT_MAKE_OPTS) -C $(@D) all