diff options
-rw-r--r-- | conf/machine/include/imx-base.inc | 4 | ||||
-rw-r--r-- | recipes-bsp/imx-mkimage/imx-boot_0.2.bb | 3 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-imx-common.inc | 20 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-imx-tools_2019.04.bb | 9 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-imx_2019.04.bb | 19 |
5 files changed, 36 insertions, 19 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 2edb9a31..484ec891 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -10,6 +10,10 @@ IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" | |||
10 | IMX_DEFAULT_BOOTLOADER_mx8 = "u-boot-imx" | 10 | IMX_DEFAULT_BOOTLOADER_mx8 = "u-boot-imx" |
11 | 11 | ||
12 | PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" | 12 | PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" |
13 | PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" | ||
14 | PREDERRED_PROVIDED_nativesdk-u-boot-tools ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" | ||
15 | PREFERRED_PROVIDER_u-boot-mkimage-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" | ||
16 | PREFERRED_PROVIDER_nativesdk-u-boot-mkimage ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" | ||
13 | PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" | 17 | PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" |
14 | 18 | ||
15 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" | 19 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" |
diff --git a/recipes-bsp/imx-mkimage/imx-boot_0.2.bb b/recipes-bsp/imx-mkimage/imx-boot_0.2.bb index 00427d9f..0604cec8 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_0.2.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_0.2.bb | |||
@@ -15,6 +15,7 @@ DEPENDS += " \ | |||
15 | ${IMX_EXTRA_FIRMWARE} \ | 15 | ${IMX_EXTRA_FIRMWARE} \ |
16 | imx-atf \ | 16 | imx-atf \ |
17 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-os', '', d)} \ | 17 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-os', '', d)} \ |
18 | u-boot-mkimage-native \ | ||
18 | " | 19 | " |
19 | DEPENDS_append_mx8m = " dtc-native" | 20 | DEPENDS_append_mx8m = " dtc-native" |
20 | BOOT_NAME = "imx-boot" | 21 | BOOT_NAME = "imx-boot" |
@@ -85,7 +86,7 @@ compile_mx8m() { | |||
85 | cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME} ${BOOT_STAGING} | 86 | cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME} ${BOOT_STAGING} |
86 | cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} \ | 87 | cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} \ |
87 | ${BOOT_STAGING}/u-boot-nodtb.bin | 88 | ${BOOT_STAGING}/u-boot-nodtb.bin |
88 | cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/mkimage_uboot ${BOOT_STAGING} | 89 | cp ${STAGING_DIR_NATIVE}/${bindir}/mkimage ${BOOT_STAGING}/mkimage_uboot |
89 | cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin | 90 | cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin |
90 | cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME} ${BOOT_STAGING}/u-boot.bin | 91 | cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME} ${BOOT_STAGING}/u-boot.bin |
91 | } | 92 | } |
diff --git a/recipes-bsp/u-boot/u-boot-imx-common.inc b/recipes-bsp/u-boot/u-boot-imx-common.inc new file mode 100644 index 00000000..2d5105ee --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-imx-common.inc | |||
@@ -0,0 +1,20 @@ | |||
1 | DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards." | ||
2 | |||
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
5 | |||
6 | SRCBRANCH = "imx_v2019.04_4.19.35_1.1.0" | ||
7 | SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" | ||
8 | SRCREV = "4d377539a1190e838eae5d8b8a794dde0696d572" | ||
9 | |||
10 | DEPENDS += "flex-native bison-native bc-native dtc-native" | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | B = "${WORKDIR}/build" | ||
14 | |||
15 | inherit fsl-u-boot-localversion | ||
16 | |||
17 | LOCALVERSION ?= "-${SRCBRANCH}" | ||
18 | |||
19 | BOOT_TOOLS = "imx-boot-tools" | ||
20 | |||
diff --git a/recipes-bsp/u-boot/u-boot-imx-tools_2019.04.bb b/recipes-bsp/u-boot/u-boot-imx-tools_2019.04.bb new file mode 100644 index 00000000..56d0a7f0 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-imx-tools_2019.04.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require recipes-bsp/u-boot/u-boot-tools.inc | ||
2 | require u-boot-imx-common.inc | ||
3 | |||
4 | PROVIDES_append_class-target = " ${MLPREFIX}u-boot-tools" | ||
5 | PROVIDES_append_class-native = " u-boot-tools-native" | ||
6 | PROVIDES_append_class-nativesdk = " nativesdk-u-boot-tools" | ||
7 | |||
8 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
9 | COMPATIBLE_MACHINE_class-target = "(mx6|mx7|mx8)" | ||
diff --git a/recipes-bsp/u-boot/u-boot-imx_2019.04.bb b/recipes-bsp/u-boot/u-boot-imx_2019.04.bb index 9b12482d..4cfcb471 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2019.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2019.04.bb | |||
@@ -2,28 +2,11 @@ | |||
2 | # Copyright 2018 (C) O.S. Systems Software LTDA. | 2 | # Copyright 2018 (C) O.S. Systems Software LTDA. |
3 | # Copyright 2017-2019 NXP | 3 | # Copyright 2017-2019 NXP |
4 | 4 | ||
5 | DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards." | ||
6 | require recipes-bsp/u-boot/u-boot.inc | 5 | require recipes-bsp/u-boot/u-boot.inc |
6 | require u-boot-imx-common.inc | ||
7 | 7 | ||
8 | PROVIDES += "u-boot" | 8 | PROVIDES += "u-boot" |
9 | 9 | ||
10 | LICENSE = "GPLv2+" | ||
11 | LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
12 | |||
13 | SRCBRANCH = "imx_v2019.04_4.19.35_1.1.0" | ||
14 | SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" | ||
15 | SRCREV = "4d377539a1190e838eae5d8b8a794dde0696d572" | ||
16 | |||
17 | DEPENDS += "flex-native bison-native bc-native dtc-native" | ||
18 | |||
19 | S = "${WORKDIR}/git" | ||
20 | |||
21 | inherit fsl-u-boot-localversion | ||
22 | |||
23 | LOCALVERSION ?= "-${SRCBRANCH}" | ||
24 | |||
25 | BOOT_TOOLS = "imx-boot-tools" | ||
26 | |||
27 | do_deploy_append_mx8m() { | 10 | do_deploy_append_mx8m() { |
28 | # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary | 11 | # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary |
29 | if [ -n "${UBOOT_CONFIG}" ] | 12 | if [ -n "${UBOOT_CONFIG}" ] |