Permalink
Browse files

Build bootloader kernel seperate from skiboot

We want the kernel to be placed in it's own BOOTKERNEL partition on the
flash. In that case we don't want it linked into the skiboot image,
instead it should be incorporated independently in to the PNOR image.

This is made the default for Palmetto, Habanero and Firestone configs.

Signed-off-by: Joel Stanley <joel@jms.id.au>
  • Loading branch information...
shenki committed Feb 1, 2015
1 parent 91aa912 commit 2aff5ba609d4bd4f6fd353b44ce5eb9536602a54
@@ -23,7 +23,7 @@ BR2_OPENPOWER_PNOR_FILENAME="firestone.pnor"
# skiboot requirements
BR2_TARGET_SKIBOOT=y
-BR2_TARGET_SKIBOOT_EMBED_PAYLOAD=y
+BR2_TARGET_SKIBOOT_EMBED_PAYLOAD=n
# petitboot requirements
BR2_ENABLE_LOCALE_PURGE=y
@@ -23,7 +23,7 @@ BR2_OPENPOWER_PNOR_FILENAME="habanero.pnor"
# skiboot requirements
BR2_TARGET_SKIBOOT=y
-BR2_TARGET_SKIBOOT_EMBED_PAYLOAD=y
+BR2_TARGET_SKIBOOT_EMBED_PAYLOAD=n
# petitboot requirements
BR2_ENABLE_LOCALE_PURGE=y
@@ -23,7 +23,7 @@ BR2_OPENPOWER_PNOR_FILENAME="palmetto.pnor"
# skiboot requirements
BR2_TARGET_SKIBOOT=y
-BR2_TARGET_SKIBOOT_EMBED_PAYLOAD=y
+BR2_TARGET_SKIBOOT_EMBED_PAYLOAD=n
# petitboot requirements
BR2_ENABLE_LOCALE_PURGE=y
@@ -8,12 +8,22 @@
# make doesn't care for quotes in the dependencies.
XML_PACKAGE=$(subst $\",,$(BR2_OPENPOWER_XML_PACKAGE))
-OPENPOWER_PNOR_VERSION ?= 94389f62eabecf00ef129b4184bf4ba2bc9cd193
+OPENPOWER_PNOR_VERSION ?= 6523442e4ced0f5866654b715d6debbb8b88d890
OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
OPENPOWER_PNOR_LICENSE = Apache-2.0
OPENPOWER_PNOR_DEPENDENCIES = hostboot hostboot-binaries $(XML_PACKAGE) skiboot host-openpower-ffs occ
+ifeq ($(BR2_TARGET_SKIBOOT_EMBED_PAYLOAD),n)
+
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+OPENPOWER_PNOR_DEPENDENCIES += linux26-rebuild-with-initramfs
+else
+OPENPOWER_PNOR_DEPENDENCIES += linux
+endif
+
+endif
+
OPENPOWER_PNOR_INSTALL_IMAGES = YES
OPENPOWER_PNOR_INSTALL_TARGET = NO
@@ -43,6 +53,7 @@ define OPENPOWER_PNOR_INSTALL_IMAGES_CMDS
-scratch_dir $(OPENPOWER_PNOR_SCRATCH_DIR) \
-outdir $(STAGING_DIR)/pnor/ \
-payload $(BINARIES_DIR)/$(BR2_SKIBOOT_LID_NAME) \
+ -bootkernel $(BINARIES_DIR)/$(LINUX_IMAGE_NAME) \
-sbe_binary_filename $(BR2_HOSTBOOT_BINARY_SBE_FILENAME) \
-sbec_binary_filename $(BR2_HOSTBOOT_BINARY_SBEC_FILENAME) \
-occ_binary_filename $(OCC_STAGING_DIR)/$(BR2_OCC_BIN_FILENAME) \

0 comments on commit 2aff5ba

Please sign in to comment.