From ca00468ab6f1cc679e0a5db349811ee2ba6a76bf Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 19 Oct 2017 16:51:23 -0400 Subject: R-Car Gen3: Add WIC support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a new wks file for the R-Car Gen3 platforms. Given that U-Boot is on-device and not updated by us, we just need to make a single partition that contains the rootfs. This matches the existing instructions. We need to include kernel-devicetree into the resulting image so that we have the device tree there to be loaded in. Bug-AGL: SPEC-899 Change-Id: Iad55ef0ed49e7a53846fa36393e71d16cd5e423d Signed-off-by: Tom Rini Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11391 Reviewed-by: Stéphane Desneux Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller Reviewed-by: Scott Murray --- meta-agl-bsp/conf/include/agl_h3ulcb.inc | 5 +++++ meta-agl-bsp/conf/include/agl_m3ulcb.inc | 5 +++++ meta-agl-bsp/wic/singlepart-noloader.wks | 5 +++++ 3 files changed, 15 insertions(+) create mode 100644 meta-agl-bsp/wic/singlepart-noloader.wks diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc index 12634ce06..e38cdc70f 100644 --- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc @@ -40,6 +40,7 @@ DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw" DISTRO_FEATURES_BACKFILL_remove = "gobject-introspection-data" IMAGE_INSTALL_append_rcar-gen3 = " \ + kernel-devicetree \ kernel-module-pvrsrvkm \ kernel-module-vsp2 \ kernel-module-vspm \ @@ -49,3 +50,7 @@ IMAGE_INSTALL_append_rcar-gen3 = " \ BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/" OSTREE_BOOTLOADER ?= "u-boot" + +WKS_FILE = "singlepart-noloader.wks" + +AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc index 73de0053f..7fcea6546 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc @@ -43,6 +43,7 @@ DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw" DISTRO_FEATURES_BACKFILL_remove = "gobject-introspection-data" IMAGE_INSTALL_append_rcar-gen3 = " \ + kernel-devicetree \ kernel-module-pvrsrvkm \ kernel-module-vsp2 \ kernel-module-vspm \ @@ -55,3 +56,7 @@ BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/" OSTREE_KERNEL = "Image" IMAGE_BOOT_FILES_sota = "m3ulcb-ota-bootfiles/* Image-r8a7796-m3ulcb.dtb" OSTREE_BOOTLOADER ?= "u-boot" + +WKS_FILE = "singlepart-noloader.wks" + +AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" diff --git a/meta-agl-bsp/wic/singlepart-noloader.wks b/meta-agl-bsp/wic/singlepart-noloader.wks new file mode 100644 index 000000000..31c499aee --- /dev/null +++ b/meta-agl-bsp/wic/singlepart-noloader.wks @@ -0,0 +1,5 @@ +# short-description: Single partition rootfs with UUID and no bootloader +# long-description: Creates a partitioned image with a single partition in +# use and does not contain a bootloader. + +part / --source rootfs --use-uuid --fstype=ext4 --label root --align 4096 -- cgit 1.2.3-korg