firmware/skiboot: Enable embedded kernel payloads in skiboot image

Skiboot LID files can contain a kernel payload by specifying KERNEL=
during skiboot build.

Signed-off-by: Jeremy Kerr <[email protected]>

Author: jk-ozlabs

firmware/skiboot/Config.in

@@ -4,3 +4,11 @@ config BR2_TARGET_SKIBOOT
 	depends on BR2_powerpc64
 	help
 	  Build skiboot POWER8 firmware
+
+if BR2_TARGET_SKIBOOT
+
+config BR2_TARGET_SKIBOOT_EMBED_PAYLOAD
+	bool "Embed kernel payload in skiboot image"
+	depends on BR2_LINUX_KERNEL_ZIMAGE_EPAPR
+
+endif

firmware/skiboot/skiboot.mk

@@ -7,9 +7,21 @@
 SKIBOOT_VERSION = 1d880992fd8c8457a2d990ac6622cfd58fb1b261
 SKIBOOT_SITE = $(call github,open-power,skiboot,$(SKIBOOT_VERSION))
 SKIBOOT_INSTALL_IMAGES = YES
+SKIBOOT_INSTALL_TARGET = NO
+
+ifeq ($(BR2_TARGET_SKIBOOT_EMBED_PAYLOAD),y)
+SKIBOOT_MAKE_OPTS += KERNEL="$(BINARIES_DIR)/$(LINUX_IMAGE_NAME)"
+
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+SKIBOOT_DEPENDENCIES += linux26-rebuild-with-initramfs
+else
+SKIBOOT_DEPENDENCIES += linux
+endif
+
+endif
 
 define SKIBOOT_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) all
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(SKIBOOT_MAKE_OPTS) -C $(@D) all
 endef
 
 define SKIBOOT_INSTALL_IMAGES_CMDS