diff options
-rw-r--r-- | conf/machine/include/imx-base.inc | 4 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb | 8 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-fslc_2023.01.bb | 2 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb | 13 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-imx_2022.04.bb | 2 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-mfgtool.inc | 21 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb | 15 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-mfgtool_6.1.bb | 15 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-imx-mfgtool_6.1.bb | 15 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-imx.inc | 3 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-mfgtool.inc | 7 |
11 files changed, 6 insertions, 99 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 7ff2741d..0959dfe3 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -75,10 +75,8 @@ UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}" | |||
75 | # wic based images. | 75 | # wic based images. |
76 | SPL_BINARY ??= "${@get_spl_binary(d)}" | 76 | SPL_BINARY ??= "${@get_spl_binary(d)}" |
77 | 77 | ||
78 | IMX_DEFAULT_MFGTOOL = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-mfgtool', 'u-boot-fslc', d)}" | ||
79 | |||
80 | PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" | 78 | PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" |
81 | PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_MFGTOOL}" | 79 | PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_BOOTLOADER}" |
82 | PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" | 80 | PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" |
83 | 81 | ||
84 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" | 82 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" |
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb deleted file mode 100644 index 2e79166b..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | # Copyright (C) 2014 O.S. Systems Software LTDA. | ||
2 | # Copyright (C) 2014-2016 Freescale Semiconductor | ||
3 | # Copyright 2017-2019 NXP | ||
4 | |||
5 | FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-fslc:" | ||
6 | |||
7 | require u-boot-fslc_${PV}.bb | ||
8 | require u-boot-mfgtool.inc | ||
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb index f6164a76..eba8876a 100644 --- a/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb +++ b/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb | |||
@@ -10,7 +10,7 @@ inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'im | |||
10 | 10 | ||
11 | DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native" | 11 | DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native" |
12 | 12 | ||
13 | PROVIDES += "u-boot" | 13 | PROVIDES += "u-boot u-boot-mfgtool" |
14 | 14 | ||
15 | B = "${WORKDIR}/build" | 15 | B = "${WORKDIR}/build" |
16 | 16 | ||
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb deleted file mode 100644 index d9d5b9d5..00000000 --- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | # Copyright (C) 2014 O.S. Systems Software LTDA. | ||
2 | # Copyright (C) 2014-2016 Freescale Semiconductor | ||
3 | # Copyright 2017-2019 NXP | ||
4 | |||
5 | # Re-use the u-boot-imx recipe and its files | ||
6 | require u-boot-imx_${PV}.bb | ||
7 | FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-imx:" | ||
8 | |||
9 | require u-boot-mfgtool.inc | ||
10 | |||
11 | UUU_BOOTLOADER_TAGGED = "" | ||
12 | UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}" | ||
13 | UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}" | ||
diff --git a/recipes-bsp/u-boot/u-boot-imx_2022.04.bb b/recipes-bsp/u-boot/u-boot-imx_2022.04.bb index c8119fdb..e76c29c6 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2022.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2022.04.bb | |||
@@ -5,7 +5,7 @@ | |||
5 | require recipes-bsp/u-boot/u-boot.inc | 5 | require recipes-bsp/u-boot/u-boot.inc |
6 | require u-boot-imx-common_${PV}.inc | 6 | require u-boot-imx-common_${PV}.inc |
7 | 7 | ||
8 | PROVIDES += "u-boot" | 8 | PROVIDES += "u-boot u-boot-mfgtool" |
9 | 9 | ||
10 | inherit uuu_bootloader_tag | 10 | inherit uuu_bootloader_tag |
11 | 11 | ||
diff --git a/recipes-bsp/u-boot/u-boot-mfgtool.inc b/recipes-bsp/u-boot/u-boot-mfgtool.inc deleted file mode 100644 index 92d055bf..00000000 --- a/recipes-bsp/u-boot/u-boot-mfgtool.inc +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | # Produces a Manufacturing Tool compatible U-Boot | ||
2 | # | ||
3 | # This makes a separated binary set for Manufacturing Tool use | ||
4 | # without clobbering the U-Boot used for normal use. | ||
5 | # | ||
6 | # This file must to be included after the original u-boot.inc file, | ||
7 | # as it overrides the need values. | ||
8 | # | ||
9 | # Copyright (C) 2014 O.S. Systems Software LTDA. | ||
10 | |||
11 | # Adjust provides | ||
12 | PROVIDES = "u-boot-mfgtool" | ||
13 | |||
14 | # Use 'mfgtool' config | ||
15 | UBOOT_CONFIG = "mfgtool" | ||
16 | |||
17 | # Add 'mfgtool' suffix | ||
18 | UBOOT_IMAGE = "u-boot-${MACHINE}-mfgtool-${PV}-${PR}.${UBOOT_SUFFIX}" | ||
19 | UBOOT_SYMLINK = "u-boot-${MACHINE}-mfgtool.${UBOOT_SUFFIX}" | ||
20 | SPL_IMAGE = "${SPL_BINARYNAME}-${MACHINE}-mfgtool-${PV}-${PR}" | ||
21 | SPL_SYMLINK = "${SPL_BINARYNAME}-mfgtool-${MACHINE}" | ||
diff --git a/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb b/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb deleted file mode 100644 index 95dd72fb..00000000 --- a/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | # Copyright (C) 2014-2018 O.S. Systems Software LTDA. | ||
2 | # Copyright (C) 2014-2016 Freescale Semiconductor | ||
3 | |||
4 | SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" | ||
5 | DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \ | ||
6 | that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \ | ||
7 | environment" | ||
8 | |||
9 | FILESEXTRAPATHS:prepend := "${THISDIR}/linux-fslc:" | ||
10 | require linux-fslc-lts_${PV}.bb | ||
11 | require linux-mfgtool.inc | ||
12 | |||
13 | KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" | ||
14 | MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" | ||
15 | do_package[vardepsexclude] = "DATETIME" | ||
diff --git a/recipes-kernel/linux/linux-fslc-mfgtool_6.1.bb b/recipes-kernel/linux/linux-fslc-mfgtool_6.1.bb deleted file mode 100644 index 09d35c91..00000000 --- a/recipes-kernel/linux/linux-fslc-mfgtool_6.1.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | # Copyright (C) 2014-2018 O.S. Systems Software LTDA. | ||
2 | # Copyright (C) 2014-2016 Freescale Semiconductor | ||
3 | |||
4 | SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" | ||
5 | DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \ | ||
6 | that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \ | ||
7 | environment" | ||
8 | |||
9 | FILESEXTRAPATHS:prepend := "${THISDIR}/linux-fslc:" | ||
10 | require linux-fslc_${PV}.bb | ||
11 | require linux-mfgtool.inc | ||
12 | |||
13 | KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" | ||
14 | MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" | ||
15 | do_package[vardepsexclude] = "DATETIME" | ||
diff --git a/recipes-kernel/linux/linux-imx-mfgtool_6.1.bb b/recipes-kernel/linux/linux-imx-mfgtool_6.1.bb deleted file mode 100644 index 26298fd9..00000000 --- a/recipes-kernel/linux/linux-imx-mfgtool_6.1.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | # Copyright (C) 2014-2018 O.S. Systems Software LTDA. | ||
2 | # Copyright (C) 2014-2016 Freescale Semiconductor | ||
3 | # Copyright (C) 2017-2023 NXP | ||
4 | |||
5 | SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" | ||
6 | DESCRIPTION = "Linux Kernel provided and supported by NXP that produces a \ | ||
7 | Manufacturing Tool compatible Linux Kernel to be used in updater environment" | ||
8 | |||
9 | FILESEXTRAPATHS:prepend := "${THISDIR}/linux-imx:" | ||
10 | require linux-imx_${PV}.bb | ||
11 | require linux-mfgtool.inc | ||
12 | |||
13 | KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" | ||
14 | MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" | ||
15 | do_package[vardepsexclude] = "DATETIME" | ||
diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc index b386e058..1a37bf20 100644 --- a/recipes-kernel/linux/linux-imx.inc +++ b/recipes-kernel/linux/linux-imx.inc | |||
@@ -11,6 +11,9 @@ LOCALVERSION ?= "" | |||
11 | SCMVERSION ?= "y" | 11 | SCMVERSION ?= "y" |
12 | SRCBRANCH ?= "" | 12 | SRCBRANCH ?= "" |
13 | 13 | ||
14 | # Allow use of kernel as linux-mfgtool provider. | ||
15 | PROVIDES += "linux-mfgtool" | ||
16 | |||
14 | # Set the PV to the correct kernel version to satisfy the kernel version sanity check | 17 | # Set the PV to the correct kernel version to satisfy the kernel version sanity check |
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 18 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 19 | ||
diff --git a/recipes-kernel/linux/linux-mfgtool.inc b/recipes-kernel/linux/linux-mfgtool.inc deleted file mode 100644 index 93a27d8c..00000000 --- a/recipes-kernel/linux/linux-mfgtool.inc +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | # Produces a Manufacturing Tool compatible Linux Kernel | ||
2 | # | ||
3 | # Copyright (C) 2014, 2015, 2018 O.S. Systems Software LTDA. | ||
4 | |||
5 | PROVIDES = "linux-mfgtool" | ||
6 | |||
7 | KERNEL_PACKAGE_NAME = "linux-mfgtool" | ||