From dca115bc770a9564287151c8998ced82037dd78a Mon Sep 17 00:00:00 2001 From: Alessio Igor Bogani Date: Tue, 27 Aug 2019 02:22:59 +0000 Subject: am65xx-evm, beagle-x15, beaglebone, j7-evm, lego-ev3: Let user optionally override kickstarter files Signed-off-by: Alessio Igor Bogani Signed-off-by: Denys Dmytriyenko --- conf/machine/am65xx-evm.conf | 2 +- conf/machine/beagle-x15.conf | 2 +- conf/machine/beaglebone.conf | 2 +- conf/machine/j7-evm.conf | 2 +- conf/machine/lego-ev3.conf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/machine/am65xx-evm.conf b/conf/machine/am65xx-evm.conf index 27bb0b06..bd57c485 100644 --- a/conf/machine/am65xx-evm.conf +++ b/conf/machine/am65xx-evm.conf @@ -29,6 +29,6 @@ OPTEEOUTPUTMACHINE = "k3" # tiboot3.bin and sysfw.itb, which are provided by meta-arago # u-boot-k3-r5 and ti-sci-fw recipes IMAGE_BOOT_FILES = "tispl.bin u-boot.img" -WKS_FILE = "sdimage-bootpart.wks" +WKS_FILE ?= "sdimage-bootpart.wks" do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy" diff --git a/conf/machine/beagle-x15.conf b/conf/machine/beagle-x15.conf index 275a5ce0..1386ff05 100644 --- a/conf/machine/beagle-x15.conf +++ b/conf/machine/beagle-x15.conf @@ -12,7 +12,7 @@ SERIAL_CONSOLES = "115200;ttyS2" UBOOT_MACHINE = "am57xx_evm_config" -WKS_FILE = "sdimage-bootpart.wks" +WKS_FILE ?= "sdimage-bootpart.wks" IMAGE_BOOT_FILES = "MLO u-boot.img" IMAGE_FSTYPES += "tar.xz wic.xz" diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf index 450a1893..69db4215 100644 --- a/conf/machine/beaglebone.conf +++ b/conf/machine/beaglebone.conf @@ -13,7 +13,7 @@ MACHINE_GUI_CLASS = "bigscreen" SERIAL_CONSOLES = "115200;ttyS0" -WKS_FILE = "sdimage-bootpart.wks" +WKS_FILE ?= "sdimage-bootpart.wks" do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY}" diff --git a/conf/machine/j7-evm.conf b/conf/machine/j7-evm.conf index ca594e81..98a4258b 100644 --- a/conf/machine/j7-evm.conf +++ b/conf/machine/j7-evm.conf @@ -26,7 +26,7 @@ OPTEEOUTPUTMACHINE = "k3" # tiboot3.bin and sysfw.itb, which are provided by meta-arago # u-boot-k3-r5 and ti-sci-fw recipes IMAGE_BOOT_FILES = "tispl.bin u-boot.img" -WKS_FILE = "sdimage-bootpart.wks" +WKS_FILE ?= "sdimage-bootpart.wks" do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy" diff --git a/conf/machine/lego-ev3.conf b/conf/machine/lego-ev3.conf index 5c425221..5b89a6a7 100644 --- a/conf/machine/lego-ev3.conf +++ b/conf/machine/lego-ev3.conf @@ -17,6 +17,6 @@ KERNEL_DEVICETREE_BUNDLE = "1" SERIAL_CONSOLES = "115200;ttyS1" IMAGE_FSTYPES += " wic" -WKS_FILE = "sdimage-bootpart.wks" +WKS_FILE ?= "sdimage-bootpart.wks" WIC_CREATE_EXTRA_ARGS += " --no-fstab-update" IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPES}" -- cgit v1.2.3-54-g00ecf