diff options
| -rw-r--r-- | meta-nuvoton/conf/machine/evb-npcm845.conf | 1 | ||||
| -rw-r--r-- | meta-nuvoton/conf/machine/include/npcm8xx.inc | 4 | ||||
| -rw-r--r-- | meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass | 7 |
3 files changed, 12 insertions, 0 deletions
diff --git a/meta-nuvoton/conf/machine/evb-npcm845.conf b/meta-nuvoton/conf/machine/evb-npcm845.conf index 02e0659712..725f2b051d 100644 --- a/meta-nuvoton/conf/machine/evb-npcm845.conf +++ b/meta-nuvoton/conf/machine/evb-npcm845.conf @@ -12,6 +12,7 @@ require conf/machine/include/obmc-bsp-common.inc FLASH_SIZE = "65536" FLASH_UBOOT_OFFSET:flash-65536 = "0" +FLASH_MANIFEST_OFFSET:flash-65536 = "3832" FLASH_UBOOT_ENV_OFFSET:flash-65536 = "3840" FLASH_KERNEL_OFFSET:flash-65536 = "4096" FLASH_ROFS_OFFSET:flash-65536 = "12288" diff --git a/meta-nuvoton/conf/machine/include/npcm8xx.inc b/meta-nuvoton/conf/machine/include/npcm8xx.inc index 24956a245f..a0f347c4ca 100644 --- a/meta-nuvoton/conf/machine/include/npcm8xx.inc +++ b/meta-nuvoton/conf/machine/include/npcm8xx.inc @@ -6,6 +6,10 @@ require conf/machine/include/nuvoton.inc require conf/machine/include/igps-keys.inc KERNEL_IMAGETYPE ?= "Image" + +KERNEL_IMAGETYPE:df-obmc-static-norootfs = "Image" +KERNEL_IMAGETYPES:df-obmc-static-norootfs = "${KERNEL_IMAGETYPE}" + KERNEL_EXTRA_ARGS ?= "UIMAGE_LOADADDR=0x00008000" UBOOT_MACHINE ?= "ArbelEVB_defconfig" diff --git a/meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass b/meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass index 03500faa14..56aa082823 100644 --- a/meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass +++ b/meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass @@ -27,6 +27,9 @@ OPTEE_BIN = "tee.bin" UBOOT_BIN = "u-boot.bin" BB_NO_TIP_BIN = "arbel_a35_bootblock_no_tip.bin" +FIT_KERNEL_COMP_ALG:df-obmc-static-norootfs = "gzip" +FIT_KERNEL_COMP_ALG_EXTENSION:df-obmc-static-norootfs = ".gz" + # Align images if needed python do_pad_binary() { TIP_IMAGE = d.getVar('TIP_IMAGE', True) @@ -257,7 +260,9 @@ do_generate_ext4_tar:append() { addtask do_pad_binary before do_prepare_bootloaders addtask do_sign_binary before do_merge_bootloaders after do_prepare_bootloaders addtask do_prepare_bootloaders before do_generate_static after do_generate_rwfs_static +addtask do_prepare_bootloaders before do_generate_static_norootfs after do_image_cpio addtask do_merge_bootloaders before do_generate_static after do_sign_binary +addtask do_merge_bootloaders before do_generate_static_norootfs after do_sign_binary addtask do_merge_bootloaders before do_generate_ext4_tar after do_prepare_bootloaders # Include the full bootblock and u-boot in the final static image @@ -280,5 +285,7 @@ do_generate_ubi_tar[depends] += "${PN}:do_prepare_bootloaders" do_generate_ubi_tar[depends] += "${PN}:do_merge_bootloaders" do_generate_static_tar[depends] += "${PN}:do_prepare_bootloaders" do_generate_static_tar[depends] += "${PN}:do_merge_bootloaders" +do_generate_static_norootfs[depends] += "${PN}:do_prepare_bootloaders" +do_generate_static_norootfs[depends] += "${PN}:do_merge_bootloaders" do_generate_ext4_tar[depends] += "${PN}:do_prepare_bootloaders" do_generate_ext4_tar[depends] += "${PN}:do_merge_bootloaders" |