From 905637796f3db7d5992c9b8d11a59b30667221d2 Mon Sep 17 00:00:00 2001 From: Mihail Grigorov Date: Thu, 26 Oct 2017 14:22:47 +0300 Subject: meta-agl-bsp: imx6qsabrelite: Switch to WIC image To produce a bootable WIC image, we needs to make some changes in 6x_bootscript for compatibility with WIC and SDCARD images. Because in case of WIC, we have one partition, and the kernel files are located in /boot directory. In case of SDCARD image, kernel files are in root directory of first partition. Bug-AGL: SPEC-899 Change-Id: Ie4b26a703cc468ff8c8405e957aacc2973ee289a Signed-off-by: Mihail Grigorov Reviewed-by: Tom Rini Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11571 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: Matt Porter --- meta-agl-bsp/conf/include/agl_imx6qsabrelite.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta-agl-bsp/conf/include') diff --git a/meta-agl-bsp/conf/include/agl_imx6qsabrelite.inc b/meta-agl-bsp/conf/include/agl_imx6qsabrelite.inc index 2e3633ef4..5b86ba9a0 100644 --- a/meta-agl-bsp/conf/include/agl_imx6qsabrelite.inc +++ b/meta-agl-bsp/conf/include/agl_imx6qsabrelite.inc @@ -20,15 +20,19 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-boundary" PREFERRED_PROVIDER_u-boot = "u-boot-boundary" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-boundary" PREFERRED_PROVIDER_u-boot-mxsboot-native = "u-boot-boundary" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " u-boot-boundary" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ + u-boot-boundary \ + u-boot-script-boundary \ +" UBOOT_MACHINE = "nitrogen6q_config" SPL_BINARY = "" UBOOT_SUFFIX_SDCARD = "imx" IMAGE_BOOTLOADER = "u-boot" -# force generate sdcard image also -AGL_DEFAULT_IMAGE_FSTYPES := "sdcard.xz" +# generate WIC image also +WKS_FILE = "imx-uboot.wks" +AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" AGL_DEFAULT_INITRAMFS_FSTYPES := "" PREFERRED_VERSION_weston_mx6_forcevariable = "2.0.0" -- cgit 1.2.3-korg