summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/imx6ulevk.conf2
-rw-r--r--conf/machine/imx8mq-evk.conf1
-rw-r--r--conf/machine/include/imx-base.inc8
-rw-r--r--conf/machine/include/imx8mm-evk.inc1
-rw-r--r--conf/machine/include/imx8mn-evk.inc1
-rw-r--r--conf/machine/include/imx8mp-evk.inc1
6 files changed, 10 insertions, 4 deletions
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 8f908efe..216f47bd 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -32,7 +32,9 @@ UBOOT_SUFFIX:pn-u-boot-fslc = "img"
32# The u-boot-imx does not provide SPL support 32# The u-boot-imx does not provide SPL support
33SPL_BINARY:pn-u-boot-imx = "" 33SPL_BINARY:pn-u-boot-imx = ""
34UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" 34UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
35UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx"
35UBOOT_SUFFIX:pn-u-boot-imx = "imx" 36UBOOT_SUFFIX:pn-u-boot-imx = "imx"
37UBOOT_SUFFIX:pn-u-boot-imx-mfgtool = "imx"
36 38
37WKS_FILE = " \ 39WKS_FILE = " \
38 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ 40 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index ace29424..c1abe991 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -96,7 +96,6 @@ UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp ??= "root=/dev/mmcblk1p2"
96IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" 96IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
97 97
98LOADADDR = "" 98LOADADDR = ""
99UBOOT_SUFFIX = "bin"
100UBOOT_MAKE_TARGET = "" 99UBOOT_MAKE_TARGET = ""
101IMX_BOOT_SEEK = "33" 100IMX_BOOT_SEEK = "33"
102 101
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 2962c9e9..cc55d327 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -60,6 +60,14 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
60# | 60# |
61# | UBOOT_MACHINE = "mx53loco_config" 61# | UBOOT_MACHINE = "mx53loco_config"
62# `---- 62# `----
63#
64# Please note that UBOOT_SUFFIX must be set in the machine config even
65# if the value is the same for the U-Boot flavors. If the value is not
66# set, then the assignment here is the one used, the value resolves to
67# empty, and the build fails:
68# | cp: cannot stat '/.../tmp/work/imx8qm_mek-fsl-linux/u-boot-imx/2022.04-r0/build/imx8qm_mek_defconfig/u-boot.': No such file or directory
69#| WARNING: /.../tmp/work/imx8qm_mek-fsl-linux/u-boot-imx/2022.04-r0/temp/run.do_compile.21223:186 exit 1 from 'cp /.../tmp/work/imx8qm_mek-fsl-linux/u-boot-imx/2022.04-r0/build/${config}/${binary} /.../tmp/work/imx8qm_mek-fsl-linux/u-boot-imx/2022.04-r0/build/${config}/u-boot-${type}.${UBOOT_SUFFIX:pn-u-boot-imx}'
70#
63IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc" 71IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc"
64UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}" 72UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}"
65 73
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index f124b8f6..36d3bd9a 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -67,7 +67,6 @@ UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp = "root=/dev/mmcblk1p2"
67IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" 67IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
68 68
69LOADADDR = "" 69LOADADDR = ""
70UBOOT_SUFFIX = "bin"
71UBOOT_MAKE_TARGET = "all" 70UBOOT_MAKE_TARGET = "all"
72IMX_BOOT_SEEK = "33" 71IMX_BOOT_SEEK = "33"
73 72
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 261c9b53..4b3b3d22 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -73,7 +73,6 @@ IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.con
73 73
74BOOT_SPACE = "65536" 74BOOT_SPACE = "65536"
75LOADADDR = "" 75LOADADDR = ""
76UBOOT_SUFFIX = "bin"
77UBOOT_MAKE_TARGET = "all" 76UBOOT_MAKE_TARGET = "all"
78 77
79# Image boot offset as defined in section 6.1.6.1 "Primary image offset and IVT offset" of 78# Image boot offset as defined in section 6.1.6.1 "Primary image offset and IVT offset" of
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index 1b83e677..2f630ab4 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -69,7 +69,6 @@ UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp = "root=/dev/mmcblk1p2"
69IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" 69IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
70 70
71LOADADDR = "" 71LOADADDR = ""
72UBOOT_SUFFIX = "bin"
73UBOOT_MAKE_TARGET = "all" 72UBOOT_MAKE_TARGET = "all"
74IMX_BOOT_SEEK = "32" 73IMX_BOOT_SEEK = "32"
75 74