1 files changed, 6 insertions, 5 deletions

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index a8acb43d..63047d02 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -23,11 +23,12 @@ KERNEL_DEVICETREE = " \
 "
 KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
 
-# Use fslc u-boot by default. See also imx-base.inc.
-UBOOT_MAKE_TARGET = ""
-UBOOT_SUFFIX = "img"
-SPL_BINARY = "SPL"
-WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
+# These u-boot variables default to the correct settings for u-boot-imx.
+# Set overrides for u-boot-fslc.
+UBOOT_MAKE_TARGET_pn-u-boot-fslc = ""
+UBOOT_SUFFIX_pn-u-boot-fslc = "img"
+SPL_BINARY_pn-u-boot-fslc = "SPL"
+WKS_FILE_pn-u-boot-fslc = "imx-uboot-spl-bootpart.wks.in"
 
 UBOOT_CONFIG ??= " \
     sd \