From 79b9c97f25b167202c94041b20ff35802bd41559 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Thu, 23 Mar 2017 16:08:37 -0300
Subject: [PATCH] nitrogen6x: Add wic image tool support

The wic image needs to install the bootscript and it loads the
respective kernel image and device-tree files from the image, thus
those need to be included.

Change-Id: If58ef5a51a5016761f04fbf5b20aaabf903a22ea
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/nitrogen6x.conf | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf
index f35460d..0732a0c 100644
--- a/conf/machine/nitrogen6x.conf
+++ b/conf/machine/nitrogen6x.conf
@@ -54,10 +54,26 @@ do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
 # Boot scripts to install
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
 
+# wic support
+WKS_FILE ?= "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = " \
+    6x_bootscript-${MACHINE};6x_bootscript \
+    ${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb;imx6q-sabrelite.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb;imx6q-nitrogen6_max.dtb ${KERNEL_IMAGETYPE}-imx6qp-nitrogen6_max.dtb;imx6qp-nitrogen6_max.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-nitrogen6x.dtb;imx6q-nitrogen6x.dtb ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6x.dtb;imx6dl-nitrogen6x.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_som2.dtb;imx6q-nitrogen6_som2.dtb ${KERNEL_IMAGETYPE}-imx6qp-nitrogen6_som2.dtb;imx6qp-nitrogen6_som2.dtb \
+"
+IMAGE_DEPENDS_wic_append = " dosfstools-native mtools-native"
+
 UBOOT_MACHINE ?= "nitrogen6q_config"
 
 SERIAL_CONSOLE = "115200 ttymxc1"
 
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-wl12xx"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
+    kernel-image \
+    kernel-devicetree \
+"
 
 MACHINE_FEATURES += " pci wifi bluetooth"