From da422478d38e744283bcf61123c4a526396c7030 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Mon, 12 Aug 2019 14:03:31 -0300 Subject: [PATCH] Fix WKS_FILE to use files with .in extension meta-freescale commit 6be9d197386b5c3bd72023981df805d42f87684c renamed imx-uboot-spl-bootpart.wks to imx-uboot-spl-bootpart.wks.in The .in extension in wks files allows bitbake variables to be used in kickstarter files. Set WKS_FILES for all machines to match this new filename. Signed-off-by: Fabio Berton (cherry picked from commit 0d30e1769b3d826d1376fb5493ac55a6493cdcdc) --- conf/machine/cgtqmx6.conf | 2 +- conf/machine/cubox-i.conf | 2 +- conf/machine/imx6qdl-variscite-som.conf | 2 +- conf/machine/imx6ul-pico.conf | 2 +- conf/machine/wandboard.conf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/machine/cgtqmx6.conf b/conf/machine/cgtqmx6.conf index 916410c..bce34b1 100644 --- a/conf/machine/cgtqmx6.conf +++ b/conf/machine/cgtqmx6.conf @@ -16,7 +16,7 @@ UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" UBOOT_CONFIG ??= "cgtqmx6" UBOOT_CONFIG[cgtqmx6] = "cgtqmx6eval_defconfig" -WKS_FILE = "imx-uboot-spl-bootpart.wks" +WKS_FILE = "imx-uboot-spl-bootpart.wks.in" # Use linux kernel QMX6 PREFERRED_PROVIDER_virtual/kernel ??= "linux-congatec" diff --git a/conf/machine/cubox-i.conf b/conf/machine/cubox-i.conf index b1a85f6..b424815 100644 --- a/conf/machine/cubox-i.conf +++ b/conf/machine/cubox-i.conf @@ -23,7 +23,7 @@ UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6cuboxi_defconfig,sdcard" UENV_FILENAME = "uEnv-${MACHINE}.txt" SPL_BINARY = "SPL" -WKS_FILES = "imx-uboot-spl.wks" +WKS_FILES = "imx-uboot-spl.wks.in" UBOOT_EXTLINUX = "1" UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" diff --git a/conf/machine/imx6qdl-variscite-som.conf b/conf/machine/imx6qdl-variscite-som.conf index 2468261..467dba8 100644 --- a/conf/machine/imx6qdl-variscite-som.conf +++ b/conf/machine/imx6qdl-variscite-som.conf @@ -34,7 +34,7 @@ KERNEL_IMAGETYPE = "uImage" UBOOT_SPL_BUILD = "yes" UBOOT_MAKE_TARGET = "all" UBOOT_SUFFIX = "img" -WKS_FILE = "imx-uboot-spl-bootpart.wks" +WKS_FILE = "imx-uboot-spl-bootpart.wks.in" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-variscite" PREFERRED_PROVIDER_u-boot = "u-boot-variscite" diff --git a/conf/machine/imx6ul-pico.conf b/conf/machine/imx6ul-pico.conf index 0c5ae40..e04b6a6 100644 --- a/conf/machine/imx6ul-pico.conf +++ b/conf/machine/imx6ul-pico.conf @@ -37,6 +37,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ MACHINE_FEATURES += "wifi bluetooth" -WKS_FILES ?= "imx-uboot-spl.wks" +WKS_FILES ?= "imx-uboot-spl.wks.in" WKS_FILE_DEPENDS ?= "" IMAGE_FSTYPES = "wic.bmap wic.xz ext4.gz" diff --git a/conf/machine/wandboard.conf b/conf/machine/wandboard.conf index a567a1c..6fb67b5 100644 --- a/conf/machine/wandboard.conf +++ b/conf/machine/wandboard.conf @@ -48,4 +48,4 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ u-boot-fslc \ " -WKS_FILES = "imx-uboot-spl.wks" +WKS_FILES = "imx-uboot-spl.wks.in"