Use wic.gz for all i.MX machines by default

This change moves the default image for all i.MX machines. We moved
from sdcard.gz to wic.gz.

Following machines were change:

 - imx25pdk: use imx-uboot.wks
 - imx6qdlsabreauto: use imx-uboot-spl-bootpart.wks
 - imx6qdlsabresd: use imx-uboot-spl-bootpart.wks
 - imx6ulevk: use imx-uboot-spl-bootpart.wks

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

5 files changed, 7 insertions, 5 deletions

diff --git a/conf/machine/imx25pdk.conf b/conf/machine/imx25pdk.conf
index f35d0db4..e22d9f4e 100644
--- a/conf/machine/imx25pdk.conf
+++ b/conf/machine/imx25pdk.conf
@@ -17,7 +17,7 @@ SERIAL_CONSOLE = "115200 ttymxc0"
 
 MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
 
-WKS_FILE ?= "imx-uboot.wks"
+WKS_FILE = "imx-uboot.wks"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
     kernel-image \
     kernel-devicetree \
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 8967c150..0eed1e5c 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -31,6 +31,7 @@ UBOOT_MACHINE ?= "mx6sabreauto_defconfig"
 UBOOT_MAKE_TARGET = "all"
 UBOOT_SUFFIX = "img"
 SPL_BINARY = "SPL"
+WKS_FILE = "imx-uboot-spl-bootpart.wks"
 
 SERIAL_CONSOLE = "115200 ttymxc3"
 
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 92c92884..91ca9b45 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -31,6 +31,7 @@ UBOOT_MACHINE ?= "mx6sabresd_defconfig"
 UBOOT_MAKE_TARGET = "all"
 UBOOT_SUFFIX = "img"
 SPL_BINARY = "SPL"
+WKS_FILE = "imx-uboot-spl-bootpart.wks"
 
 SERIAL_CONSOLE = "115200 ttymxc0"
 
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index dadd525b..1b55a4ad 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -23,3 +23,4 @@ UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard"
 UBOOT_CONFIG[emmc] = "mx6ul_14x14_evk_emmc_config,sdcard"
 UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config"
 UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config"
+WKS_FILE = "imx-uboot-spl-bootpart.wks"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index e1b7895d..4c7071b6 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -222,8 +222,8 @@ IMX_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc"
 
 PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
 
-SOC_DEFAULT_IMAGE_FSTYPES = "sdcard.gz"
-SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard sdcard.gz"
+SOC_DEFAULT_IMAGE_FSTYPES = "wic.gz"
+SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard wic.gz"
 
 SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4"
 IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
@@ -240,8 +240,7 @@ WKS_FILE_DEPENDS ?= " \
     e2fsprogs-native \
     bmap-tools-native \
 "
-
-SOC_DEFAULT_IMAGE_FSTYPES_mx25 = "wic.gz"
+WKS_FILE ?= "imx-uboot-bootpart.wks"
 
 SERIAL_CONSOLE = "115200 ttymxc0"
 SERIAL_CONSOLE_mxs = "115200 ttyAMA0"