From 7a029812002b93e9f51db45e640c234bdb75322b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 19 Mar 2021 11:55:22 -0300 Subject: Revert "imx6*.conf: Rework machine assignments for u-boot variables" This reverts commit cc4b91bf3a3cf5c2034372c607783048aae44b65. --- conf/machine/imx6qdlsabresd.conf | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'conf/machine/imx6qdlsabresd.conf') diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index a2b959e3..406ad7d7 100644 --- 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. -- cgit v1.2.3-54-g00ecf