From cc4b91bf3a3cf5c2034372c607783048aae44b65 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 12 Mar 2021 23:21:43 -0600 Subject: imx6*.conf: Rework machine assignments for u-boot variables The u-boot settings in imx6qdlsabresd, imx6qdlsabreauto, and imx6ulevk are set to values that are correct for u-boot-fslc. Attempts to override these settings to fix u-boot-imx builds have broken u-boot-fslc builds, and vice versa. The u-boot-imx build is currently broken: ``` | install: cannot stat '/opt/work/upstream/fsl-xwayland/tmp/work/imx6qdlsabresd-fsl-linux-gnueabi/u-boot-imx/2020.04-r0/build/u-boot.img': No such file or directory ``` Rework the u-boot-fslc-specific overrides so they are used conditionally only for u-boot-fslc. The default settings are correct for u-boot-imx. Fixes: 880dbf2 ("fsl-base.inc: use conditional assignment for base variables") Fixes: e83f54d ("machines: imx-base.inc: fix failing u-boot builds") Signed-off-by: Tom Hochstein --- conf/machine/imx6qdlsabreauto.conf | 11 ++++++----- conf/machine/imx6qdlsabresd.conf | 11 ++++++----- conf/machine/imx6ulevk.conf | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index a6d5908b..7464cb08 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -34,11 +34,12 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \ UBOOT_MACHINE ?= "mx6sabreauto_defconfig" -# 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" +# 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" # 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 406ad7d7..a2b959e3 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -43,11 +43,12 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \ UBOOT_MACHINE ?= "mx6sabresd_defconfig" -# 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" +# 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" # 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 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 \ -- cgit v1.2.3-54-g00ecf