Revert "imx6*.conf: Rework machine assignments for u-boot variables"

This reverts commit cc4b91bf3a3cf5c2034372c607783048aae44b65.

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 7464cb08a38091869aec58967fa5fbea26f75f7d..a6d5908bbe91cf43c1a20e296a90718dfccf402f 100644 (file)
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -34,12 +34,11 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
 
 UBOOT_MACHINE ?= "mx6sabreauto_defconfig"
 
-# 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 = "all"
-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"
+# Use fslc u-boot by default. See also imx-base.inc.
+UBOOT_MAKE_TARGET = "all"
+UBOOT_SUFFIX = "img"
+SPL_BINARY = "SPL"
+WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
 
 # The fsl distro uses u-boot-imx which does not provide unified functionality
 # for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant.

diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index a2b959e3cbc4b45cf3cc659847440d6d66138499..406ad7d781b8355d9844695db3d69e0b4a605e93 100644 (file)
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -43,12 +43,11 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
 
 UBOOT_MACHINE ?= "mx6sabresd_defconfig"
 
-# 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 = "all"
-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"
+# Use fslc u-boot by default. See also imx-base.inc.
+UBOOT_MAKE_TARGET = "all"
+UBOOT_SUFFIX = "img"
+SPL_BINARY = "SPL"
+WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
 
 # The fsl distro uses u-boot-imx which does not provide unified functionality
 # for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant.

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 63047d021a627278c42ea43e4dca8451f39fe903..a8acb43dc88d7f2599a0926ef7824da1979562e9 100644 (file)
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -23,12 +23,11 @@ KERNEL_DEVICETREE = " \
 "
 KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
 
-# 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"
+# 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"
 
 UBOOT_CONFIG ??= " \
     sd \