diff options
Diffstat (limited to 'recipes-bsp')
-rw-r--r-- | recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 10 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb | 4 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-imx_2021.04.bb | 9 |
3 files changed, 19 insertions, 4 deletions
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index f8ebb730..b332e079 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb | |||
@@ -24,7 +24,10 @@ DEPENDS:append:mx8m = " u-boot-mkimage-native dtc-native" | |||
24 | BOOT_NAME = "imx-boot" | 24 | BOOT_NAME = "imx-boot" |
25 | PROVIDES = "${BOOT_NAME}" | 25 | PROVIDES = "${BOOT_NAME}" |
26 | 26 | ||
27 | inherit deploy | 27 | inherit deploy uuu_bootloader_tag |
28 | |||
29 | UUU_BOOTLOADER = "${BOOT_NAME}" | ||
30 | UUU_BOOTLOADER_TAGGED = "${BOOT_NAME}-tagged" | ||
28 | 31 | ||
29 | # Add CFLAGS with native INCDIR & LIBDIR for imx-mkimage build | 32 | # Add CFLAGS with native INCDIR & LIBDIR for imx-mkimage build |
30 | CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR_NATIVE} -L ${STAGING_LIBDIR_NATIVE}" | 33 | CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR_NATIVE} -L ${STAGING_LIBDIR_NATIVE}" |
@@ -190,9 +193,8 @@ do_deploy() { | |||
190 | fi | 193 | fi |
191 | install -m 0644 ${S}/${BOOT_CONFIG_MACHINE}-${target} ${DEPLOYDIR} | 194 | install -m 0644 ${S}/${BOOT_CONFIG_MACHINE}-${target} ${DEPLOYDIR} |
192 | done | 195 | done |
193 | cd ${DEPLOYDIR} | 196 | |
194 | ln -sf ${BOOT_CONFIG_MACHINE}-${IMAGE_IMXBOOT_TARGET} ${BOOT_NAME} | 197 | ln -sf ${BOOT_CONFIG_MACHINE}-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME} |
195 | cd - | ||
196 | } | 198 | } |
197 | addtask deploy before do_build after do_compile | 199 | addtask deploy before do_build after do_compile |
198 | 200 | ||
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb index af502889..5443ceac 100644 --- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb | |||
@@ -6,3 +6,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-imx:" | |||
6 | 6 | ||
7 | require u-boot-imx_${PV}.bb | 7 | require u-boot-imx_${PV}.bb |
8 | require u-boot-mfgtool.inc | 8 | require u-boot-mfgtool.inc |
9 | |||
10 | UUU_BOOTLOADER_TAGGED = "" | ||
11 | UUU_BOOTLOADER_TAGGED:mx6 = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}" | ||
12 | UUU_BOOTLOADER_TAGGED:mx7 = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}" | ||
diff --git a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb index bb5809e2..96552eef 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb | |||
@@ -7,6 +7,15 @@ require u-boot-imx-common_${PV}.inc | |||
7 | 7 | ||
8 | PROVIDES += "u-boot" | 8 | PROVIDES += "u-boot" |
9 | 9 | ||
10 | inherit uuu_bootloader_tag | ||
11 | |||
12 | UUU_BOOTLOADER = "" | ||
13 | UUU_BOOTLOADER:mx6 = "${UBOOT_BINARY}" | ||
14 | UUU_BOOTLOADER:mx7 = "${UBOOT_BINARY}" | ||
15 | UUU_BOOTLOADER_TAGGED = "" | ||
16 | UUU_BOOTLOADER_TAGGED:mx6 = "u-boot-tagged.${UBOOT_SUFFIX}" | ||
17 | UUU_BOOTLOADER_TAGGED:mx7 = "u-boot-tagged.${UBOOT_SUFFIX}" | ||
18 | |||
10 | do_deploy:append:mx8m() { | 19 | do_deploy:append:mx8m() { |
11 | # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary | 20 | # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary |
12 | if [ -n "${UBOOT_CONFIG}" ] | 21 | if [ -n "${UBOOT_CONFIG}" ] |