aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-10-06 13:37:14 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-10-14 19:56:27 +0000
commitfdf111b8b25d7728182443f03833302598fad170 (patch)
tree3a141b5d0a9bd0eacf79aa69536b5931c0ad2423 /meta-agl-bsp
parent07326290221ba045e8eca8652940de67381e9574 (diff)
meta-agl-bsp: Make more and better use of WIC images
- When we are using a WIC image, we should compress it (xz), provide a sha256sum of the compressed image and provide a bmap file for the uncompressed image. - Ensure that in these targets we are listing WIC as the AGL_EXTRA_IMAGE_FSTYPES to be used. - Based on the Beaglebone example, add WIC support for dra7xx-evm. The only change from Beaglebone is that we must also include uEnv.txt as this is what controls the DTB for the correct LCD. Bug-AGL: SPEC-899 Change-Id: I3f310a2eb268a4aaa0d791dfaa68d7fee350e150 Tested-by: Matt Porter <mporter@konsulko.com> (dra7xx-evm) Tested-by: Tom Rini <trini@konsulko.com> (Intel) Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11161 Reviewed-by: Scott Murray <scott.murray@konsulko.com> Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-bsp')
-rw-r--r--meta-agl-bsp/conf/include/agl_beaglebone.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_dra7xx-evm.inc7
-rw-r--r--meta-agl-bsp/conf/include/agl_intel-corei7-64.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_joule.inc2
4 files changed, 10 insertions, 3 deletions
diff --git a/meta-agl-bsp/conf/include/agl_beaglebone.inc b/meta-agl-bsp/conf/include/agl_beaglebone.inc
index a56da30ce..69e883572 100644
--- a/meta-agl-bsp/conf/include/agl_beaglebone.inc
+++ b/meta-agl-bsp/conf/include/agl_beaglebone.inc
@@ -41,4 +41,4 @@ SECURITY_CFLAGS_pn-libatasmart = ""
SECURITY_LDFLAGS_pn-libatasmart = ""
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz"
+AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
diff --git a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
index f3abe4cc5..f5e85100d 100644
--- a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
+++ b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
@@ -47,3 +47,10 @@ IMAGE_INSTALL_append = " \
${PACKAGES_MULTIMEDIA} \
cmem \
"
+
+# Include WIC support based on beaglebone
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+WKS_FILE = "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = "MLO u-boot.img uEnv.txt"
+
+AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
diff --git a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
index 3cfcb11f7..36d6f4723 100644
--- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
+++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
@@ -24,6 +24,6 @@ IMAGE_INSTALL_append = " \
va-intel \
gstreamer1.0-vaapi"
-AGL_DEFAULT_IMAGE_FSTYPES = "wic hddimg"
+AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum hddimg"
INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz"
NOISO = "1"
diff --git a/meta-agl-bsp/conf/include/agl_joule.inc b/meta-agl-bsp/conf/include/agl_joule.inc
index b6f14fca8..310b08979 100644
--- a/meta-agl-bsp/conf/include/agl_joule.inc
+++ b/meta-agl-bsp/conf/include/agl_joule.inc
@@ -9,6 +9,6 @@ IMAGE_INSTALL_append = " \
gstreamer1.0-vaapi"
OSTREE_BOOTLOADER ?= "u-boot"
-AGL_DEFAULT_IMAGE_FSTYPES = "wic hddimg"
+AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum hddimg"
INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz"
NOISO = "1"