diff options
284 files changed, 5656 insertions, 5806 deletions
@@ -1,4 +1,4 @@ -LA_OPT_NXP_Software_License v11 February 2020 +LA_OPT_NXP_Software_License v15 August 2020 IMPORTANT. Read the following NXP Software License Agreement ("Agreement") completely. By selecting the "I Accept" button at the end of this page, or by @@ -72,13 +72,13 @@ and to which different license terms may apply. 2. LICENSE GRANT. -2.1. If you are not expressly granted the production use license in +2.1. If you are not expressly granted the distribution license in Section 2.3 in the Software Content Register, then you are only granted the rights in Section 2.2 and not in 2.3. If you are expressly granted the -production use license in Section 2.3 in the Software Content Register, then -you are granted the rights in both Section 2.2 and 2.3. +distribution license in Section 2.3 in the Software Content Register, then you +are granted the rights in both Section 2.2 and 2.3. -2.2. Internal Use License. Subject to the terms and conditions of this +2.2. Standard License. Subject to the terms and conditions of this Agreement, NXP grants you a worldwide, personal, non-transferable, non-exclusive, non-sublicensable license, solely for the development of an Authorized System: @@ -92,11 +92,11 @@ readable), to prepare Derivative Works of the Licensed Software. You may not distribute or sublicense the Licensed Software to others under the license granted in this Section 2.2. -2.3. Production Use License. If expressly authorized in the Software -Content Register, subject to the terms and conditions of this Agreement, NXP -grants you a worldwide, personal, non-transferable, non-exclusive, -non-sublicensable license solely in connection with your manufacturing and -distribution of an Authorized System: +2.3. Additional Distribution License. If expressly authorized in the +Software Content Register, subject to the terms and conditions of this +Agreement, NXP grants you a worldwide, personal, non-transferable, +non-exclusive, non-sublicensable license solely in connection with your +manufacturing and distribution of an Authorized System: (a) to manufacture (or have manufactured), distribute, and market the Licensed Software (and its Derivative Works prepared under the license in @@ -168,11 +168,11 @@ combined and/or distributed with the software be (i) disclosed or distributed in source code form; (ii) licensed for the purpose of making Derivative Works; or (iii) redistributable at no charge. -3.8. You may not publish or distribute information, results or data -associated with the use of the Licensed Software to anyone other than NXP; -however, you must advise NXP of any results obtained including any problems or -suggested improvements thereof. NXP retains the right to use such results and -related information in any manner it deems appropriate +3.8. You may not publish or distribute reports associated with the use +of the Licensed Software to anyone other than NXP. You may advise NXP of any +results obtained from your use of the Licensed Software, including any problems +or suggested improvements thereof, and NXP retains the right to use such +results and related information in any manner it deems appropriate. 4. OPEN SOURCE. Open source software included in the Licensed Software is not licensed under the terms of this Agreement but is instead @@ -268,17 +268,19 @@ SOFTWARE PROVIDED UNDER THIS AGREEMENT TO WHICH LOSSES OR DAMAGES ARE CLAIMED. 12. EXPORT COMPLIANCE. Each party shall comply with all applicable export and import control laws and regulations including but not limited to the -US Export Administration Regulation (including prohibited party lists issued by -other federal governments), Catch-all regulations and all national and -international embargoes. Each party further agrees that it will not knowingly -transfer, divert, export or re-export, directly or indirectly, any product, -software, including software source code, or technology restricted by such -regulations or by other applicable national regulations, received from the -other party under this Agreement, or any direct product of such software or -technical data to any person, firm, entity, country or destination to which -such transfer, diversion, export or re-export is restricted or prohibited, -without obtaining prior written authorization from the applicable competent -government authorities to the extent required by those laws. +US Export Administration Regulation (including restrictions on certain military +end uses and military end users as specified in Section 15 C.F.R. § 744.21 and +prohibited party lists issued by other federal governments), Catch-all +regulations and all national and international embargoes. Each party further +agrees that it will not knowingly transfer, divert, export or re-export, +directly or indirectly, any product, software, including software source code, +or technology restricted by such regulations or by other applicable national +regulations, received from the other party under this Agreement, or any direct +product of such software or technical data to any person, firm, entity, country +or destination to which such transfer, diversion, export or re-export is +restricted or prohibited, without obtaining prior written authorization from +the applicable competent government authorities to the extent required by those +laws. 13. GOVERNMENT CONTRACT COMPLIANCE @@ -380,10 +382,10 @@ examination or audit. Agreement will be made in writing, and will be effective when received at the following addresses: - NXP: NXP B.V. - High Tech Campus 60 - 5656 AG Eindhoven - The Netherlands + NXP: NXP B.V. + High Tech Campus 60 + 5656 AG Eindhoven + The Netherlands ATTN: Legal Department @@ -560,29 +562,6 @@ commercial use and distribution of products containing the GStreamer Optimized Real Format Client Code implementation or OpenMax Optimized Real Format Client Code -Real Time Engineers Ltd.: Any FreeRTOS source code, whether modified or in its -original release form, or whether in whole or in part, can only be distributed -by you under the terms of version 2 of the GNU General Public License plus this -exception. An independent module is a module which is not derived from or -based on FreeRTOS. - -Clause 1: Linking FreeRTOS with other modules is making a combined work based -on FreeRTOS. Thus, the terms and conditions of the GNU General Public License -V2 cover the whole combination. - -As a special exception, the copyright holders of FreeRTOS give you permission -to link FreeRTOS with independent modules to produce a statically linked -executable, regardless of the license terms of these independent modules, and -to copy and distribute the resulting executable under terms of your choice, -provided that you also meet, for each linked independent module, the terms and -conditions of the license of that module. An independent module is a module -which is not derived from or based on FreeRTOS. - -Clause 2: FreeRTOS may not be used for any competitive or comparative purpose, -including the publication of any form of run time or compile time metric, -without the express permission of Real Time Engineers Ltd. (this is the norm -within the industry and is intended to ensure information accuracy). - RivieraWaves SAS (a member of the CEVA, Inc. family of companies): You may not use the RivieraWaves intellectual property licensed under this Agreement if you develop, market, and/or license products similar to such RivieraWaves diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass index 6bbb6c74..ec793b88 100644 --- a/classes/fsl-eula-unpack.bbclass +++ b/classes/fsl-eula-unpack.bbclass @@ -27,7 +27,10 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V8 = "72c0f70181bb6e83eee6aab8 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V9 = "6c12031a11b81db21cdfe0be88cac4b3" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V10 = "fd4b227530cd88a82af6a5982cfb724d" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V11 = "228c72f2a91452b8a03c4cab30f30ef9" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V13 = "1b4db4b25c3a1e422c0c0ed64feb65d2" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V15 = "983e4c77621568488dd902b27e0c2143" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V16 = "e9e880185bda059c90c541d40ceca922" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V17 = "cf3f9b8d09bc3926b1004ea71f7a248a" FSL_EULA_FILE_MD5SUMS = " \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10} \ @@ -50,12 +53,15 @@ FSL_EULA_FILE_MD5SUMS = " \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V9} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V10} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V11} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V13} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V15} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V16} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V17} \ " # The checksum for the EULA in the layer FSL_EULA_FILE_MD5SUM ?= \ - "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V11}" + "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V15}" LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}" LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE" diff --git a/classes/fsl-kernel-localversion.bbclass b/classes/fsl-kernel-localversion.bbclass index ff1075e5..c73b60a6 100644 --- a/classes/fsl-kernel-localversion.bbclass +++ b/classes/fsl-kernel-localversion.bbclass @@ -22,7 +22,8 @@ kernel_conf_variable() { fi } -do_preconfigure() { +do_kernel_localversion[dirs] += "${S} ${B}" +do_kernel_localversion() { mkdir -p ${B} echo "" > ${B}/.config CONF_SED_SCRIPT="" @@ -40,4 +41,5 @@ do_preconfigure() { printf "%s%s" +g $head > ${S}/.scmversion fi } -addtask preconfigure before do_configure after do_unpack do_patch + +addtask kernel_localversion before do_configure after do_patch do_kernel_configme diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass new file mode 100644 index 00000000..003f997a --- /dev/null +++ b/classes/imx-boot-container.bbclass @@ -0,0 +1,107 @@ +# +# This class provides a support to build the boot container for +# i.MX8M derivatives +# +# imx8m machines require a separate build target to be executed +# due to the fact that final boot image is constructed using flash.bin +# taget. It produces a boot binary image, which is constructed from +# various binary components (u-boot with separate dtb, atf, DDR +# firmware and optional op-tee) into a single image using FIT format. +# This flash.bin file is then parsed and loaded either via +# SPL directly (imx8mm), or using bootrom code (imx8mn and imx8mp). +# +# In order to use flash.bin binary boot image, it is required that +# the U-Boot build is to be invoked for an additional build target. +# This class extendes the U-Boot build targets with the "flash.bin", +# which effectively serves as a boot container. It replaces the boot +# container `imx-boot` provided by NXP. +# +# Class inheritance is performed in u-boot-fslc recipe, and is controlled +# by variable UBOOT_PROVIDES_BOOT_CONTAINER, which is defined in the +# base machine include file (imx-base.inc), and is set to "1" when the +# 'imx-boot-container' is present in MACHINEOVERRIDES. + +# Extend the UBOOT_MAKE_TARGET with additional target for U-Boot build +# system to produce the boot container +UBOOT_MAKE_TARGET += "flash.bin" + +# Define ATF binary file to be deployed to the U-Boot build folder +ATF_MACHINE_NAME = "bl31-${ATF_PLATFORM}.bin" +ATF_MACHINE_NAME_append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}" + +# This package aggregates output deployed by other packages, so set the +# appropriate dependencies for populate binaries task +do_resolve_and_populate_binaries[depends] += " \ + ${@' '.join('%s:do_deploy' % r for r in '${IMX_EXTRA_FIRMWARE}'.split() )} \ + imx-atf:do_deploy \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-os:do_deploy', '', d)} \ +" + +# Append make flags to include ATF load address +EXTRA_OEMAKE += "ATF_LOAD_ADDR=${ATF_LOAD_ADDR}" + +# Define an additional task that collects binary output from dependent packages +# and deploys them into the U-Boot build folder +do_resolve_and_populate_binaries() { + if [ ! -n "${ATF_LOAD_ADDR}" ]; then + bberror "ATF_LOAD_ADDR is undefined, result binary would be unusable!" + fi + + if [ -n "${UBOOT_CONFIG}" ]; then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ]; then + for ddr_firmware in ${DDR_FIRMWARE_NAME}; do + # Sanitize the FW name as U-Boot expects it to be without version + if [ -n "${DDR_FIRMWARE_VERSION}" ]; then + ddr_firmware_name=$(echo $ddr_firmware | sed s/_${DDR_FIRMWARE_VERSION}//) + else + ddr_firmware_name="$ddr_firmware" + fi + bbnote "Copy ddr_firmware: ${ddr_firmware} from ${DEPLOY_DIR_IMAGE} -> ${B}/${config}/${ddr_firmware_name}" + cp ${DEPLOY_DIR_IMAGE}/${ddr_firmware} ${B}/${config}/${ddr_firmware_name} + done + if [ -n "${ATF_MACHINE_NAME}" ]; then + cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${B}/${config}/bl31.bin + else + bberror "ATF binary is undefined, result binary would be unusable!" + fi + fi + done + unset j + done + unset i + fi +} +addtask do_resolve_and_populate_binaries before do_compile after do_configure + +# Append the u-boot do_deploy task to deploy also the result flash.bin +# boot container as a replacement for the one provided by NXP BSP. +# +# Deploy task renames the target file from flash.bin to imx-boot to match +# the name WKS file requires. +# +# This effectively would allow the usage of the same WKS file for those +# derivatives that are using the boot container from U-Boot and those +# that are not yet have support for it enabled. +do_deploy_append() { + # Deploy the resulted flash.bin for WIC to pick it up + if [ -n "${UBOOT_CONFIG}" ]; then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 0644 ${B}/${config}/flash.bin ${DEPLOYDIR}/flash.bin-${MACHINE}-${UBOOT_CONFIG} + ln -sf flash.bin-${MACHINE}-${UBOOT_CONFIG} imx-boot + ln -sf flash.bin-${MACHINE}-${UBOOT_CONFIG} flash.bin + fi + done + unset j + done + unset i + fi +} diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass index 7b82bcaf..55a2cc47 100644 --- a/classes/use-imx-security-controller-firmware.bbclass +++ b/classes/use-imx-security-controller-firmware.bbclass @@ -19,10 +19,11 @@ SECO_FIRMWARE_NAME ?= "" SECO_FIRMWARE_NAME_mx8qm = "mx8qmb0-ahab-container.img" -SECO_FIRMWARE_NAME_mx8qxp = "mx8qxb0-ahab-container.img" -SECO_FIRMWARE_NAME_mx8qxpc0 = "mx8qxc0-ahab-container.img" -SECO_FIRMWARE_NAME_mx8phantomdxl = "mx8qxb0-ahab-container.img" -SECO_FIRMWARE_NAME_mx8dxl = "mx8dxla0-ahab-container.img" +SECO_FIRMWARE_NAME_mx8qxp = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \ + 'mx8qxc0-ahab-container.img', d)}" +SECO_FIRMWARE_NAME_mx8phantomdxl = "mx8qxc0-ahab-container.img" +SECO_FIRMWARE_NAME_mx8dxl = "mx8dxla1-ahab-container.img" python () { if "mx8m" in d.getVar('MACHINEOVERRIDES').split(":"): diff --git a/conf/layer.conf b/conf/layer.conf index c8e146f8..df898924 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "freescale-layer" BBFILE_PATTERN_freescale-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_freescale-layer = "5" -LAYERSERIES_COMPAT_freescale-layer = "dunfell gatesgarth" +LAYERSERIES_COMPAT_freescale-layer = "gatesgarth hardknott" # Add the Freescale-specific licenses into the metadata LICENSE_PATH += "${LAYERDIR}/custom-licenses" @@ -28,8 +28,8 @@ BBFILES_DYNAMIC += " \ aglprofilegraphical:${LAYERDIR}/dynamic-layers/aglprofilegraphical/*/*/*.bb \ aglprofilegraphical:${LAYERDIR}/dynamic-layers/aglprofilegraphical/*/*/*.bbappend \ \ - browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*/*.bb \ - browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*/*.bbappend \ + chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bb \ + chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bbappend \ \ filesystem-layer:${LAYERDIR}/dynamic-layers/filesystem-layer/*/*/*.bb \ filesystem-layer:${LAYERDIR}/dynamic-layers/filesystem-layer/*/*/*.bbappend \ @@ -37,9 +37,6 @@ BBFILES_DYNAMIC += " \ ivi:${LAYERDIR}/dynamic-layers/ivi/*/*/*.bb \ ivi:${LAYERDIR}/dynamic-layers/ivi/*/*/*.bbappend \ \ - networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ - networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \ - \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ \ diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf index 009aff79..8abc5a95 100644 --- a/conf/machine/imx23evk.conf +++ b/conf/machine/imx23evk.conf @@ -9,6 +9,13 @@ MACHINEOVERRIDES =. "mxs:mx23:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-arm926ejs.inc +# This machine is not supported by u-boot-imx as it is not tested by NXP on this +# board. So we force it to use u-boot-fslc which is based on mainline here. +IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" + +UBOOT_MAKE_TARGET = "u-boot.sb" +UBOOT_SUFFIX = "sb" + UBOOT_MACHINE = "mx23evk_config" KERNEL_DEVICETREE = "imx23-evk.dtb" diff --git a/conf/machine/imx25pdk.conf b/conf/machine/imx25pdk.conf index 9e8ad003..5721e845 100644 --- a/conf/machine/imx25pdk.conf +++ b/conf/machine/imx25pdk.conf @@ -9,6 +9,13 @@ MACHINEOVERRIDES =. "mx25:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-arm926ejs.inc +# This machine is not supported by u-boot-imx as it is not tested by NXP on this +# board. So we force it to use u-boot-fslc which is based on mainline here. +IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" + +UBOOT_MAKE_TARGET = "u-boot.imx" +UBOOT_SUFFIX = "imx" + UBOOT_MACHINE ?= "mx25pdk_defconfig" KERNEL_DEVICETREE = "imx25-pdk.dtb" diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf index 7c359e54..4f69dae4 100644 --- a/conf/machine/imx28evk.conf +++ b/conf/machine/imx28evk.conf @@ -9,7 +9,12 @@ MACHINEOVERRIDES =. "mxs:mx28:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-arm926ejs.inc -IMXBOOTLETS_MACHINE = "iMX28_EVK" +# This machine is not supported by u-boot-imx as it is not tested by NXP on this +# board. So we force it to use u-boot-fslc which is based on mainline here. +IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" + +UBOOT_MAKE_TARGET = "u-boot.sb" +UBOOT_SUFFIX = "sb" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx28evk_config,sdcard" diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf index a32b4e00..80d7b386 100644 --- a/conf/machine/imx51evk.conf +++ b/conf/machine/imx51evk.conf @@ -9,9 +9,13 @@ MACHINEOVERRIDES =. "mx5:mx51:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa8.inc -# Disable perf features as 2.6.35.3 fails to build otherwise -PERF_FEATURES_ENABLE = "" - KERNEL_DEVICETREE = "imx51-babbage.dtb" +# This machine is not supported by u-boot-imx as it is not tested by NXP on this +# board. So we force it to use u-boot-fslc which is based on mainline here. +IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" + +UBOOT_MAKE_TARGET = "u-boot.imx" +UBOOT_SUFFIX = "imx" + UBOOT_MACHINE = "mx51evk_config" diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf index c6d7f0d9..af5aeb3b 100644 --- a/conf/machine/imx53ard.conf +++ b/conf/machine/imx53ard.conf @@ -13,9 +13,16 @@ include conf/machine/include/tune-cortexa8.inc PERF_FEATURES_ENABLE = "" KERNEL_DEVICETREE = "imx53-ard.dtb" +KERNEL_IMAGETYPE = "uImage" + +# This machine is not supported by u-boot-imx as it is not tested by NXP on this +# board. So we force it to use u-boot-fslc which is based on mainline here. +IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" + +UBOOT_MAKE_TARGET = "u-boot.imx" +UBOOT_SUFFIX = "imx" UBOOT_MACHINE = "mx53ard_config" -KERNEL_IMAGETYPE = "uImage" MACHINE_FIRMWARE += "linux-firmware-ar3k \ linux-firmware-ath6k" diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf index 24cbfac6..06d4a756 100644 --- a/conf/machine/imx53qsb.conf +++ b/conf/machine/imx53qsb.conf @@ -11,6 +11,13 @@ include conf/machine/include/tune-cortexa8.inc KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb" +# This machine is not supported by u-boot-imx as it is not tested by NXP on this +# board. So we force it to use u-boot-fslc which is based on mainline here. +IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" + +UBOOT_MAKE_TARGET = "u-boot.imx" +UBOOT_SUFFIX = "imx" + UBOOT_MACHINE = "mx53loco_config" MACHINE_FIRMWARE = "linux-firmware-ar3k \ diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 16c1dcb6..b7aec8c2 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -32,13 +32,25 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \ imx6dl-sabreauto.dtb \ " -UBOOT_MACHINE ?= "mx6sabreauto_defconfig" +### u-boot-fslc settings ### -# 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" +SPL_BINARY_pn-u-boot-fslc = "SPL" +UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabreauto_defconfig" +UBOOT_SUFFIX_pn-u-boot-fslc = "img" + +### u-boot-imx settings ### + +# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC +# variants. Change the defconfig to the targeted SoC variant. +SPL_BINARY_pn-u-boot-imx = "" +UBOOT_MACHINE_pn-u-boot-imx = "mx6qsabreauto_defconfig" +UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx" +UBOOT_SUFFIX_pn-u-boot-imx = "imx" + +WKS_FILE = " \ + ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ + 'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \ + 'imx-uboot-bootpart.wks.in', d)}" SERIAL_CONSOLES = "115200;ttymxc3" diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index 2fe95dc6..b3d09e93 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -41,13 +41,25 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \ imx6dl-sabresd.dtb \ " -UBOOT_MACHINE ?= "mx6sabresd_defconfig" +### u-boot-fslc settings ### -# 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" +SPL_BINARY_pn-u-boot-fslc = "SPL" +UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabresd_defconfig" +UBOOT_SUFFIX_pn-u-boot-fslc = "img" + +### u-boot-imx settings ### + +# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC +# variants. Change the defconfig to the targeted SoC variant. +SPL_BINARY_pn-u-boot-imx = "" +UBOOT_MACHINE_pn-u-boot-imx ?= "mx6qsabresd_defconfig" +UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx" +UBOOT_SUFFIX_pn-u-boot-imx = "imx" + +WKS_FILE = " \ + ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ + 'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \ + 'imx-uboot-bootpart.wks.in', d)}" SERIAL_CONSOLES = "115200;ttymxc0" diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf index 5d81272f..1e8c403b 100644 --- a/conf/machine/imx6slevk.conf +++ b/conf/machine/imx6slevk.conf @@ -9,18 +9,31 @@ MACHINEOVERRIDES =. "mx6:mx6sl:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc -KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \ - imx6sl-evk-uart.dtb imx6sl-evk-btwifi.dtb" -KERNEL_DEVICETREE_use-mainline-bsp = "imx6sl-evk.dtb" +KERNEL_DEVICETREE = "imx6sl-evk.dtb" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + imx6sl-evk-btwifi.dtb \ + imx6sl-evk-csi.dtb \ + imx6sl-evk-ldo.dtb \ + imx6sl-evk-uart.dtb \ +" -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard" -UBOOT_CONFIG[epdc] = "mx6slevk_epdc_config" -UBOOT_CONFIG[spinor] = "mx6slevk_spinor_config" -UBOOT_CONFIG[mfgtool] = "mx6slevk_config" +UBOOT_MAKE_TARGET = "u-boot.imx" +UBOOT_SUFFIX = "imx" + +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx6slevk_optee_config,sdcard" +UBOOT_CONFIG[epdc] = "mx6slevk_epdc_config" +UBOOT_CONFIG[spinor] = "mx6slevk_spinor_config" +UBOOT_CONFIG[mfgtool] = "mx6slevk_config" + +OPTEE_BIN_EXT = "6slevk" SERIAL_CONSOLES = "115200;ttymxc0" -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" MACHINE_FIRMWARE += "linux-firmware-ath6k firmware-imx-epdc" diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index 7981a457..30b537f1 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf @@ -11,14 +11,23 @@ include conf/machine/include/tune-cortexa9.inc KERNEL_DEVICETREE = "imx6sll-evk.dtb" -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx6sllevk_config,sdcard" -UBOOT_CONFIG[epdc] = "mx6sllevk_epdc_config" -UBOOT_CONFIG[mfgtool] = "mx6sllevk_config" +UBOOT_MAKE_TARGET = "u-boot.imx" +UBOOT_SUFFIX = "imx" + +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx6sllevk_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx6sllevk_optee_config,sdcard" +UBOOT_CONFIG[epdc] = "mx6sllevk_epdc_config" +UBOOT_CONFIG[mfgtool] = "mx6sllevk_config" + +OPTEE_BIN_EXT_imx6sllevk = "6sllevk" SERIAL_CONSOLES = "115200;ttymxc0" -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" # MESA DRI library XSERVER += "mesa-driver-swrast" diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf index 43cabea2..f7031ccb 100644 --- a/conf/machine/imx6sxsabreauto.conf +++ b/conf/machine/imx6sxsabreauto.conf @@ -12,14 +12,20 @@ require conf/machine/include/tune-cortexa9.inc KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb" KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sabreauto.dtb" -PREFERRED_PROVIDER_u-boot = "u-boot-fslc" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-fslc" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx6sxsabreauto_config,sdcard" -UBOOT_CONFIG[qspi1] = "mx6sxsabreauto_qspi1_config" -UBOOT_CONFIG[nand] = "mx6sxsabreauto_nand_config,ubifs" -UBOOT_CONFIG[mfgtool] = "mx6sxsabreauto_config" +UBOOT_MAKE_TARGET = "u-boot.imx" +UBOOT_SUFFIX = "imx" + +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx6sxsabreauto_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx6sxsabreauto_optee_config,sdcard" +UBOOT_CONFIG[qspi1] = "mx6sxsabreauto_qspi1_config" +UBOOT_CONFIG[nand] = "mx6sxsabreauto_nand_config,ubifs" +UBOOT_CONFIG[mfgtool] = "mx6sxsabreauto_config" + +OPTEE_BIN_EXT = "6sxauto" SERIAL_CONSOLES = "115200;ttymxc3" diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf index 5793a0b0..ff7d6ae6 100644 --- a/conf/machine/imx6sxsabresd.conf +++ b/conf/machine/imx6sxsabresd.conf @@ -9,21 +9,40 @@ MACHINEOVERRIDES =. "mx6:mx6sx:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa9.inc -KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \ - imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \ - imx6sx-sdb-reva-ldo.dtb imx6sx-sdb-reva.dtb \ - imx6sx-sdb-btwifi.dtb imx6sx-sdb-mqs.dtb" -KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sdb.dtb imx6sx-sdb-sai.dtb imx6sx-sdb-reva.dtb" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx6sxsabresd_config,sdcard" -UBOOT_CONFIG[emmc] = "mx6sxsabresd_emmc_config,sdcard" -UBOOT_CONFIG[qspi2] = "mx6sxsabresd_qspi2_config" +KERNEL_DEVICETREE = " \ + imx6sx-sdb.dtb \ + imx6sx-sdb-reva.dtb \ + imx6sx-sdb-sai.dtb \ +" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + imx6sx-sdb-btwifi.dtb \ + imx6sx-sdb-emmc.dtb \ + imx6sx-sdb-lcdif1.dtb \ + imx6sx-sdb-ldo.dtb \ + imx6sx-sdb-m4.dtb \ + imx6sx-sdb-mqs.dtb \ + imx6sx-sdb-pcie-ep.dtb \ + imx6sx-sdb-reva-ldo.dtb \ +" + +UBOOT_MAKE_TARGET = "u-boot.imx" +UBOOT_SUFFIX = "imx" + +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx6sxsabresd_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx6sxsabresd_optee_config,sdcard" +UBOOT_CONFIG[emmc] = "mx6sxsabresd_emmc_config,sdcard" +UBOOT_CONFIG[qspi2] = "mx6sxsabresd_qspi2_config" UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config" -UBOOT_CONFIG[mfgtool] = "mx6sxsabresd_config" +UBOOT_CONFIG[mfgtool] = "mx6sxsabresd_config" + +OPTEE_BIN_EXT = "6sxsdb" SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 18b6b04b..f7c5d8ae 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6:mx6ul:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa7.inc -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" KERNEL_DEVICETREE = " \ imx6ul-14x14-evk-btwifi.dtb \ @@ -23,14 +23,31 @@ 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" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard" -UBOOT_CONFIG[emmc] = "mx6ul_14x14_evk_emmc_config,sdcard" -UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config" -UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config" +### u-boot-fslc settings ### + +SPL_BINARY_pn-u-boot-fslc = "SPL" +UBOOT_SUFFIX_pn-u-boot-fslc = "img" + +### u-boot-imx settings ### + +# The u-boot-imx does not provide SPL support +SPL_BINARY_pn-u-boot-imx = "" +UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx" +UBOOT_SUFFIX_pn-u-boot-imx = "imx" + +WKS_FILE = " \ + ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ + 'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \ + 'imx-uboot-bootpart.wks.in', d)}" + +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx6ul_14x14_evk_optee_config,sdcard" +UBOOT_CONFIG[emmc] = "mx6ul_14x14_evk_emmc_config,sdcard" +UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config" +UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config" + +OPTEE_BIN_EXT = "6ulevk" diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf index bcaeede7..bd592a20 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf @@ -9,6 +9,8 @@ MACHINEOVERRIDES =. "mx6:mx6ull:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa7.inc +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" + KERNEL_DEVICETREE = " \ imx6ull-14x14-evk.dtb \ " @@ -20,10 +22,18 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \ imx6ull-14x14-evk-gpmi-weim.dtb \ " -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx6ull_14x14_evk_config,sdcard" -UBOOT_CONFIG[mfgtool] = "mx6ull_14x14_evk_config" +UBOOT_MAKE_TARGET = "u-boot.imx" +UBOOT_SUFFIX = "imx" -SERIAL_CONSOLES = "115200;ttymxc0" +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx6ull_14x14_evk_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx6ull_14x14_evk_optee_config,sdcard" +UBOOT_CONFIG[emmc] = "mx6ull_14x14_evk_emmc_config,sdcard" +UBOOT_CONFIG[nand] = "mx6ull_14x14_evk_nand_config,ubifs" +UBOOT_CONFIG[qspi1] = "mx6ull_14x14_evk_qspi1_config" +UBOOT_CONFIG[mfgtool] = "mx6ull_14x14_evk_config" -MACHINE_FEATURES += "wifi bluetooth" +OPTEE_BIN_EXT = "6ullevk" diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf new file mode 100644 index 00000000..7b794e7c --- /dev/null +++ b/conf/machine/imx6ulz-14x14-evk.conf @@ -0,0 +1,36 @@ +#@TYPE: Machine +#@NAME: NXP i.MX6ULZ 14x14 Evaluation Kit +#@SOC: i.MX6ULZ +#@DESCRIPTION: Machine configuration for NXP i.MX6ULZ 14x14 EVK +#@MAINTAINER: Jun Zhu <junzhu@nxp.com> + +MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:mx6ulz:" + +include conf/machine/include/imx-base.inc +include conf/machine/include/tune-cortexa7.inc + +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" + +KERNEL_DEVICETREE = " \ + imx6ulz-14x14-evk.dtb \ +" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + imx6ulz-14x14-evk-btwifi.dtb \ + imx6ulz-14x14-evk-emmc.dtb \ + imx6ulz-14x14-evk-gpmi-weim.dtb \ +" + +UBOOT_MAKE_TARGET = "u-boot.imx" +UBOOT_SUFFIX = "imx" + +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx6ulz_14x14_evk_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx6ulz_14x14_evk_optee_config,sdcard" +UBOOT_CONFIG[emmc] = "mx6ulz_14x14_evk_emmc_config,sdcard" +UBOOT_CONFIG[nand] = "mx6ulz_14x14_evk_nand_config,ubifs" +UBOOT_CONFIG[qspi1] = "mx6ulz_14x14_evk_qspi1_config" + +OPTEE_BIN_EXT = "6ulzevk" diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf index 84de3862..e848f294 100644 --- a/conf/machine/imx7dsabresd.conf +++ b/conf/machine/imx7dsabresd.conf @@ -9,25 +9,36 @@ MACHINEOVERRIDES =. "mx7:mx7d:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa7.inc -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" -KERNEL_DEVICETREE = " \ - imx7d-sdb.dtb \ +KERNEL_DEVICETREE = "imx7d-sdb.dtb" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ imx7d-sdb-epdc.dtb \ imx7d-sdb-gpmi-weim.dtb \ imx7d-sdb-m4.dtb \ imx7d-sdb-mipi-dsi.dtb \ + imx7d-sdb-pcie-ep.dtb \ imx7d-sdb-qspi.dtb \ imx7d-sdb-reva.dtb \ imx7d-sdb-sht11.dtb \ + imx7d-sdb-usd-wifi.dtb \ " -KERNEL_DEVICETREE_use-mainline-bsp = "imx7d-sdb.dtb" +UBOOT_MAKE_TARGET = "u-boot.imx" +UBOOT_SUFFIX = "imx" -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx7dsabresd_config,sdcard" -UBOOT_CONFIG[qspi1] = "mx7dsabresd_qspi1_config" -UBOOT_CONFIG[nand] = "mx7dsabresd_nand_config,ubifs" -UBOOT_CONFIG[epdc] = "mx7dsabresd_epdc_config" -UBOOT_CONFIG[mfgtool] = "mx7dsabresd_config" +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx7dsabresd_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx7dsabresd_optee_config,sdcard" +UBOOT_CONFIG[nonsec] = "mx7dsabresd_nonsec_config,sdcard" +UBOOT_CONFIG[qspi1] = "mx7dsabresd_qspi1_config" +UBOOT_CONFIG[nand] = "mx7dsabresd_nand_config,ubifs" +UBOOT_CONFIG[epdc] = "mx7dsabresd_epdc_config" +UBOOT_CONFIG[mfgtool] = "mx7dsabresd_config" + +OPTEE_BIN_EXT = "7dsdb" +XSERVER += "mesa-driver-swrast" diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf index d9d2a559..a587f44b 100644 --- a/conf/machine/imx7ulpevk.conf +++ b/conf/machine/imx7ulpevk.conf @@ -9,9 +9,17 @@ MACHINEOVERRIDES =. "mx7:mx7ulp:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa7.inc -MACHINE_FEATURES += " pci wifi bluetooth qca9377" +MACHINE_FEATURES += "pci wifi bluetooth bcm43430" KERNEL_DEVICETREE = " \ + imx7ulp-evk.dtb \ +" +KERNEL_DEVICETREE_append_use-mainline-bsp = " \ + imx7ulp-com.dtb \ +" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + imx7ulp-evk-ft5416.dtb \ + imx7ulp-evk-mipi.dtb \ imx7ulp-evkb.dtb \ imx7ulp-evkb-emmc.dtb \ imx7ulp-evkb-lpuart.dtb \ @@ -21,15 +29,21 @@ KERNEL_DEVICETREE = " \ imx7ulp-evkb-sd1.dtb \ imx7ulp-evkb-sensors-to-i2c5.dtb \ imx7ulp-evkb-spi-slave.dtb \ - imx7ulp-evk.dtb \ - imx7ulp-evk-ft5416.dtb \ - imx7ulp-evk-mipi.dtb \ " -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "mx7ulp_evk_config,sdcard" -UBOOT_CONFIG[emmc] = "mx7ulp_evk_emmc_config,sdcard" -UBOOT_CONFIG[mfgtool] = "mx7ulp_evk_config" +UBOOT_MAKE_TARGET = "u-boot.imx" +UBOOT_SUFFIX = "imx" + +UBOOT_CONFIG ??= " \ + sd \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ +" +UBOOT_CONFIG[sd] = "mx7ulp_evk_config,sdcard" +UBOOT_CONFIG[sd-optee] = "mx7ulp_evk_optee_config,sdcard" +UBOOT_CONFIG[emmc] = "mx7ulp_evk_emmc_config,sdcard" +UBOOT_CONFIG[mfgtool] = "mx7ulp_evk_config" + +OPTEE_BIN_EXT = "7ulp" # Set Serial console SERIAL_CONSOLES = "115200;ttyLP0" diff --git a/conf/machine/imx8dx-mek.conf b/conf/machine/imx8dx-mek.conf new file mode 100644 index 00000000..842ba1fa --- /dev/null +++ b/conf/machine/imx8dx-mek.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: i.MX 8DXP MEK +#@DESCRIPTION: i.MX 8DualXPlus Multisensory Enablement Kit board +#@MAINTAINER: Lauren Post <lauren.post@nxp.com> + +MACHINEOVERRIDES =. "mx8qxp:mx8dx:" + +require include/imx8x-mek.inc + +KERNEL_DEVICETREE_BASENAME = "${MACHINE}" + +UBOOT_CONFIG_BASENAME = "imx8dx_mek" diff --git a/conf/machine/imx8dxl-evk.conf b/conf/machine/imx8dxl-evk.conf new file mode 100644 index 00000000..5d177aa3 --- /dev/null +++ b/conf/machine/imx8dxl-evk.conf @@ -0,0 +1,64 @@ +#@TYPE: Machine +#@NAME: i.MX 8DXL EVK +#@DESCRIPTION: i.MX 8DXLite Evaluation Kit (EVK) board +#@MAINTAINER: Lauren Post <lauren.post@nxp.com> + +MACHINEOVERRIDES =. "mx8:mx8x:mx8dxl:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa35.inc + +MACHINE_FEATURES += "pci bcm43455 bcm4356" +MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" + +# Don't include kernels in standard images +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" + +LOADADDR = "" + +# Disable the serial console due to auto-serial-console +SERIAL_CONSOLES = "115200;ttyLP0" + +# we do not want to have getty running on tty1 as we run +# auto-serial-console there +USE_VT = "0" + +KERNEL_DEVICETREE = "freescale/imx8dxl-evk.dtb" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/imx8dxl-evk-enet0.dtb \ + freescale/imx8dxl-evk-enet0-tja1100.dtb \ + freescale/imx8dxl-evk-inmate.dtb \ + freescale/imx8dxl-evk-lpspi-slave.dtb \ + freescale/imx8dxl-evk-pcie-ep.dtb \ + freescale/imx8dxl-evk-root.dtb \ + freescale/imx8dxl-evk-rpmsg.dtb \ +" + +ATF_PLATFORM = "imx8dxl" +IMX_BOOT_SOC_TARGET = "iMX8DXL" + +# This machine is not supported by u-boot-fslc, so we force it to use +# u-boot-imx here. +IMX_DEFAULT_BOOTLOADER = "u-boot-imx" + +UBOOT_MAKE_TARGET = "all" +SPL_BINARY = "spl/u-boot-spl.bin" +UBOOT_SUFFIX = "bin" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "imx8dxl_evk_defconfig,sdcard" +UBOOT_CONFIG[fspi] = "imx8dxl_evk_fspi_defconfig" + +IMX_BOOT_SEEK = "32" + +IMXBOOT_TARGETS_SD = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \ + 'flash', d)}" +IMXBOOT_TARGETS_FSPI = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl_flexspi', \ + 'flash_flexspi', d)}" +IMXBOOT_TARGETS = \ + "${@bb.utils.contains('UBOOT_CONFIG', 'sd', '${IMXBOOT_TARGETS_SD}', \ + '${IMXBOOT_TARGETS_FSPI}', d)}" + +BOARD_TYPE = "evk" diff --git a/conf/machine/imx8mm-ddr4-evk.conf b/conf/machine/imx8mm-ddr4-evk.conf new file mode 100644 index 00000000..3901bb92 --- /dev/null +++ b/conf/machine/imx8mm-ddr4-evk.conf @@ -0,0 +1,25 @@ +#@TYPE: Machine +#@NAME: NXP i.MX 8M Mini EVK with DDR4 +#@SOC: i.MX8MM +#@DESCRIPTION: Machine configuration for NXP i.MX 8M Mini Evaluation Kit with DDR4 +#@MAINTAINER: Jun Zhu <junzhu@nxp.com> + +require include/imx8mm-evk.inc + +KERNEL_DEVICETREE_BASENAME = "${MACHINE}" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb.dtb \ +" + +UBOOT_CONFIG_BASENAME = "imx8mm_ddr4_evk" +UBOOT_CONFIG[nand] = "${UBOOT_CONFIG_BASENAME}_nand_defconfig,ubifs" + +DDR_FIRMWARE_NAME = " \ + ddr4_imem_1d.bin \ + ddr4_dmem_1d.bin \ + ddr4_imem_2d.bin \ + ddr4_dmem_2d.bin \ +" + +IMXBOOT_TARGETS_BASENAME = "flash_ddr4_evk" diff --git a/conf/machine/imx8mm-lpddr4-evk.conf b/conf/machine/imx8mm-lpddr4-evk.conf new file mode 100644 index 00000000..6007c540 --- /dev/null +++ b/conf/machine/imx8mm-lpddr4-evk.conf @@ -0,0 +1,36 @@ +#@TYPE: Machine +#@NAME: NXP i.MX 8M Mini EVK with LPDDR4 +#@SOC: i.MX8MM +#@DESCRIPTION: Machine configuration for NXP i.MX 8M Mini Evaluation Kit with LPDDR4 +#@MAINTAINER: Jun Zhu <junzhu@nxp.com> + +require include/imx8mm-evk.inc + +# The device tree name is implicit for LPDDR4, so can't use MACHINE here +KERNEL_DEVICETREE_BASENAME = "imx8mm-evk" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ak4497.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-audio-tdm.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-qca-wifi.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-revb-qca-wifi.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \ +" + + +UBOOT_CONFIG_BASENAME = "imx8mm_evk" +UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" + +DDR_FIRMWARE_NAME = " \ + lpddr4_pmu_train_1d_imem.bin \ + lpddr4_pmu_train_1d_dmem.bin \ + lpddr4_pmu_train_2d_imem.bin \ + lpddr4_pmu_train_2d_dmem.bin \ +" + +IMXBOOT_TARGETS_BASENAME = "flash_evk" diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf deleted file mode 100644 index db722c72..00000000 --- a/conf/machine/imx8mmevk.conf +++ /dev/null @@ -1,58 +0,0 @@ -#@TYPE: Machine -#@NAME: NXP i.MX8MM LPDDR4 Evaluation Kit and i.MX8MM DDR4 Evaluation Kit -#@SOC: i.MX8MM -#@DESCRIPTION: Machine configuration for NXP i.MX8MMini LPDDR4 EVK and i.MX8MMini DDR4 EVK -#@MAINTAINER: Jun Zhu <junzhu@nxp.com> - -MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:" - -require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa53.inc - -IMX_DEFAULT_BSP = "nxp" - -MACHINE_FEATURES += " pci wifi bluetooth optee qca9377" - -KERNEL_DEVICETREE = " \ - freescale/imx8mm-ddr4-evk.dtb \ - freescale/imx8mm-ddr4-evk-revb.dtb \ - freescale/imx8mm-ddr4-evk-revb-rm67191.dtb \ - freescale/imx8mm-ddr4-evk-rm67191.dtb \ - freescale/imx8mm-evk-ak4497.dtb \ - freescale/imx8mm-evk-ak5558.dtb \ - freescale/imx8mm-evk-audio-tdm.dtb \ - freescale/imx8mm-evk.dtb \ - freescale/imx8mm-evk-inmate.dtb \ - freescale/imx8mm-evk-revb.dtb \ - freescale/imx8mm-evk-rm67191.dtb \ - freescale/imx8mm-evk-root.dtb \ - freescale/imx8mm-evk-rpmsg.dtb \ -" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8mm_evk_config,sdcard" -UBOOT_CONFIG[fspi] = "imx8mm_evk_fspi_defconfig" -UBOOT_CONFIG[mfgtool] = "imx8mm_evk_config" -SPL_BINARY = "spl/u-boot-spl.bin" - -# Set DDR FIRMWARE -DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin" - -# Set u-boot DTB -UBOOT_DTB_NAME = "imx8mm-evk.dtb" - -# Set imx-mkimage boot target -IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" - -# Set Serial console -SERIAL_CONSOLES = "115200;ttymxc1" - -LOADADDR = "" -UBOOT_SUFFIX = "bin" -UBOOT_MAKE_TARGET = "" -IMX_BOOT_SEEK = "33" - -OPTEE_BIN_EXT = "8mm" - -# Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/conf/machine/imx8mn-ddr4-evk.conf b/conf/machine/imx8mn-ddr4-evk.conf new file mode 100644 index 00000000..442afdbd --- /dev/null +++ b/conf/machine/imx8mn-ddr4-evk.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@NAME: NXP i.MX 8M Nano Evaluation Kit with DDR4 +#@SOC: i.MX8MM +#@DESCRIPTION: Machine configuration for NXP i.MX 8M Nano EVK with DDR4 +#@MAINTAINER: Andrey Zhizhikin <andrey.z@gmail.com> + +require include/imx8mn-evk.inc + +KERNEL_DEVICETREE_BASENAME = "${MACHINE}" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \ +" +UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk" + +DDR_FIRMWARE_VERSION = "201810" +DDR_FIRMWARE_NAME = " \ + ddr4_imem_1d_${DDR_FIRMWARE_VERSION}.bin \ + ddr4_dmem_1d_${DDR_FIRMWARE_VERSION}.bin \ + ddr4_imem_2d_${DDR_FIRMWARE_VERSION}.bin \ + ddr4_dmem_2d_${DDR_FIRMWARE_VERSION}.bin \ +" +IMXBOOT_TARGETS_BASENAME = "flash_ddr4_evk" diff --git a/conf/machine/imx8mn-lpddr4-evk.conf b/conf/machine/imx8mn-lpddr4-evk.conf new file mode 100644 index 00000000..7c58bc19 --- /dev/null +++ b/conf/machine/imx8mn-lpddr4-evk.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@NAME: NXP i.MX 8M Nano Evaluation Kit with LPDDR4 +#@SOC: i.MX8MN +#@DESCRIPTION: Machine configuration for NXP i.MX 8M Nano EVK with LPDDR4 +#@MAINTAINER: Jun Zhu <junzhu@nxp.com> + +require include/imx8mn-evk.inc + +# The device tree name is implicit for LPDDR4, so can't use MACHINE here +KERNEL_DEVICETREE_BASENAME = "imx8mn-evk" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ +" +UBOOT_CONFIG_BASENAME = "imx8mn_evk" +DDR_FIRMWARE_NAME = " \ + lpddr4_pmu_train_1d_imem.bin \ + lpddr4_pmu_train_1d_dmem.bin \ + lpddr4_pmu_train_2d_imem.bin \ + lpddr4_pmu_train_2d_dmem.bin \ +" +IMXBOOT_TARGETS_BASENAME = "flash_evk" diff --git a/conf/machine/imx8mnevk.conf b/conf/machine/imx8mnevk.conf deleted file mode 100644 index 80d77ac8..00000000 --- a/conf/machine/imx8mnevk.conf +++ /dev/null @@ -1,60 +0,0 @@ -#@TYPE: Machine -#@NAME: NXP i.MX8M Nano DDR4 Evaluation Kit -#@SOC: i.MX8MM -#@DESCRIPTION: Machine configuration for NXP i.MX8M Nano DDR4 EVK -#@MAINTAINER: Andrey Zhizhikin <andrey.z@gmail.com> - -MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:" - -require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa53.inc - -IMX_DEFAULT_BSP = "nxp" - -MACHINE_FEATURES += "wifi bluetooth optee bcm43455" - -KERNEL_DEVICETREE = " \ - freescale/imx8mn-ddr4-evk-ak5558.dtb \ - freescale/imx8mn-ddr4-evk.dtb \ - freescale/imx8mn-ddr4-evk-inmate.dtb \ - freescale/imx8mn-ddr4-evk-rm67191.dtb \ - freescale/imx8mn-ddr4-evk-root.dtb \ - freescale/imx8mn-ddr4-evk-rpmsg.dtb \ - freescale/imx8mn-evk.dtb \ - freescale/imx8mn-evk-rm67191.dtb \ -" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8mn_ddr4_evk_defconfig,sdcard" -UBOOT_CONFIG[mfgtool] = "imx8mn_ddr4_evk_defconfig" -SPL_BINARY = "spl/u-boot-spl.bin" - -# Set DDR FIRMWARE -DDR_FIRMWARE_NAME = "ddr4_imem_1d_201810.bin \ - ddr4_dmem_1d_201810.bin \ - ddr4_imem_2d_201810.bin \ - ddr4_dmem_2d_201810.bin" - -# Set u-boot DTB -UBOOT_DTB_NAME = "imx8mn-ddr4-evk.dtb" - -# Set imx-mkimage boot target -IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_ddr4_evk_flexspi', 'flash_ddr4_evk', d)}" - -# Set Serial console -SERIAL_CONSOLES = "115200;ttymxc1" - -BOOT_SPACE = "65536" -LOADADDR = "" -UBOOT_SUFFIX = "bin" -UBOOT_MAKE_TARGET = "" - -# Image boot offset as defined in section 6.1.6.1 "Primary image offset and IVT offset" of -# i.MX 8M Nano Applications Processor Reference Manual, Rev. 0, 12/2019 -# Doc ID: IMX8MNRM -IMX_BOOT_SEEK = "32" - -OPTEE_BIN_EXT = "8mn" - -# Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/conf/machine/imx8mp-ddr4-evk.conf b/conf/machine/imx8mp-ddr4-evk.conf new file mode 100644 index 00000000..09517769 --- /dev/null +++ b/conf/machine/imx8mp-ddr4-evk.conf @@ -0,0 +1,27 @@ +#@TYPE: Machine +#@NAME: NXP i.MX 8M Plus EVK with DDR4 +#@SOC: i.MX8MP +#@DESCRIPTION: Machine configuration for NXP i.MX 8M Plus Evaluation Kit with DDR4 +#@MAINTAINER: Jun Zhu <junzhu@nxp.com> + +require include/imx8mp-evk.inc + +# FIXME: This machine is not yet supported by u-boot-fslc, so for now +# use u-boot-imx for mainline. +IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-imx" + +KERNEL_DEVICETREE_BASENAME = "${MACHINE}" + +UBOOT_CONFIG_BASENAME = "imx8mp_ddr4_evk" +UBOOT_CONFIG[nand] = "${UBOOT_CONFIG_BASENAME}_nand_defconfig" + +# Set DDR FIRMWARE +DDR_FIRMWARE_VERSION = "202006" +DDR_FIRMWARE_NAME = " \ + ddr4_dmem_1d_${DDR_FIRMWARE_VERSION}.bin \ + ddr4_imem_1d_${DDR_FIRMWARE_VERSION}.bin \ + ddr4_dmem_2d_${DDR_FIRMWARE_VERSION}.bin \ + ddr4_imem_2d_${DDR_FIRMWARE_VERSION}.bin \ +" + +IMXBOOT_TARGETS_BASENAME = "flash_ddr4_evk" diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf new file mode 100644 index 00000000..6484da7c --- /dev/null +++ b/conf/machine/imx8mp-lpddr4-evk.conf @@ -0,0 +1,47 @@ +#@TYPE: Machine +#@NAME: NXP i.MX 8M Plus EVK with LPDDR4 +#@SOC: i.MX8MP +#@DESCRIPTION: Machine configuration for NXP i.MX 8M Plus Evaluation Kit with LPDDR4 +#@MAINTAINER: Jun Zhu <junzhu@nxp.com> + +require include/imx8mp-evk.inc + +# The device tree name is implicit for LPDDR4, so can't use MACHINE here +KERNEL_DEVICETREE_BASENAME = "imx8mp-evk" + +# NXP kernel has additional DTB files for various board configuration and +# derivates. Include them here for NXP BSP only +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/imx8mp-ab2.dtb \ + freescale/imx8mp-evk-basler.dtb \ + freescale/imx8mp-evk-basler-ov5640.dtb \ + freescale/imx8mp-evk-dsp.dtb \ + freescale/imx8mp-evk-dsp-lpa.dtb \ + freescale/imx8mp-evk-dual-ov2775.dtb \ + freescale/imx8mp-evk-flexcan2.dtb \ + freescale/imx8mp-evk-inmate.dtb \ + freescale/imx8mp-evk-it6263-lvds-dual-channel.dtb \ + freescale/imx8mp-evk-jdi-wuxga-lvds-panel.dtb \ + freescale/imx8mp-evk-ov2775.dtb \ + freescale/imx8mp-evk-ov2775-ov5640.dtb \ + freescale/imx8mp-evk-pcie-ep.dtb \ + freescale/imx8mp-evk-rm67191.dtb \ + freescale/imx8mp-evk-root.dtb \ + freescale/imx8mp-evk-rpmsg.dtb \ + freescale/imx8mp-evk-sof-wm8960.dtb \ + freescale/imx8mp-evk-spdif-lb.dtb \ +" + +UBOOT_CONFIG_BASENAME = "imx8mp_evk" +UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig" + +# Set DDR FIRMWARE +DDR_FIRMWARE_VERSION = "202006" +DDR_FIRMWARE_NAME = " \ + lpddr4_pmu_train_1d_dmem_${DDR_FIRMWARE_VERSION}.bin \ + lpddr4_pmu_train_1d_imem_${DDR_FIRMWARE_VERSION}.bin \ + lpddr4_pmu_train_2d_dmem_${DDR_FIRMWARE_VERSION}.bin \ + lpddr4_pmu_train_2d_imem_${DDR_FIRMWARE_VERSION}.bin \ +" + +IMXBOOT_TARGETS_BASENAME = "flash_evk" diff --git a/conf/machine/imx8mpevk.conf b/conf/machine/imx8mpevk.conf deleted file mode 100644 index d1376649..00000000 --- a/conf/machine/imx8mpevk.conf +++ /dev/null @@ -1,66 +0,0 @@ -#@TYPE: Machine -#@NAME: NXP i.MX8MP Evaluation Kit and i.MX8MP Evaluation Kit -#@SOC: i.MX8MP -#@DESCRIPTION: Machine configuration for NXP i.MX8MP EVK -#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com> - -MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:" - -require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa53.inc - -IMX_DEFAULT_BSP = "nxp" - -MACHINE_FEATURES += " pci wifi bluetooth optee mrvl8997" - -KERNEL_DEVICETREE = " \ - freescale/imx8mp-ab2.dtb \ - freescale/imx8mp-evk-basler.dtb \ - freescale/imx8mp-evk.dtb \ - freescale/imx8mp-evk-dsp.dtb \ - freescale/imx8mp-evk-flexcan2.dtb \ - freescale/imx8mp-evk-inmate.dtb \ - freescale/imx8mp-evk-jdi-wuxga-lvds-panel.dtb \ - freescale/imx8mp-evk-it6263-lvds-dual-channel.dtb \ - freescale/imx8mp-evk-ov2775.dtb \ - freescale/imx8mp-evk-rm67191.dtb \ - freescale/imx8mp-evk-root.dtb \ - freescale/imx8mp-evk-rpmsg.dtb \ - freescale/imx8mp-evk-sof-wm8960.dtb \ -" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8mp_evk_defconfig,sdcard" -UBOOT_CONFIG[fspi] = "imx8mp_evk_defconfig" -UBOOT_CONFIG[ecc] = "imx8mp_evk_inline_ecc_defconfig" -UBOOT_CONFIG[mfgtool] = "imx8mp_evk_defconfig" -SPL_BINARY = "spl/u-boot-spl.bin" - -# Set DDR FIRMWARE -DDR_FIRMWARE_NAME = " \ - lpddr4_pmu_train_1d_dmem_201904.bin \ - lpddr4_pmu_train_1d_imem_201904.bin \ - lpddr4_pmu_train_2d_dmem_201904.bin \ - lpddr4_pmu_train_2d_imem_201904.bin \ -" - -# Set u-boot DTB -UBOOT_DTB_NAME = "imx8mp-evk.dtb" - -# Set imx-mkimage boot target -IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" - -# Set Serial console -SERIAL_CONSOLES = "115200;ttymxc1" - -IMAGE_BOOTLOADER = "imx-boot" - -LOADADDR = "" -UBOOT_SUFFIX = "bin" -UBOOT_MAKE_TARGET = "" -IMX_BOOT_SEEK = "32" - -OPTEE_BIN_EXT = "8mp" - -# Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mq-evk.conf index 2c9c8c29..9907ef4b 100644 --- a/conf/machine/imx8mqevk.conf +++ b/conf/machine/imx8mq-evk.conf @@ -1,8 +1,8 @@ #@TYPE: Machine -#@NAME: NXP i.MX8MQ Evaluation Kit +#@NAME: NXP i.MX 8M Quad EVK #@SOC: i.MX8MQ -#@DESCRIPTION: Machine configuration for NXP i.MX8MQ EVK -#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com> +#@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit +#@MAINTAINER: Jun Zhu <junzhu@nxp.com> MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" @@ -11,43 +11,63 @@ require conf/machine/include/tune-cortexa53.inc IMX_DEFAULT_BSP = "nxp" -MACHINE_FEATURES += "pci wifi bluetooth optee qca6174" +MACHINE_FEATURES += "pci wifi bluetooth optee bcm43455 bcm4356" +MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" MACHINE_SOCARCH_FILTER_append_mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" KERNEL_DEVICETREE = " \ + freescale/imx8mq-evk.dtb \ +" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ freescale/imx8mq-evk-ak4497.dtb \ freescale/imx8mq-evk-audio-tdm.dtb \ freescale/imx8mq-evk-dcss-adv7535.dtb \ freescale/imx8mq-evk-dcss-rm67191.dtb \ + freescale/imx8mq-evk-dcss-rm67199.dtb \ freescale/imx8mq-evk-dp.dtb \ - freescale/imx8mq-evk.dtb \ freescale/imx8mq-evk-dual-display.dtb \ freescale/imx8mq-evk-inmate.dtb \ freescale/imx8mq-evk-lcdif-adv7535.dtb \ freescale/imx8mq-evk-lcdif-rm67191.dtb \ + freescale/imx8mq-evk-lcdif-rm67199.dtb \ + freescale/imx8mq-evk-pcie-ep.dtb \ freescale/imx8mq-evk-pcie1-m2.dtb \ freescale/imx8mq-evk-pdm.dtb \ freescale/imx8mq-evk-root.dtb \ freescale/imx8mq-evk-rpmsg.dtb \ + freescale/imx8mq-evk-usd-wifi.dtb \ + freescale/imx8mq-evk-usdhc2-m2.dtb \ " +IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" + +UBOOT_SUFFIX = "bin" + UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8mq_evk_config,sdcard" -UBOOT_CONFIG[mfgtool] = "imx8mq_evk_config" +UBOOT_CONFIG[sd] = "imx8mq_evk_config,sdcard" +UBOOT_CONFIG[mfgtool] = "imx8mq_evk_config" + SPL_BINARY = "spl/u-boot-spl.bin" # Set DDR FIRMWARE -DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin" +DDR_FIRMWARE_NAME = " \ + lpddr4_pmu_train_1d_imem.bin \ + lpddr4_pmu_train_1d_dmem.bin \ + lpddr4_pmu_train_2d_imem.bin \ + lpddr4_pmu_train_2d_dmem.bin \ +" # Set u-boot DTB UBOOT_DTB_NAME = "imx8mq-evk.dtb" +# Set ATF platform name +ATF_PLATFORM = "imx8mq" + # Set imx-mkimage boot target IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk" - -# Set Serial console -SERIAL_CONSOLES = "115200;ttymxc0" +IMX_BOOT_SOC_TARGET = "iMX8M" LOADADDR = "" UBOOT_SUFFIX = "bin" diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf new file mode 100644 index 00000000..5ceb6b8b --- /dev/null +++ b/conf/machine/imx8qm-mek.conf @@ -0,0 +1,89 @@ +#@TYPE: Machine +#@NAME: i.MX 8QM MEK +#@DESCRIPTION: i.MX 8QuadMax Multisensory Enablement Kit board, rev B0 +#@MAINTAINER: Lauren Post <lauren.post@nxp.com> + +MACHINEOVERRIDES =. "mx8:mx8qm:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa72-cortexa53.inc + +IMX_DEFAULT_BSP = "nxp" + +MACHINE_FEATURES += "pci optee bcm43455 bcm4356" +MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" + +# Don't include kernels in standard images +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" + +LOADADDR = "" + +# We have to disable SERIAL_CONSOLE due to auto-serial-console +SERIAL_CONSOLES = "115200;ttyAMA0" + +# we do not want to have getty running on tty1 as we run +# auto-serial-console there +USE_VT = "0" + +KERNEL_DEVICETREE = " \ + freescale/imx8qm-mek.dtb \ + freescale/imx8qm-mek-ca53.dtb \ + freescale/imx8qm-mek-ca72.dtb \ + freescale/imx8qm-mek-dom0.dtb \ + freescale/imx8qm-mek-domu.dtb \ + freescale/imx8qm-mek-dsi-rm67191.dtb \ + freescale/imx8qm-mek-dsp.dtb \ + freescale/imx8qm-mek-enet2-tja1100.dtb \ + freescale/imx8qm-mek-esai.dtb \ + freescale/imx8qm-mek-hdmi.dtb \ + freescale/imx8qm-mek-inmate.dtb \ + freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ + freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \ + freescale/imx8qm-mek-ov5640.dtb \ + freescale/imx8qm-mek-pcie-ep.dtb \ + freescale/imx8qm-mek-root.dtb \ + freescale/imx8qm-mek-rpmsg.dtb \ + freescale/imx8qm-mek-sof-cs42888.dtb \ + freescale/imx8qm-mek-sof-wm8960.dtb \ + freescale/imx8qm-mek-usd-wifi.dtb \ + freescale/imx8qm-mek-usdhc3-m2.dtb \ +" + +UBOOT_MAKE_TARGET = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '', \ + 'u-boot.bin', d)}" +SPL_BINARY = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'spl/u-boot-spl.bin', \ + '', d)}" +IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" + +UBOOT_SUFFIX = "bin" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "imx8qm_mek_defconfig,sdcard" +UBOOT_CONFIG[fspi] = "imx8qm_mek_fspi_defconfig" +UBOOT_CONFIG[mfgtool] = "imx8qm_mek_defconfig" + +IMX_BOOT_SEEK = "32" + +IMAGE_BOOT_FILES += "hdmitxfw.bin hdmirxfw.bin dpfw.bin" + +# Set ATF platform name +ATF_PLATFORM = "imx8qm" + +IMXBOOT_TARGETS_SD = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \ + 'flash flash_ca72', d)}" +IMXBOOT_TARGETS_FSPI = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl_flexspi', \ + 'flash_flexspi', d)}" +IMXBOOT_TARGETS = \ + "${@bb.utils.contains('UBOOT_CONFIG', 'sd', '${IMXBOOT_TARGETS_SD}', \ + '${IMXBOOT_TARGETS_FSPI}', d)}" +IMX_BOOT_SOC_TARGET = "iMX8QM" + +BOARD_TYPE = "mek" + +# Add additional firmware +MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf deleted file mode 100644 index 4e459a5e..00000000 --- a/conf/machine/imx8qmmek.conf +++ /dev/null @@ -1,63 +0,0 @@ -#@TYPE: Machine -#@NAME: i.MX 8QM MEK -#@DESCRIPTION: i.MX 8QuadMax MEK board -#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com> - -MACHINEOVERRIDES =. "mx8:mx8qm:" - -require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa72-cortexa53.inc - -IMX_DEFAULT_BSP = "nxp" - -MACHINE_FEATURES_append = " qca6174" - -# Don't include kernels in standard images -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" - -LOADADDR = "" - -# We have to disable SERIAL_CONSOLE due to auto-serial-console -SERIAL_CONSOLES = "115200;ttyAMA0" - -# we do not want to have getty running on tty1 as we run -# auto-serial-console there -USE_VT = "0" - -KERNEL_DEVICETREE = " \ - freescale/imx8qm-mek-ca53.dtb \ - freescale/imx8qm-mek-ca72.dtb \ - freescale/imx8qm-mek-dom0.dtb \ - freescale/imx8qm-mek-domu.dtb \ - freescale/imx8qm-mek-dsi-rm67191.dtb \ - freescale/imx8qm-mek-dsp.dtb \ - freescale/imx8qm-mek.dtb \ - freescale/imx8qm-mek-enet2-tja1100.dtb \ - freescale/imx8qm-mek-hdmi.dtb \ - freescale/imx8qm-mek-inmate.dtb \ - freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ - freescale/imx8qm-mek-ov5640.dtb \ - freescale/imx8qm-mek-root.dtb \ - freescale/imx8qm-mek-rpmsg.dtb \ -" - -UBOOT_MAKE_TARGET = "u-boot.bin" -UBOOT_SUFFIX = "bin" -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8qm_mek_defconfig,sdcard" -UBOOT_CONFIG[fspi] = "imx8qm_mek_fspi_defconfig" -UBOOT_CONFIG[mfgtool] = "imx8qm_mek_defconfig" - -IMX_BOOT_SEEK = "33" - -WKS_FILE_DEPENDS_append = " firmware-imx-8" -IMAGE_BOOT_FILES += "hdmitxfw.bin hdmirxfw.bin dpfw.bin" - -IMXBOOT_TARGETS = \ - "${@bb.utils.contains('UBOOT_CONFIG', 'sd', 'flash', \ - 'flash_flexspi', d)}" - -BOARD_TYPE = "mek" - -# Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf new file mode 100644 index 00000000..fe0f6727 --- /dev/null +++ b/conf/machine/imx8qxp-mek.conf @@ -0,0 +1,26 @@ +#@TYPE: Machine +#@NAME: i.MX 8QXP MEK +#@DESCRIPTION: i.MX 8QuadXPlus Multisensory Enablement Kit board +#@MAINTAINER: Lauren Post <lauren.post@nxp.com> + +MACHINEOVERRIDES =. "mx8qxp:" + +require include/imx8x-mek.inc + +KERNEL_DEVICETREE_BASENAME = "${MACHINE}" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-a0.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dom0.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-enet2.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \ +" + +UBOOT_CONFIG_BASENAME = "imx8qxp_mek" diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf deleted file mode 100644 index 9b96c711..00000000 --- a/conf/machine/imx8qxpmek.conf +++ /dev/null @@ -1,63 +0,0 @@ -#@TYPE: Machine -#@NAME: i.MX 8QXP MEK -#@DESCRIPTION: i.MX 8QXP Multisensory Enablement Kit (MEK) board -#@MAINTAINER: Cristinel Panfir <cristinel.panfir@nxp.com> - -MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:" - -require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa35.inc - -IMX_DEFAULT_BSP = "nxp" - -MACHINE_FEATURES_append = " qca6174" - -# Don't include kernels in standard images -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" - -LOADADDR = "" - -# We have to disable SERIAL_CONSOLE due to auto-serial-console -SERIAL_CONSOLES = "115200;ttyAMA0" - -# we do not want to have getty running on tty1 as we run -# auto-serial-console there -USE_VT = "0" - -KERNEL_DEVICETREE = " \ - freescale/imx8qxp-mek-a0.dtb \ - freescale/imx8qxp-mek-dom0.dtb \ - freescale/imx8qxp-mek-dsi-rm67191.dtb \ - freescale/imx8qxp-mek-dsp.dtb \ - freescale/imx8qxp-mek.dtb \ - freescale/imx8qxp-mek-enet2.dtb \ - freescale/imx8qxp-mek-enet2-tja1100.dtb \ - freescale/imx8qxp-mek-inmate.dtb \ - freescale/imx8qxp-mek-it6263-lvds0-dual-channel.dtb \ - freescale/imx8qxp-mek-it6263-lvds1-dual-channel.dtb \ - freescale/imx8qxp-mek-jdi-wuxga-lvds0-panel.dtb \ - freescale/imx8qxp-mek-jdi-wuxga-lvds1-panel.dtb \ - freescale/imx8qxp-mek-ov5640.dtb \ - freescale/imx8qxp-mek-root.dtb \ - freescale/imx8qxp-mek-rpmsg.dtb \ - freescale/imx8qxp-mek-sof-cs42888.dtb \ - freescale/imx8qxp-mek-sof-wm8960.dtb \ -" - -UBOOT_MAKE_TARGET = "u-boot.bin" -UBOOT_SUFFIX = "bin" -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8qxp_mek_config,sdcard" -UBOOT_CONFIG[fspi] = "imx8qxp_mek_fspi_defconfig" - -IMX_BOOT_SEEK = "32" - -IMXBOOT_TARGETS = \ - "${@bb.utils.contains('UBOOT_CONFIG', 'sd', 'flash', \ - bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \ - 'UNKNOWN', d), d)}" - -BOARD_TYPE = "mek" - -# Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index c5d811ff..d52123e2 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -5,10 +5,6 @@ include conf/machine/include/fsl-default-versions.inc require conf/machine/include/utilities.inc -# Set specific make target and binary suffix -IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" -IMX_DEFAULT_BOOTLOADER_mx8 = "u-boot-imx" - # Machines or distros can define which BSP it should use by default. We are # intending to default for mainline BSP by default and specific machines or # DISTROs might change it if need. @@ -22,41 +18,84 @@ IMX_DEFAULT_BSP_mx5 ?= "mainline" MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:" +# UBOOT_BINARY is used inside the wks files to dynamically find the required +# U-Boot file. +UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" + +# Using the 'IMX_DEFAULT_BOOTLOADER' the machine can support multiple bootloader +# versions. This is done for NXP reference board where we support 'u-boot-fslc' +# and 'u-boot-imx'. +# +# So, for example in imx6qdlsabresd, we support both flavor and for this we +# define: +# +# ,----[ imx6qdlsabresd.conf ] +# | ### u-boot-fslc settings ### +# | +# | SPL_BINARY_pn-u-boot-fslc = "SPL" +# | UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabresd_defconfig" +# | UBOOT_SUFFIX_pn-u-boot-fslc = "img" +# | +# | ### u-boot-imx settings ### +# | +# | # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC +# | # variants. Change the defconfig to the targeted SoC variant. +# | UBOOT_MACHINE_pn-u-boot-imx ?= "mx6qsabresd_defconfig" +# | UBOOT_SUFFIX_pn-u-boot-imx = "imx" +# `---- +# +# As result, the 'UBOOT_SUFFIX' is dynamically set based on the preferred U-Boot +# flavor to use. +# +# For machines where one of the flavors is required, we can force it. An example +# is the imx53qsb, which we define: +# +# ,----[ imx53qsb.conf ] +# | # This machine is not supported by u-boot-imx as it is not tested by NXP on this +# | # board. So we force it to use u-boot-fslc which is based on mainline here. +# | IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" +# | +# | UBOOT_MAKE_TARGET = "u-boot.imx" +# | UBOOT_SUFFIX = "imx" +# | +# | UBOOT_MACHINE = "mx53loco_config" +# `---- +IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc" +UBOOT_SUFFIX ?= "${UBOOT_SUFFIX_pn-${IMX_DEFAULT_BOOTLOADER}}" + +IMX_DEFAULT_UBOOTTOOLS = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-tools', 'u-boot-tools', d)}" + PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" -PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" -PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-${IMX_DEFAULT_BOOTLOADER}-tools" -PREFERRED_PROVIDER_u-boot-mkimage-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" -PREFERRED_PROVIDER_nativesdk-u-boot-mkimage ??= "nativesdk-${IMX_DEFAULT_BOOTLOADER}-tools" +PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_BOOTLOADER}-mfgtool" +PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_UBOOTTOOLS}-native" +PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-${IMX_DEFAULT_UBOOTTOOLS}" +PREFERRED_PROVIDER_u-boot-mkimage-native ??= "${IMX_DEFAULT_UBOOTTOOLS}-native" +PREFERRED_PROVIDER_nativesdk-u-boot-mkimage ??= "nativesdk-${IMX_DEFAULT_UBOOTTOOLS}" PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" -UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" -UBOOT_MAKE_TARGET ?= "u-boot.${UBOOT_SUFFIX}" -UBOOT_MAKE_TARGET_mxs ?= "u-boot.sb" -UBOOT_MAKE_TARGET_mx8 ?= "" - -UBOOT_SUFFIX ?= "imx" -UBOOT_SUFFIX_mxs ?= "sb" -UBOOT_SUFFIX_mx8 ?= "bin" - -UBOOT_ENTRYPOINT_mxs = "0x40008000" -UBOOT_ENTRYPOINT_mx51 = "0x90008000" -UBOOT_ENTRYPOINT_mx53 = "0x70008000" -UBOOT_ENTRYPOINT_mx6 = "0x10008000" -UBOOT_ENTRYPOINT_mx6sl = "0x80008000" +UBOOT_ENTRYPOINT_mxs = "0x40008000" +UBOOT_ENTRYPOINT_mx51 = "0x90008000" +UBOOT_ENTRYPOINT_mx53 = "0x70008000" +UBOOT_ENTRYPOINT_mx6 = "0x10008000" +UBOOT_ENTRYPOINT_mx6sl = "0x80008000" UBOOT_ENTRYPOINT_mx6sll = "0x80008000" -UBOOT_ENTRYPOINT_mx6sx = "0x80008000" +UBOOT_ENTRYPOINT_mx6sx = "0x80008000" UBOOT_ENTRYPOINT_mx6ul = "0x10008000" -UBOOT_ENTRYPOINT_mx6ull = "0x10008000" -UBOOT_ENTRYPOINT_mx7 = "0x80008000" +UBOOT_ENTRYPOINT_mx6ull = "0x10008000" +UBOOT_ENTRYPOINT_mx6ulz = "0x10008000" +UBOOT_ENTRYPOINT_mx7 = "0x80008000" UBOOT_ENTRYPOINT_mx7ulp = "0x60008000" -UBOOT_ENTRYPOINT_mx8mm = "0x40480000" -UBOOT_ENTRYPOINT_mx8mn = "0x40480000" -UBOOT_ENTRYPOINT_mx8mp = "0x40480000" -UBOOT_ENTRYPOINT_mx8mq = "0x40480000" +UBOOT_ENTRYPOINT_mx8m = "0x40480000" UBOOT_ENTRYPOINT_vf = "0x80008000" +# Some derivates can utilize the boot container provided by U-Boot, +# below variable sets that those machines which have a imx-boot-container +# in their MACHINEOVERRIDES can inherit a imx-boot-container class +UBOOT_PROVIDES_BOOT_CONTAINER = "0" +UBOOT_PROVIDES_BOOT_CONTAINER_imx-boot-container = "1" + PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER_DRIVER = "xf86-video-fbdev" XSERVER_DRIVER_imxgpu2d = "xf86-video-imx-vivante" @@ -80,13 +119,11 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" DEFAULTTUNE_mx6 ?= "cortexa9thf-neon" DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon" DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon" +DEFAULTTUNE_mx6ulz ?= "cortexa7thf-neon" DEFAULTTUNE_mx7 ?= "cortexa7thf-neon" DEFAULTTUNE_vf ?= "cortexa5thf-neon" -DEFAULTTUNE_mx8mm ?= "cortexa53-crypto" -DEFAULTTUNE_mx8mn ?= "cortexa53-crypto" -DEFAULTTUNE_mx8mp ?= "cortexa53-crypto" -DEFAULTTUNE_mx8mq ?= "cortexa53-crypto" +DEFAULTTUNE_mx8m ?= "cortexa53-crypto" DEFAULTTUNE_mx8qm ?= "cortexa72-cortexa53-crypto" DEFAULTTUNE_mx8qxp ?= "cortexa35-crypto" @@ -100,6 +137,7 @@ MACHINEOVERRIDES_EXTENDER_mx6sl = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc" MACHINEOVERRIDES_EXTENDER_mx6sll = "imxfbdev:imxpxp:imxepdc" MACHINEOVERRIDES_EXTENDER_mx6ul = "imxfbdev:imxpxp" MACHINEOVERRIDES_EXTENDER_mx6ull = "imxfbdev:imxpxp:imxepdc" +MACHINEOVERRIDES_EXTENDER_mx6ulz = "imxfbdev:imxpxp:imxepdc" MACHINEOVERRIDES_EXTENDER_mx7d = "imxfbdev:imxpxp:imxepdc" MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" @@ -108,6 +146,7 @@ MACHINEOVERRIDES_EXTENDER_mx8mn = "imxdrm:imxgpu:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8mp = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER_mx8dxl = "imxfbdev" MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ imx \ @@ -120,18 +159,21 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ mx6sll \ mx6ul \ mx6ull \ + mx6ulz \ \ mx7 \ mx7d \ mx7ulp \ \ mx8 \ + mx8m \ mx8qm \ mx8mm \ mx8mn \ mx8mp \ mx8mq \ mx8qxp \ + mx8dxl \ " # Sub-architecture support @@ -147,12 +189,14 @@ MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60" MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50" MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul" +MACHINE_SOCARCH_SUFFIX_mx6ulz = "-mx6ul" MACHINE_SOCARCH_SUFFIX_mx8qm = "-mx8" MACHINE_SOCARCH_SUFFIX_mx8mm = "-mx8mm" MACHINE_SOCARCH_SUFFIX_mx8mn = "-mx8mn" MACHINE_SOCARCH_SUFFIX_mx8mp = "-mx8mp" MACHINE_SOCARCH_SUFFIX_mx8mq = "-mx8m" MACHINE_SOCARCH_SUFFIX_mx8qxp = "-mx8" +MACHINE_SOCARCH_SUFFIX_mx8dxl = "-mx8dxl" MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx" MACHINE_ARCH_FILTER = "virtual/kernel" @@ -198,11 +242,13 @@ MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \ qtbase \ " MACHINE_SOCARCH_FILTER_append_mx6q = " \ - virtual/opencl-icd \ + opencl-icd-loader \ + opencl-clhpp \ opencl-headers \ " MACHINE_SOCARCH_FILTER_append_mx8 = " \ - virtual/opencl-icd \ + opencl-icd-loader \ + opencl-clhpp \ opencl-headers \ " MACHINE_SOCARCH_FILTER_append_mx8qm = " \ @@ -236,11 +282,10 @@ MACHINE_FIRMWARE_append_mx8mm = " linux-firmware-imx-sdma-imx7d" MACHINE_FIRMWARE_append_mx8mn = " linux-firmware-imx-sdma-imx7d" MACHINE_FIRMWARE_append_mx8mp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" MACHINE_FIRMWARE_append_mx8mq = " linux-firmware-imx-sdma-imx7d" +MACHINE_FIRMWARE_append_mx8qm = " firmware-imx-vpu-imx8" +MACHINE_FIRMWARE_append_mx8qxp = " firmware-imx-vpu-imx8" MACHINE_FIRMWARE_append_use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" -# FIXME: Needs addition of firmware-imx of official BSPs -#MACHINE_FIRMWARE_append_mx8qxp = " firmware-imx-vpu-imx8qxp" - MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" # Extra audio support @@ -281,6 +326,15 @@ MACHINE_GSTREAMER_1_0_PLUGIN_mx7d ?= "gstreamer1.0-plugins-imx-meta" MACHINE_GSTREAMER_1_0_PLUGIN_mx8mm ?= "imx-gst1.0-plugin" MACHINE_GSTREAMER_1_0_PLUGIN_mx8mn ?= "imx-gst1.0-plugin" MACHINE_GSTREAMER_1_0_PLUGIN_mx8mp ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN_mx8mq ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN_mx8qm ?= "imx-gst1.0-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN_mx8qxp ?= "imx-gst1.0-plugin" + +PREFERRED_VERSION_gstreamer1.0_mx8 ?= "1.16.2.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base_mx8 ?= "1.16.2.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good_mx8 ?= "1.16.3.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad_mx8 ?= "1.16.3.imx" +PREFERRED_VERSION_gstreamer1.0-libav_mx8 ?= "1.16.0" # Determines if the SoC has support for Vivante kernel driver SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" @@ -303,23 +357,29 @@ PREFERRED_PROVIDER_virtual/libgles1_imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles2_imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" PREFERRED_PROVIDER_virtual/libg2d_imxdpu ?= "imx-dpu-g2d" +PREFERRED_PROVIDER_opencl-clhpp_imxgpu ?= "imx-gpu-viv" +PREFERRED_PROVIDER_opencl-headers_imxgpu ?= "imx-gpu-viv" +PREFERRED_PROVIDER_opencl-icd-loader_imxgpu ?= "imx-gpu-viv" -PREFERRED_VERSION_weston_imx ?= "8.0.0.imx" +PREFERRED_VERSION_weston_imx ?= "9.0.0.imx" PREFERRED_VERSION_weston_use-mainline-bsp = "" -PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.18.imx" -PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.18.imx" -PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.18.imx" +PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.20.imx" +PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.20.imx" +PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.20.imx" # Use i.MX libdrm Version -PREFERRED_VERSION_libdrm_mx6 ?= "2.4.99.imx" -PREFERRED_VERSION_libdrm_mx7 ?= "2.4.99.imx" -PREFERRED_VERSION_libdrm_mx8 ?= "2.4.99.imx" +PREFERRED_VERSION_libdrm_mx6 ?= "2.4.102.imx" +PREFERRED_VERSION_libdrm_mx7 ?= "2.4.102.imx" +PREFERRED_VERSION_libdrm_mx8 ?= "2.4.102.imx" # Use i.MX optee Version -PREFERRED_VERSION_optee-os_mx8 ?= "3.7.0.imx" -PREFERRED_VERSION_optee-client_mx8 ?= "3.7.0.imx" -PREFERRED_VERSION_optee-test_mx8 ?= "3.7.0.imx" +PREFERRED_VERSION_optee-os_mx8 ?= "3.10.0.imx" +PREFERRED_VERSION_optee-client_mx8 ?= "3.10.0.imx" +PREFERRED_VERSION_optee-test_mx8 ?= "3.10.0.imx" + +#Use i.MX opencv Version for mx8 +PREFERRED_VERSION_opencv_mx8 ?= "4.4.0.imx" # Handle default kernel IMX_DEFAULT_KERNEL = "linux-fslc-imx" @@ -365,25 +425,43 @@ WKS_FILE_DEPENDS ?= " \ ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ " -WKS_FILE_DEPENDS_append_mx8 = " imx-boot " +WKS_FILE_DEPENDS_append_mx8 = " imx-boot" +WKS_FILE_DEPENDS_append_mx8m = " imx-boot" + +# We need to restrict the append so we don't add this for other i.MX SoC's. +# Derivatives that are not yet adopted the usage of boot container provided +# by U-Boot build are still targeted to use 'imx-boot' package provided by +# NXP. Moving those derivatives to mainline BSP would require to define an +# 'imx-boot-container' override, and test if the U-Boot built 'flash.bin' +# binary is used a replacement. +# Note, that the results binary name of the boot container is set to 'imx-boot' +# for both NXP and Mainline BSP. +# For Mainline BSP: the 'flash.bin' boot container is renamed during the +# deployment task extesion execution defined in imx-boot-container class. +# For NXP BSP: rename is done in 'imx-boot' recipe at the execution of compile +# task. +WKS_FILE_DEPENDS_append_use-mainline-bsp_aarch64 = " \ + ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ +" SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" +SOC_DEFAULT_WKS_FILE_mx8m ?= "imx-imx-boot-bootpart.wks.in" + SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in" SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" -WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" +# Boot container built as a part of mainline U-Boot uses the same WKS +# file as the entire mx8m series, as it renames flash.bin binary to +# imx-boot before it is packed into the boot partition. +# This operation is performed in imx-boot-container class as a part of +# delopyment task. +# flash.bin binary is produced by U-Boot build itself, and is serves as a +# direct replacement of imx-boot from NXP. +# Creation of the flash.bin is controlled by UBOOT_PROVIDES_BOOT_CONTAINER +# variable defined above +SOC_DEFAULT_WKS_FILE_imx-boot-container ?= "imx-imx-boot-bootpart.wks.in" -# Certain machines override the default fsl u-boot with the -# fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this: -# MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:" -UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx" -UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx" -SPL_BINARY_use-fsl-bsp_mx6 = "" -WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks.in" -UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx" -UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx" -SPL_BINARY_use-fsl-bsp_mx7 = "" -WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks.in" +WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" SERIAL_CONSOLES = "115200;ttymxc0" SERIAL_CONSOLES_mxs = "115200;ttyAMA0" diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc new file mode 100644 index 00000000..9b590fe0 --- /dev/null +++ b/conf/machine/include/imx8mm-evk.inc @@ -0,0 +1,57 @@ +MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mm:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa53.inc + +MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" + +# NXP BSP can consume BCM4359 and QCA9377 driver and firmware +# Since the firmware is not available publicly, and rather distributed +# under "Proprietary" license - we opt-out from using it in all BSPs +# and pin it to NXP BSP only +# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have +# a full support for it yet. +MACHINE_FEATURES_append_use-nxp-bsp = " optee bcm4359 qca9377" + +KERNEL_DEVICETREE = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ +" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ +" +UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" + +IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" + +UBOOT_SUFFIX = "bin" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" +UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig" + +SPL_BINARY = "spl/u-boot-spl.bin" + +ATF_PLATFORM = "imx8mm" +ATF_LOAD_ADDR = "0x920000" + +# Extra firmware package name, that is required to build boot container for fslc bsp +IMX_EXTRA_FIRMWARE = "firmware-imx-8m" + +IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}" + +IMX_BOOT_SOC_TARGET = "iMX8MM" + +SERIAL_CONSOLES = "115200;ttymxc1" + +LOADADDR = "" +UBOOT_SUFFIX = "bin" +UBOOT_MAKE_TARGET = "all" +IMX_BOOT_SEEK = "33" + +OPTEE_BIN_EXT = "8mm" +TEE_LOAD_ADDR = "0xbe000000" + +# Add additional firmware +MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc new file mode 100644 index 00000000..6a5b31f7 --- /dev/null +++ b/conf/machine/include/imx8mn-evk.inc @@ -0,0 +1,63 @@ +MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mn:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa53.inc + +MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" + +# NXP BSP can consume proprietary jailhouse and Broadcom drivers +# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have +# a full support for it yet. +MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse bcm4359" + +KERNEL_DEVICETREE = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ +" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ +" +UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" + +IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" + +UBOOT_SUFFIX = "bin" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" +UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig" +UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig" + +SPL_BINARY = "spl/u-boot-spl.bin" + +ATF_PLATFORM = "imx8mn" +ATF_LOAD_ADDR = "0x960000" + +# Extra firmware package name, that is required to build boot container for fslc bsp +IMX_EXTRA_FIRMWARE = "firmware-imx-8m" + +IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}" + +IMX_BOOT_SOC_TARGET = "iMX8MN" + +SERIAL_CONSOLES = "115200;ttymxc1" + +BOOT_SPACE = "65536" +LOADADDR = "" +UBOOT_SUFFIX = "bin" +UBOOT_MAKE_TARGET = "all" + +# Image boot offset as defined in section 6.1.6.1 "Primary image offset and IVT offset" of +# i.MX 8M Nano Applications Processor Reference Manual, Rev. 0, 12/2019 +# Doc ID: IMX8MNRM +IMX_BOOT_SEEK = "32" + +OPTEE_BIN_EXT = "8mn" +TEE_LOAD_ADDR = "0x56000000" + +# Add additional firmware +MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc new file mode 100644 index 00000000..872d07a0 --- /dev/null +++ b/conf/machine/include/imx8mp-evk.inc @@ -0,0 +1,55 @@ +MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa53.inc + +MACHINE_FEATURES += "pci wifi bluetooth jailhouse" + +# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have +# a full support for it yet. +MACHINE_FEATURES_append_use-nxp-bsp = " optee mrvl8997" + +# Mainline kernel contains only one DTB file for +# imx8mpevk machine +KERNEL_DEVICETREE = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ +" + +UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" + +IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" + +UBOOT_SUFFIX = "bin" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" +UBOOT_CONFIG[ecc] = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig" +UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig" + +SPL_BINARY = "spl/u-boot-spl.bin" + +ATF_PLATFORM = "imx8mp" +ATF_LOAD_ADDR = "0x970000" + +# Extra firmware package name, that is required to build boot container for fslc bsp +IMX_EXTRA_FIRMWARE = "firmware-imx-8m" + +IMXBOOT_TARGETS = \ + "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', \ + '${IMXBOOT_TARGETS_BASENAME}', d)}" + +IMX_BOOT_SOC_TARGET = "iMX8MP" + +SERIAL_CONSOLES = "115200;ttymxc1" + +LOADADDR = "" +UBOOT_SUFFIX = "bin" +UBOOT_MAKE_TARGET = "all" +IMX_BOOT_SEEK = "32" + +OPTEE_BIN_EXT = "8mp" +TEE_LOAD_ADDR = "0x56000000" + +# Add additional firmware +MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc new file mode 100644 index 00000000..814a34c1 --- /dev/null +++ b/conf/machine/include/imx8x-mek.inc @@ -0,0 +1,79 @@ +MACHINEOVERRIDES =. "mx8:mx8x:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa35.inc + +IMX_DEFAULT_BSP = "nxp" + +MACHINE_FEATURES += "pci optee bcm43455 bcm4356" +MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" + +# Don't include kernels in standard images +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" + +LOADADDR = "" + +# We have to disable SERIAL_CONSOLE due to auto-serial-console +SERIAL_CONSOLES = "115200;ttyAMA0" + +# we do not want to have getty running on tty1 as we run +# auto-serial-console there +USE_VT = "0" + +KERNEL_DEVICETREE = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ +" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dsp.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-dual-channel.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-dual-channel-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds1-dual-channel.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds1-dual-channel-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ +" + +UBOOT_MAKE_TARGET = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '', \ + 'u-boot.bin', d)}" +SPL_BINARY = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'spl/u-boot-spl.bin', \ + '', d)}" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" +UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" + +IMX_BOOT_SEEK = "32" + +# This machine is not supported by u-boot-fslc, so we force it to use +# u-boot-imx here. +IMX_DEFAULT_BOOTLOADER = "u-boot-imx" +UBOOT_SUFFIX = "bin" + +# Set ATF platform name +ATF_PLATFORM = "imx8qx" + +IMXBOOT_TARGETS_SD = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \ + 'flash', d)}" +IMXBOOT_TARGETS_FSPI = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl_flexspi', \ + 'flash_flexspi', d)}" +IMXBOOT_TARGETS = \ + "${@bb.utils.contains('UBOOT_CONFIG', 'sd', '${IMXBOOT_TARGETS_SD}', \ + '${IMXBOOT_TARGETS_FSPI}', d)}" +IMX_BOOT_SOC_TARGET = "iMX8QX" + +BOARD_TYPE = "mek" + +# Add additional firmware +MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc index d7dc52d7..e482b857 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc @@ -1,10 +1,11 @@ # common providers of QorIQ targets -PREFERRED_PROVIDER_cryptodev-linux = "cryptodev-qoriq-linux" -PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module" -PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests" PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" PREFERRED_PROVIDER_virtual/bootloader ?= "${PREFERRED_PROVIDER_u-boot}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" +PREFERRED_PROVIDER_u-boot-tools-native ??= "u-boot-tools-native" +PREFERRED_PROVIDER_u-boot-mkimage-native ??= "u-boot-tools-native" +PREFERRED_PROVIDER_u-boot-mkimage ??= "u-boot-tools" +PREFERRED_PROVIDER_nativesdk-u-boot-mkimage ??= "nativesdk-u-boot-tools" PREFERRED_VERSION_testfloat = "2a" SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz ext2.gz.u-boot ext2.gz" @@ -31,6 +32,5 @@ MACHINE_SOCARCH_SUFFIX ?= "" MACHINE_SOCARCH_SUFFIX_qoriq = "-qoriq" MACHINE_ARCH_FILTER = "virtual/kernel" -MACHINE_SOCARCH_FILTER_append_qoriq = " cryptodev-qoriq-linux cryptodev-qoriq-module cryptodev-qoriq-test" INHERIT += "fsl-dynamic-packagearch" diff --git a/conf/machine/ls1012afrwy.conf b/conf/machine/ls1012afrwy.conf index 449e518c..72605cc1 100644 --- a/conf/machine/ls1012afrwy.conf +++ b/conf/machine/ls1012afrwy.conf @@ -27,5 +27,5 @@ RCWQSPI ?= "N_SSNP_3305/rcw_1000" KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-frwy.dtb" KERNEL_DEFCONFIG ?= "defconfig" -EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw atf" +EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw qoriq-atf" USE_VT = "0" diff --git a/conf/machine/ls1012ardb.conf b/conf/machine/ls1012ardb.conf index 6efd6b3d..b4bfc571 100644 --- a/conf/machine/ls1012ardb.conf +++ b/conf/machine/ls1012ardb.conf @@ -28,5 +28,5 @@ RCWQSPISEC ?= "R_SPNH_3508/rcw_1000" KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-rdb.dtb freescale/fsl-ls1012a-qds.dtb" KERNEL_DEFCONFIG ?= "defconfig" -EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw atf" +EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw qoriq-atf" USE_VT = "0" diff --git a/conf/machine/ls1028ardb.conf b/conf/machine/ls1028ardb.conf index b0bbc5b8..7647bf41 100644 --- a/conf/machine/ls1028ardb.conf +++ b/conf/machine/ls1028ardb.conf @@ -34,5 +34,5 @@ RCWSD ?= "R_SQPP_0x85bb/rcw_1500_gpu600" RCWXSPI ?= "R_SQPP_0x85bb/rcw_1500_gpu600" RCWEMMC ?= "R_SQPP_0x85bb/rcw_1500_gpu600" -EXTRA_IMAGEDEPENDS += "rcw atf dp-firmware-cadence" +EXTRA_IMAGEDEPENDS += "rcw qoriq-atf dp-firmware-cadence" USE_VT = "0" diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf index 6f1f7ea4..369abdcf 100644 --- a/conf/machine/ls1043ardb.conf +++ b/conf/machine/ls1043ardb.conf @@ -40,5 +40,5 @@ RCWSD ?= "RR_FQPP_1455/rcw_1600_sdboot" RCWNAND ?= "RR_FQPP_1455/rcw_1600_nandboot" QE_UCODE = "iram_Type_A_LS1021a_r1.0.bin" -EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode uefi atf ls2-phy" +EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode uefi qoriq-atf ls2-phy" USE_VT = "0" diff --git a/conf/machine/ls1046afrwy.conf b/conf/machine/ls1046afrwy.conf index 884f7666..f6854a0c 100644 --- a/conf/machine/ls1046afrwy.conf +++ b/conf/machine/ls1046afrwy.conf @@ -37,5 +37,5 @@ SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" RCWQSPI ?= "NN_NNQNNPNP_3040_0506/rcw_1600_qspiboot" RCWSD ?= "NN_NNQNNPNP_3040_0506/rcw_1600_sdboot" -EXTRA_IMAGEDEPENDS += "fm-ucode rcw atf ls2-phy qe-ucode" +EXTRA_IMAGEDEPENDS += "fm-ucode rcw qoriq-atf ls2-phy qe-ucode" USE_VT = "0" diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf index e8773366..64f26792 100644 --- a/conf/machine/ls1046ardb.conf +++ b/conf/machine/ls1046ardb.conf @@ -40,5 +40,5 @@ UEFI_QSPIBOOT ?= "LS1046ARDB_EFI_QSPIBOOT.fd" RCWQSPI ?= "RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot" RCWSD ?= "RR_FFSSPPPH_1133_5559/rcw_1800_sdboot" -EXTRA_IMAGEDEPENDS += "fm-ucode rcw uefi atf qe-ucode ls2-phy" +EXTRA_IMAGEDEPENDS += "fm-ucode rcw uefi qoriq-atf qe-ucode ls2-phy" USE_VT = "0" diff --git a/conf/machine/ls1088ardb-pb.conf b/conf/machine/ls1088ardb-pb.conf index 2e456f1b..1ae5693b 100644 --- a/conf/machine/ls1088ardb-pb.conf +++ b/conf/machine/ls1088ardb-pb.conf @@ -31,5 +31,5 @@ RCWSD ?= "FCSSRR_PPPP_0x1d_0x13/rcw_1600_sd" RCWQSPI ?= "FCSSRR_PPPP_0x1d_0x13/rcw_1600_qspi" -EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex atf" +EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex qoriq-atf" USE_VT = "0" diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf index 8f47f284..9922248f 100644 --- a/conf/machine/ls1088ardb.conf +++ b/conf/machine/ls1088ardb.conf @@ -30,5 +30,5 @@ SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" RCWSD ?= "FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_sd" RCWQSPI ?= "FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_qspi" -EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex atf" +EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex qoriq-atf" USE_VT = "0" diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf index f920d601..92c99326 100644 --- a/conf/machine/ls2088ardb.conf +++ b/conf/machine/ls2088ardb.conf @@ -31,5 +31,5 @@ KERNEL_DEFCONFIG ?= "defconfig" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" -EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw management-complex uefi atf" +EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw management-complex uefi qoriq-atf" USE_VT = "0" diff --git a/conf/machine/lx2160ardb.conf b/conf/machine/lx2160ardb.conf index a8bbdbda..5e68a9fd 100644 --- a/conf/machine/lx2160ardb.conf +++ b/conf/machine/lx2160ardb.conf @@ -32,5 +32,5 @@ RCWXSPI ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2" RCWSD ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2" RCWEMMC ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2" -EXTRA_IMAGEDEPENDS += "management-complex mc-utils rcw ls2-phy ddr-phy uefi atf inphi" +EXTRA_IMAGEDEPENDS += "management-complex mc-utils rcw ls2-phy ddr-phy uefi qoriq-atf inphi" USE_VT = "0" diff --git a/conf/machine/lx2162aqds.conf b/conf/machine/lx2162aqds.conf new file mode 100644 index 00000000..c7ab95fb --- /dev/null +++ b/conf/machine/lx2162aqds.conf @@ -0,0 +1,36 @@ +#@TYPE: Machine +#@NAME: NXP LX2162AQDS +#@SOC: LSCH3 +#@DESCRIPTION: Machine configuration for running LX2162AQDS in 64-bit mode +#@MAINTAINER: Zongchun Yu <Zongchun.Yu@nxp.com> + +require conf/machine/include/qoriq-arm64.inc +require conf/machine/include/arm/arch-arm64.inc + +MACHINEOVERRIDES =. "fsl-lsch3:lx2162a:" + +MACHINE_FEATURES += "optee" + +KERNEL_CLASSES = " kernel-fitimage " +KERNEL_IMAGETYPES = "fitImage" + +DTB_LOAD = "0x90000000" +UBOOT_ENTRYPOINT = "0x80080000" + +UBOOT_CONFIG ??= "tfa-verified-boot tfa-secure-boot tfa" +UBOOT_CONFIG[tfa] = "lx2162aqds_tfa_defconfig,,u-boot-dtb.bin" +UBOOT_CONFIG[tfa-secure-boot] = "lx2162aqds_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin" +UBOOT_CONFIG[tfa-verified-boot] = "lx2162aqds_tfa_verified_boot_defconfig,,u-boot-nodtb.bin" + +KERNEL_DEVICETREE ?= "freescale/fsl-lx2162a-qds.dtb" +KERNEL_DEFCONFIG ?= "defconfig" + +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0" +SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" + +RCWXSPI ?= "GGGG_NNNN_PPPP_PPPP_RR_17_2/rcw_2000_650_2900_17_2" +RCWSD ?= "GGGG_NNNN_PPPP_PPPP_RR_17_2/rcw_2000_650_2900_17_2" +RCWEMMC ?= "GGGG_NNNN_PPPP_PPPP_RR_17_2/rcw_2000_650_2900_17_2" + +EXTRA_IMAGEDEPENDS += "management-complex mc-utils rcw ls2-phy ddr-phy qoriq-atf inphi" +USE_VT = "0" diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc index cdd0f08f..cdd0f08f 100644 --- a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch index 0329d42e..0329d42e 100644 --- a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini index 6e8e0140..707a4078 100644 --- a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini @@ -2,12 +2,18 @@ shell=ivi-shell.so modules=hmi-controller.so #gbm-format=argb8888 +idle-time=0 #use-g2d=1 #xwayland=true +#repaint-window=16 +#enable-overlay-view=1 #[shell] #size=1920x1080 +[libinput] +touchscreen_calibrator=true + [ivi-shell] ivi-shell-user-interface=weston-ivi-shell-user-interface diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/README b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/README deleted file mode 100644 index 9578982d..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/README +++ /dev/null @@ -1,77 +0,0 @@ -test_setkey script usage - -The scripts in this directory may be used for testing -native Linux IPsec with the talitos driver as a loadable module. - -It's assumed that these scripts have been placed in the directory -named /test_setkey. - -The scripts setup_left and setup_right configure the ip addresses -for two boards named 'left' and 'right', which are two gateways for -an IPsec tunnel. Connect the eth1 interfaces of left and right boards together. -For smartbits testing, connect eth0 on each board to a smartbits port. -For other testing (ping, netperf, iperf), connect eth0 on each board to another system. - -The scripts named left.conf-* and right.conf-* are setkey scripts -which configure the IPsec SA and SPD entries. -The scripts ending in -tunnel use tunnel mode IPsec, and the scripts -ending in -transport used transport mode IPsec. -Transport mode is useful for quickly testing security functionality -using ping or netperf between two boards. -Tunnel mode can be used for testing throughput using smartbits or other -performance test equipment. - -There is a top level script called 'setup' which -is used for a one-step setup on the left and right boards. -'setup' uses two or three parameters. The first parameter is the side, left or right. -The second parameter is the setkey suffix for the left.conf- and right.conf- files. -If the third parameter is supplied, the setup will modprobe that name, so -typically you should provide talitos as the third parameter if you want to load the driver. -If you have built the talitos driver into the kernel, omit the third parameter to setup. -You may test software encryption if talitos is built as a module and you omit the third parameter. - -Below are example uses of the 'setup' script. - -1) One-step setup for smartbits - Use a tunnel mode setup on each side. - AES-HMAC-SHA1: - Left side: - /test_setkey/setup left aes-sha1-tunnel talitos - Right side: - /test_setkey/setup right aes-sha1-tunnel talitos - - 3DES-HMAC-SHA1: - Left side: - /test_setkey/setup left 3des-sha1-tunnel talitos - Right side: - /test_setkey/setup right 3des-sha1-tunnel talitos - -2) One-step setup for testing ping, netperf, or iperf between two boards. - Use a transport mode setup on each side. - AES-HMAC-SHA1: - Left side: - /test_setkey/setup left aes-sha1-transport talitos - Right side: - /test_setkey/setup right aes-sha1-transport talitos - - 3DES-HMAC-SHA1: - Left side: - /test_setkey/setup left 3des-sha1-transport talitos - Right side: - /test_setkey/setup right 3des-sha1-transport talitos - -3) Testing ipv4 - To test ipv4 (with no security) over the two gateways, use steps below. - Testing ipv4 is helpful to get your smartbits configuration verified - and also establish a baseline performance for throughput. - - On the left board: - cd /test_setkey - ./setup_left - ./left.ipv4 - - On the right board: - cd /test_setkey - ./setup_right - ./right.ipv4 - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/auto_left.conf-3des-sha1-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/auto_left.conf-3des-sha1-tunnel deleted file mode 100755 index 6bd6c5d8..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/auto_left.conf-3des-sha1-tunnel +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/auto_right.conf-3des-sha1-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/auto_right.conf-3des-sha1-tunnel deleted file mode 100755 index eebf307a..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/auto_right.conf-3des-sha1-tunnel +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board B setup -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/flush-setkey b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/flush-setkey deleted file mode 100755 index 0be30562..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/flush-setkey +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/sbin/setkey -f - -flush; -spdflush; diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.conf.left b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.conf.left deleted file mode 100644 index d9d6c0c6..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.conf.left +++ /dev/null @@ -1,29 +0,0 @@ -# /etc/ipsec.conf - strongSwan IPsec configuration file - -config setup - charondebug="chd 2, knl 2" - crlcheckinterval=180 - strictcrlpolicy=no - plutostart=no - -conn %default - ikelifetime=60m - keylife=20m - rekeymargin=3m - keyingtries=1 - keyexchange=ikev2 - type=tunnel - auth=esp - compress=no - mobike=no - -conn net-net - left=200.200.200.10 - leftsubnet=192.168.1.0/24 - leftcert=moonCert.pem - leftid="C=CH, O=Linux strongSwan, CN=moon.strongswan.org" - leftfirewall=yes - right=200.200.200.20 - rightsubnet=192.168.2.0/24 - rightid="C=CH, O=Linux strongSwan, CN=sun.strongswan.org" - auto=add diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.conf.right b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.conf.right deleted file mode 100644 index c14dee2b..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.conf.right +++ /dev/null @@ -1,28 +0,0 @@ -# /etc/ipsec.conf - strongSwan IPsec configuration file - -config setup - charondebug="chd 2, knl 2" - crlcheckinterval=180 - strictcrlpolicy=no - plutostart=no - -conn %default - ikelifetime=60m - keylife=20m - rekeymargin=3m - keyingtries=1 - keyexchange=ikev2 - auth=esp - compress=no - mobike=no - -conn net-net - left=200.200.200.20 - leftcert=sunCert.pem - leftid="C=CH, O=Linux strongSwan, CN=sun.strongswan.org" - leftsubnet=192.168.2.0/24 - leftfirewall=yes - right=200.200.200.10 - rightid="C=CH, O=Linux strongSwan, CN=moon.strongswan.org" - rightsubnet=192.168.1.0/24 - auto=add diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.secrets.left b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.secrets.left deleted file mode 100644 index e86d6aa5..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.secrets.left +++ /dev/null @@ -1,3 +0,0 @@ -# /etc/ipsec.secrets - strongSwan IPsec secrets file - -: RSA moonKey.pem diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.secrets.right b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.secrets.right deleted file mode 100644 index 1095b74c..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.secrets.right +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/ipsec.secrets - strongSwan IPsec secrets file - -: RSA sunKey.pem - - - - - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec_ikev1.conf.left b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec_ikev1.conf.left deleted file mode 100644 index 55025dbc..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec_ikev1.conf.left +++ /dev/null @@ -1,39 +0,0 @@ -# /etc/ipsec.conf - strongSwan IPsec configuration file - -config setup - plutodebug=control - crlcheckinterval=180 - strictcrlpolicy=no - charonstart=no - -conn %default - ikelifetime=60m - keylife=20m - rekeymargin=3m - keyingtries=1 - keyexchange=ikev1 - left=200.200.200.10 - leftcert=moonCert.pem - leftid="C=CH, O=Linux strongSwan, CN=moon.strongswan.org" - leftfirewall=yes - -conn net-net - left=%defaultroute - leftsubnet=192.168.1.0/24 - leftcert=moonCert.pem - right=200.200.200.20 - rightsubnet=192.168.2.0/24 - rightid="C=CH, O=Linux strongSwan, CN=sun.strongswan.org" - auto=add - -conn host-host - left=%defaultroute - leftcert=moonCert.pem - right=200.200.200.20 - rightid="C=CH, O=Linux strongSwan, CN=sun.strongswan.org" - auto=add - -conn rw - leftsubnet=192.168.1.0/24 - right=%any - auto=add diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec_ikev1.conf.right b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec_ikev1.conf.right deleted file mode 100644 index 479791ea..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec_ikev1.conf.right +++ /dev/null @@ -1,34 +0,0 @@ -# /etc/ipsec.conf - strongSwan IPsec configuration file - -config setup - plutodebug=control - crlcheckinterval=180 - strictcrlpolicy=no - charonstart=no - -conn %default - ikelifetime=60m - keylife=20m - rekeymargin=3m - keyingtries=1 - keyexchange=ikev1 - left=200.200.200.20 - leftcert=sunCert.pem - leftid="C=CH, O=Linux strongSwan, CN=sun.strongswan.org" - leftfirewall=yes - -conn net-net - left=%defaultroute - leftsubnet=192.168.2.0/24 - leftcert=sunCert.pem - right=200.200.200.10 - rightsubnet=192.168.1.0/24 - rightid="C=CH, O=Linux strongSwan, CN=moon.strongswan.org" - auto=add - -conn host-host - left=%defaultroute - leftcert=sunCert.pem - right=200.200.200.10 - rightid="C=CH, O=Linux strongSwan, CN=moon.strongswan.org" - auto=add diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-md5-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-md5-transport deleted file mode 100755 index 5422771b..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-md5-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-md5-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-md5-tunnel deleted file mode 100755 index 52bf9c3f..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-md5-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha1-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha1-transport deleted file mode 100755 index e5ee0054..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha1-transport +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha1-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha1-tunnel deleted file mode 100755 index eb2881db..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha1-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha256-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha256-transport deleted file mode 100755 index b5286320..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha256-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha256-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha256-tunnel deleted file mode 100755 index e7726f08..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha256-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 -m tunnel - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 -m tunnel - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-md5-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-md5-transport deleted file mode 100755 index 96f57837..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-md5-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-md5-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-md5-tunnel deleted file mode 100755 index b2cf84bf..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-md5-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha1-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha1-transport deleted file mode 100755 index f3ffaf5c..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha1-transport +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha1-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha1-tunnel deleted file mode 100755 index 1ab7874f..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha1-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha256-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha256-transport deleted file mode 100755 index d2645d6f..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha256-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha256-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha256-tunnel deleted file mode 100755 index 8ed697d1..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha256-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 -m tunnel - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 -m tunnel - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-null-null-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-null-null-transport deleted file mode 100755 index 84275d07..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-null-null-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing null encryption -# and null authentication -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E null - -A null; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E null - -A null; - - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-null-null-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-null-null-tunnel deleted file mode 100755 index 478d14a8..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-null-null-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing null encryption -# and null authentication -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E null - -A null; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E null - -A null; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.ipv4 b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.ipv4 deleted file mode 100755 index e219f2ad..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.ipv4 +++ /dev/null @@ -1,2 +0,0 @@ -set -v -route add -net 192.168.2.0 netmask 255.255.255.0 gw 200.200.200.20 diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/moonCert.pem b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/moonCert.pem deleted file mode 100644 index d5c970f4..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/moonCert.pem +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEIjCCAwqgAwIBAgIBFzANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJDSDEZ -MBcGA1UEChMQTGludXggc3Ryb25nU3dhbjEbMBkGA1UEAxMSc3Ryb25nU3dhbiBS -b290IENBMB4XDTA5MDgyNzEwMDMzMloXDTE0MDgyNjEwMDMzMlowRjELMAkGA1UE -BhMCQ0gxGTAXBgNVBAoTEExpbnV4IHN0cm9uZ1N3YW4xHDAaBgNVBAMTE21vb24u -c3Ryb25nc3dhbi5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDK -L2M91Lu6BYYhWxWgMS9z9TMSTwszm5rhO7ZIsCtMRo4PAeYw+++SGXt3CPXb/+p+ -SWKGlm11rPE71eQ3ehgh2C3hAurfmWO0iQQaCw+fdreeIVCqOQIOP6UqZ327h5yY -YpHk8VQv4vBJTpxclU1PqnWheqe1ZlLxsW773LRml/fQt/UgvJkCBTZZONLNMfK+ -7TDnYaVsAtncgvDN78nUNEe2qY92KK7SrBJ6SpUEg49m51F+XgsGcsgWVHS85on3 -Om/G48crLEVJjdu8CxewSRVgb+lPJWzHd8QsU0Vg/7vlqs3ZRMyNtNKrr4opSvVb -A6agGlTXhDCreDiXU8KHAgMBAAGjggEaMIIBFjAJBgNVHRMEAjAAMAsGA1UdDwQE -AwIDqDAdBgNVHQ4EFgQUapx00fiJeYn2WpTpifH6w2SdKS4wbQYDVR0jBGYwZIAU -XafdcAZRMn7ntm2zteXgYOouTe+hSaRHMEUxCzAJBgNVBAYTAkNIMRkwFwYDVQQK -ExBMaW51eCBzdHJvbmdTd2FuMRswGQYDVQQDExJzdHJvbmdTd2FuIFJvb3QgQ0GC -AQAwHgYDVR0RBBcwFYITbW9vbi5zdHJvbmdzd2FuLm9yZzATBgNVHSUEDDAKBggr -BgEFBQcDATA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8vY3JsLnN0cm9uZ3N3YW4u -b3JnL3N0cm9uZ3N3YW4uY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQCctXg2xeMozaTV -jiBL1P8MY9uEH5JtU0EceQ1RbI5/2vGRdnECND9oADY5vamaaE2Mdq2Qh/vlXnML -o3ii5ELjsQlYdTYZOcMOdcUUXYvbbFX1cwpkBhyBl1H25KptHcgQ/HnceKp3kOuq -wYOYjgwePXulcpWXx0E2QtQCFQQZFPyEWeNJxH0oglg53QPXfHY9I2/Gukj5V0bz -p7ME0Gs8KdnYdmbbDqzQgPsta96/m+HoJlsrVF+4Gqihj6BWMBQ2ybjPWZdG3oH9 -25cE8v60Ry98D0Z/tygbAUFnh5oOvaf642paVgc3aoA77I8U+UZjECxISoiHultY -7QTufOwP ------END CERTIFICATE----- diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/moonKey.pem b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/moonKey.pem deleted file mode 100644 index 4d99866f..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/moonKey.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAyi9jPdS7ugWGIVsVoDEvc/UzEk8LM5ua4Tu2SLArTEaODwHm -MPvvkhl7dwj12//qfklihpZtdazxO9XkN3oYIdgt4QLq35ljtIkEGgsPn3a3niFQ -qjkCDj+lKmd9u4ecmGKR5PFUL+LwSU6cXJVNT6p1oXqntWZS8bFu+9y0Zpf30Lf1 -ILyZAgU2WTjSzTHyvu0w52GlbALZ3ILwze/J1DRHtqmPdiiu0qwSekqVBIOPZudR -fl4LBnLIFlR0vOaJ9zpvxuPHKyxFSY3bvAsXsEkVYG/pTyVsx3fELFNFYP+75arN -2UTMjbTSq6+KKUr1WwOmoBpU14Qwq3g4l1PChwIDAQABAoIBACBFB/Xqajv6fbn9 -K6pxrz02uXwGmacXAtVIDoPzejWmXS4QA4l17HrJDmelSnhelDKry8nnYHkTrTz7 -mn0wQ4HDWy86o/okJUG/TKRLd6bf79aRQqqohqd3iQkHk43GyzuXH+oGioVKF0fc -ACDWw4wfjL7FMNdHCZ4Bz9DrHO/ysHe9B6rvSYm3VZRhSxaneIkaLkkDadKpVx3f -XNFlMxY4qKPJYYSoJZ61iMqrO7+rnA93tmyDDs8PKU3BtnpfNrdePgleJHhk8Zqy -Ev2/NOCSUxbKE8NCtLpGTs+T0qjjnu4k3WPd3ZOBAan0uPDekHZeHB/aXGLhYcxx -J5SurqECgYEA+F1gppkER5Jtoaudt/CUpdQ1sR9wxf75VBqJ4FiYABGQz9xlG4oj -zL/o572s0iV3bwFpnQa+WuWrxGkP6ZuB/Z82npc0N/vLou/b4dxvg4n7K+eOOEf0 -8FMjsse2tqTIXKCqcmQnR0NPQ1jwuvEKsXP5w/JOlnRXAXnd4jxsJI0CgYEA0GaT -61ySttUW9jC3mxuY6jkQy8TEQqR3nOFvWwmCXIWOpN/MTTPus+Telxp/pdKhU+mo -PmX3Unyne5PvwleWDq3YzltX5ZDZGJ5UJlKuNnfGIzQ6OcHRbb7zBpQG6qSRPuug -bgo688hTnb1L59nK88zWVK45euf6pyuoI+SwIGMCgYEA7yvE8knyhBXvezuv0z1b -eGHmHp5/VDwY0DQKSEAoiBBiWrkLqLybgwXf/KJ8dZZc8En08aFX2GLJyYe/KiB1 -ys3ypEBJqgvRayP+o/9KZ+qNNRd0rqAksPXvL7ABNNt0kzapTSVDae3Yu6s/j1am -DIL5qAeERIDedG5uDPpQzdUCgYB7MtjpP63ABhLv8XbpbBQnCxtByw3W89F+Xcrt -v55gQdhE4cSuMzA/CuMH4vNpPS6AI9aBJNhj3CtKo/cOJachAGb1/wvkO5ALvLW0 -fhZdPstUTnDJain7vfF/hwzbs/PlhXgu9T9KlLfRvXFdG+Sd4g8mumRiozcLkoRw -y6XPTwKBgDJP+s9wXmdG90HST/aqC7FKrVXLpB63dY5swNUfQP6sa0pFnON0r0JC -h/YCsGFFIAebQ2uOkM3g3f9nkwTp7910ov+/5uThvRI2w2BBPy0mVuALPjyyF1Z2 -cb9zpyKiIuXoXRCf4sd8r1lR9bn0Fxx0Svpxf+fpMGSI5quHNBKY ------END RSA PRIVATE KEY----- diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/pingsizes.sh b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/pingsizes.sh deleted file mode 100755 index faefb245..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/pingsizes.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# Usage: ./pingsizes.sh 1440 20 (or greater) -# - -PINGDEST=${PINGDEST:-200.200.200.10} -k=$1 -lim="$((k+$2))" -((k-=1)) -while [ "$k" != "$lim" ] ; do - echo -n "ping -s $((k+=1)) : " - ping -i 1000 -c 1 -s $k $PINGDEST | grep packets & - sleep 1 - PID=`ps -eaf | grep 'ping -i' | grep -v grep | sed 's/[ ][ ]*/ /g' | cut -d " " -f 2` - if [ -n "$PID" ] ; then - echo "****************** killing $PID" - kill $PID > /dev/null - fi -done diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/pingsizest.sh b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/pingsizest.sh deleted file mode 100755 index d5ff0f7d..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/pingsizest.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# Usage: ./pingsizes.sh 1440 20 (or greater) -# - -PINGDEST=${PINGDEST:-200.200.200.10} -k=$1 -lim="$((k+$2))" -((k-=1)) -while [ "$k" != "$lim" ] ; do - echo ping -s $((k+=1)) - ping -i 1000 -c 1 -s $k $PINGDEST & - sleep 1 - PID=`ps -eaf | grep 'ping -i' | sed 's/[ ][ ]*/ /g' | cut -d " " -f 2` - if [ -n "$PID" ] ; then - echo "****************** killing $PID" - kill $PID - fi -done diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/psk.txt b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/psk.txt deleted file mode 100644 index 46c1ff41..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/psk.txt +++ /dev/null @@ -1,2 +0,0 @@ -200.200.200.20 secretkeyracoon -200.200.200.10 secretkeyracoon diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/racoon.conf b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/racoon.conf deleted file mode 100644 index cf561f51..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/racoon.conf +++ /dev/null @@ -1,22 +0,0 @@ -path pre_shared_key "/test_setkey/psk.txt" ; - - remote anonymous - { - exchange_mode main ; - lifetime time 1 hour ; - proposal { - encryption_algorithm 3des; - hash_algorithm sha1; - authentication_method pre_shared_key ; - dh_group 2 ; - } - } - - sainfo anonymous - { - pfs_group 2; - lifetime time 1 hour ; - encryption_algorithm 3des ; - authentication_algorithm hmac_sha1 ; - compression_algorithm deflate ; - } diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-md5-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-md5-transport deleted file mode 100755 index 7f82fb46..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-md5-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - - -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-md5-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-md5-tunnel deleted file mode 100755 index 5a752579..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-md5-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board B setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha1-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha1-transport deleted file mode 100755 index 6ef885d4..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha1-transport +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - -# Security policies -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha1-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha1-tunnel deleted file mode 100755 index 16c31578..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha1-tunnel +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board B setup -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha256-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha256-transport deleted file mode 100755 index b9772092..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha256-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - - -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha256-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha256-tunnel deleted file mode 100755 index e7c5b4e6..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha256-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 -m tunnel - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 -m tunnel - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-md5-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-md5-transport deleted file mode 100755 index 5d55d001..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-md5-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - - -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-md5-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-md5-tunnel deleted file mode 100755 index f49bd54a..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-md5-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board B setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha1-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha1-transport deleted file mode 100755 index d9c65a45..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha1-transport +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - -# Security policies -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha1-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha1-tunnel deleted file mode 100755 index 1f10136a..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha1-tunnel +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board B setup -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha256-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha256-transport deleted file mode 100755 index 817a8bd4..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha256-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - - -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha256-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha256-tunnel deleted file mode 100755 index 9bca18fb..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha256-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 -m tunnel - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 -m tunnel - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-null-null-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-null-null-transport deleted file mode 100755 index 26dfe2e1..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-null-null-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing null encryption -# and null authentication -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E null - -A null; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E null - -A null; - - -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-null-null-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-null-null-tunnel deleted file mode 100755 index bc4f38eb..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-null-null-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board B setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - - -# ESP SAs doing null encryption -# and null authentication -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E null - -A null; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E null - -A null; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.ipv4 b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.ipv4 deleted file mode 100755 index 67cd1b2c..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.ipv4 +++ /dev/null @@ -1,2 +0,0 @@ -set -v -route add -net 192.168.1.0 netmask 255.255.255.0 gw 200.200.200.10 diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup deleted file mode 100755 index 9e6fa7fa..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup +++ /dev/null @@ -1,47 +0,0 @@ -# setup - quick setup for left or right side of ipsec test -# see README for example use. - -SCRIPT_HOME=/test_setkey/ -cd $SCRIPT_HOME - -export PATH=$SCRIPT_HOME:$PATH - -if [ "$1" != "left" -a "$1" != "right" ] ; then - echo "Usage: $0 side [config] [driver]" - echo " where side is either left or right." - echo " where config is either" - echo " aes-sha1-tunnel (default)" - echo " or 3des-sha1-tunnel" - echo " if driver is supplied, script does 'modprobe driver'" - exit 1 -fi - -SIDE=$1 -POLICY_CFG=$SIDE.conf -DEFAULT_POLICY=aes-sha1-tunnel - -if [ -n "$2" ] ; then - POLICY=$2 -else - POLICY=$DEFAULT_POLICY -fi - -SETKEY_FILE=$POLICY_CFG-$POLICY - -if [ ! -f $SETKEY_FILE ] ; then - echo "Missing setkey command file: $SETKEY_FILE" - exit 1 -fi - -# modprobe any driver name given as last parameter -if [ -n "$3" ] ; then - modprobe $3 -fi - -SETUP_CMD_FILE=./setup_$SIDE -. $SETUP_CMD_FILE - -$SETKEY_FILE - -setkey -D -setkey -D -P diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup_left b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup_left deleted file mode 100755 index da769099..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup_left +++ /dev/null @@ -1,13 +0,0 @@ -# board on left setup -set -v -ifconfig eth0 down -ifconfig eth0 hw ether 00:04:9F:11:22:33 -ifconfig eth0 192.168.1.130 netmask 255.255.255.0 -ifconfig eth0 up -ifconfig eth1 down -ifconfig eth1 hw ether 00:E0:0C:00:7D:FD -ifconfig eth1 200.200.200.10 netmask 255.255.255.0 -ifconfig eth1 up -arp -s 192.168.1.21 00:00:00:00:00:01 -route add default dev eth1 -echo 1 > /proc/sys/net/ipv4/ip_forward diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup_right b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup_right deleted file mode 100755 index f0e333ee..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup_right +++ /dev/null @@ -1,13 +0,0 @@ -# board on right setup -set -v -ifconfig eth0 down -ifconfig eth0 hw ether 00:E0:0C:00:01:FD -ifconfig eth0 192.168.2.130 netmask 255.255.255.0 -ifconfig eth0 up -ifconfig eth1 down -ifconfig eth1 hw ether 00:E0:0C:00:00:FD -ifconfig eth1 200.200.200.20 netmask 255.255.255.0 -ifconfig eth1 up -arp -s 192.168.2.21 00:00:00:00:00:02 -route add default dev eth1 -echo 1 > /proc/sys/net/ipv4/ip_forward diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan.conf b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan.conf deleted file mode 100644 index 1701f4ab..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan.conf +++ /dev/null @@ -1,19 +0,0 @@ -# strongswan.conf - strongSwan configuration file - -charon { - load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-raw updown - multiple_authentication = no -} - -pluto { - - # plugins to load in pluto - #load = aes des sha1 md5 sha2 hmac gmp random pubkey - -} - -libstrongswan { - - # set to no, the DH exponent size is optimized - # dh_exponent_ansi_x9_42 = no -} diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswanCert.pem b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswanCert.pem deleted file mode 100644 index 0865ad22..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswanCert.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDuDCCAqCgAwIBAgIBADANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJDSDEZ -MBcGA1UEChMQTGludXggc3Ryb25nU3dhbjEbMBkGA1UEAxMSc3Ryb25nU3dhbiBS -b290IENBMB4XDTA0MDkxMDEwMDExOFoXDTE5MDkwNzEwMDExOFowRTELMAkGA1UE -BhMCQ0gxGTAXBgNVBAoTEExpbnV4IHN0cm9uZ1N3YW4xGzAZBgNVBAMTEnN0cm9u -Z1N3YW4gUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/y -X2LqPVZuWLPIeknK86xhz6ljd3NNhC2z+P1uoCP3sBMuZiZQEjFzhnKcbXxCeo2f -FnvhOOjrrisSuVkzuu82oxXD3fIkzuS7m9V4E10EZzgmKWIf+WuNRfbgAuUINmLc -4YGAXBQLPyzpP4Ou48hhz/YQo58Bics6PHy5v34qCVROIXDvqhj91P8g+pS+F21/ -7P+CH2jRcVIEHZtG8M/PweTPQ95dPzpYd2Ov6SZ/U7EWmbMmT8VcUYn1aChxFmy5 -gweVBWlkH6MP+1DeE0/tL5c87xo5KCeGK8Tdqpe7sBRC4pPEEHDQciTUvkeuJ1Pr -K+1LwdqRxo7HgMRiDw8CAwEAAaOBsjCBrzASBgNVHRMBAf8ECDAGAQH/AgEBMAsG -A1UdDwQEAwIBBjAdBgNVHQ4EFgQUXafdcAZRMn7ntm2zteXgYOouTe8wbQYDVR0j -BGYwZIAUXafdcAZRMn7ntm2zteXgYOouTe+hSaRHMEUxCzAJBgNVBAYTAkNIMRkw -FwYDVQQKExBMaW51eCBzdHJvbmdTd2FuMRswGQYDVQQDExJzdHJvbmdTd2FuIFJv -b3QgQ0GCAQAwDQYJKoZIhvcNAQELBQADggEBACOSmqEBtBLR9aV3UyCI8gmzR5in -Lte9aUXXS+qis6F2h2Stf4sN+Nl6Gj7REC6SpfEH4wWdwiUL5J0CJhyoOjQuDl3n -1Dw3dE4/zqMZdyDKEYTU75TmvusNJBdGsLkrf7EATAjoi/nrTOYPPhSUZvPp/D+Y -vORJ9Ej51GXlK1nwEB5iA8+tDYniNQn6BD1MEgIejzK+fbiy7braZB1kqhoEr2Si -7luBSnU912sw494E88a2EWbmMvg2TVHPNzCpVkpNk7kifCiwmw9VldkqYy9y/lCa -Epyp7lTfKw7cbD04Vk8QJW782L6Csuxkl346b17wmOqn8AZips3tFsuAY3w= ------END CERTIFICATE----- diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan_left b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan_left deleted file mode 100755 index e55c3e42..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan_left +++ /dev/null @@ -1,10 +0,0 @@ -#strongswan on left board -set -v -cp -rf ipsec.conf.left /etc/ipsec.conf -cp -rf ipsec.secrets.left /etc/ipsec.secrets -cp -rf strongswan.conf /etc/ -cp -rf strongswanCert.pem /etc/ipsec.d/cacerts/ -cp -rf moonCert.pem /etc/ipsec.d/certs/ -mkdir /etc/ipsec.d/private -cp -rf sunKey.pem /etc/ipsec.d/private/ -cp -rf moonKey.pem /etc/ipsec.d/private/ diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan_right b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan_right deleted file mode 100755 index bcdbb731..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan_right +++ /dev/null @@ -1,10 +0,0 @@ -#strongswan on left board -set -v -cp -rf ipsec.conf.right /etc/ipsec.conf -cp -rf ipsec.secrets.right /etc/ipsec.secrets -cp -rf strongswan.conf /etc/ -cp -rf strongswanCert.pem /etc/ipsec.d/cacerts/ -cp -rf sunCert.pem /etc/ipsec.d/certs/ -mkdir /etc/ipsec.d/private -cp -rf sunKey.pem /etc/ipsec.d/private/ -cp -rf moonKey.pem /etc/ipsec.d/private/ diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/sunCert.pem b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/sunCert.pem deleted file mode 100644 index d0937bab..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/sunCert.pem +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEIDCCAwigAwIBAgIBFjANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJDSDEZ -MBcGA1UEChMQTGludXggc3Ryb25nU3dhbjEbMBkGA1UEAxMSc3Ryb25nU3dhbiBS -b290IENBMB4XDTA5MDgyNzA5NTkwNFoXDTE0MDgyNjA5NTkwNFowRTELMAkGA1UE -BhMCQ0gxGTAXBgNVBAoTEExpbnV4IHN0cm9uZ1N3YW4xGzAZBgNVBAMTEnN1bi5z -dHJvbmdzd2FuLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+V -VIpn6Q5jaU//EN6p6A5cSfUfhBK0mFa2laFFZh/Y0h66AXqqrQ3X917h7YNsSk68 -oowY9h9I3gOx7hNVBsJr2VjdYC+b0q5NTha09/A5mimv/prYj6o0yawxoPjoDs9Y -h7D7Kf+F8fkgk0stlHJZX66J7dNrFXbg1xBld+Ep5Or2FbEZ9QWUpRQTuhdpNt/4 -9YuxQ59DemY9IRbwsrKCHH0mGrJsDdqeb0ap+8QvSXHjCt1fr9MNKWaAFAQLKQI4 -e0da1ntPCEQLeE833+NNRBgGufk0KqGT3eAXqrxa9AEIUJnVcPexQdqUMjcUpXFb -8WNzRWB8Egh3BDK6FsECAwEAAaOCARkwggEVMAkGA1UdEwQCMAAwCwYDVR0PBAQD -AgOoMB0GA1UdDgQWBBRW1p4v2qihzRlcI1PnxbZwluML+zBtBgNVHSMEZjBkgBRd -p91wBlEyfue2bbO15eBg6i5N76FJpEcwRTELMAkGA1UEBhMCQ0gxGTAXBgNVBAoT -EExpbnV4IHN0cm9uZ1N3YW4xGzAZBgNVBAMTEnN0cm9uZ1N3YW4gUm9vdCBDQYIB -ADAdBgNVHREEFjAUghJzdW4uc3Ryb25nc3dhbi5vcmcwEwYDVR0lBAwwCgYIKwYB -BQUHAwEwOQYDVR0fBDIwMDAuoCygKoYoaHR0cDovL2NybC5zdHJvbmdzd2FuLm9y -Zy9zdHJvbmdzd2FuLmNybDANBgkqhkiG9w0BAQsFAAOCAQEAo37LYT9Awx0MK/nA -FZpPJqUr0Ey+O5Ukcsdx7nd00SlmpiQRY8KmuRXCBQnDEgdLstd3slQjT0pJEgWF -0pzxybnI6eOzYAhLfhart+X1hURiNGbXjggm2s4I5+K32bVIkNEqlsYnd/6F9oo5 -ZNO0/eTTruLZfkNe/zchBGKe/Z7MacVwlYWWCbMtBV4K1d5dGcRRgpQ9WivDlmat -Nh9wlscDSgSGk3HJkbxnq695VN7zUbDWAUvWWhV5bIDjlAR/xyT9ApqIxiyVVRul -fYrE7U05Hbt6GgAroAKLp6qJup9+TxQAKSjKIwJ0hf7OuYyQ8TZtVHS7AOhm+T/5 -G/jGGA== ------END CERTIFICATE----- diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/sunKey.pem b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/sunKey.pem deleted file mode 100644 index d8fad9aa..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/sunKey.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA35VUimfpDmNpT/8Q3qnoDlxJ9R+EErSYVraVoUVmH9jSHroB -eqqtDdf3XuHtg2xKTryijBj2H0jeA7HuE1UGwmvZWN1gL5vSrk1OFrT38DmaKa/+ -mtiPqjTJrDGg+OgOz1iHsPsp/4Xx+SCTSy2Ucllfront02sVduDXEGV34Snk6vYV -sRn1BZSlFBO6F2k23/j1i7FDn0N6Zj0hFvCysoIcfSYasmwN2p5vRqn7xC9JceMK -3V+v0w0pZoAUBAspAjh7R1rWe08IRAt4Tzff401EGAa5+TQqoZPd4BeqvFr0AQhQ -mdVw97FB2pQyNxSlcVvxY3NFYHwSCHcEMroWwQIDAQABAoIBADH51hjN2zk9HVgl -QmcTAWzcUie5cLMhrP+M9mtC8O3jcCwwFY6OwfnbMU8DHy0GMqHg5lB8b99UUVPw -HLAzjDw/ESkc6pgZs4EEhJTsxJLsvTnePgHssEgyXnXf7gRVEqJkPohfy+Zy0UCH -eIUQXiMlOQ7xg7iDMhwNa+UdWSt539DztSKilQn2xdPZjFnMT0/prvl4NA/8Zn54 -/SdWDq5yRdLWb6EK1V7yJ3687GXR1jzGtgy7TXuncUJVTYgX7RdP1Tn6gWD8YAQ/ -RfT0DdWYm4WHSgSb9/NW8lBZH2yy3hg+lNgofXEvTfBkO5QyW31LIr0tCV6zhJIc -Y9MxaKUCgYEA9sktaXfhPLe0ECjdeQEOq5EKuDrCviSKCOuAV4BDSOsdw6+5LWfY -Vb/oke8N70lL3RCblcj1pOKWUi2O/SpEJdDRduiw2gM9cXt3/bChSTHC4TsIxxN/ -Db9OGg72kZ4sRY5Au+zyAAQYBwXhFWux194Jk5qK0JblNG9J5QMqZDcCgYEA5+5h -BgHUMEO+pdME5lAiSc5PcNTejpA6j+OikCh4/HFXy3C/dLx+Cs1+egw64c8iVaIv -NEo7n7E9I0e3XqanPRXhMnBRrP+39OVsWPmZ18Li2Hi84KwJyi8Y11l3XJOqaYpF -wMVUuZpxR0dfG5k/5GwT/tEkmQBglOgG3m2zUMcCgYEA4m3Vd9ahV5dp5AXKpzKc -JjiPMFfhxJo7+FEz0ZUCp03qYljBu/Jy4MKS/grrqyiCLdQGHNlk4SNxLvdUId78 -5gGBnuuDEJU2dAAIKUE9yq2YlBUZSacOxStI2snt28/X6P3LUWHm7LLU5OS1D3Vf -mKPF/6MlSJuas5CEqVZNN+MCgYBH9Qh7IaQgmVQUBKVXg3Mv7OduvUyTdKIGtHxi -N3xZ7hxsDP4JjNWaKmlcGmFGX8pqQRheI83d3NJ4GK8GmbP3Wst0p65fezMqsudr -r30QmPFicgs/tYCQDw6o+aPzwAi2F+VOSqrfrtAIaldSq7hL+VA21dKB+cD9UgOX -jPd+TwKBgQCbKeg2QNS2qhPIG9eaqJDROuxmxb/07d7OBctgMgxVvKhqW9hW42Sy -gJ59fyz5QjFBaSfcOdf4gkKyEawVo45/q6ymIQU37R4vF4CW9Z3CfaIbwJp7LcHV -zH07so/HNsZua6GWCSCLJU5MeCRiZzk2RFiS9KIaLP4gZndv4lXOiQ== ------END RSA PRIVATE KEY----- diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb deleted file mode 100644 index 1a4ae6dd..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Scripts and configuration files for ipsec demo" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -RDEPENDS_${PN} = "ipsec-tools bash" - -inherit allarch - -SRC_URI = "file://test_setkey" - -S = "${WORKDIR}" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install(){ - install -d ${D}${datadir} - cp -a ${WORKDIR}/test_setkey ${D}${datadir}/ - chown -R root:root ${D}${datadir}/test_setkey -} - -FILES_${PN} = "${datadir}/*" - -COMPATIBLE_MACHINE = "(qoriq)" -PACKAGE_ARCH = "${MACHINE_SOCARCH}" - diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb index 2f5f1afa..1793ec06 100644 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb @@ -7,7 +7,7 @@ PR = "r2" DEPENDS = "libxml2 fmlib tclap" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/fmc;nobranch=1" -SRCREV = "c7576ab7fb6fb09b68ebc40531e5452fc89e5cd5" +SRCREV = "c2ed7c269e86ac6a0aac361f5876c96e700443f4" S = "${WORKDIR}/git" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend index afc728c1..168db095 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend @@ -1,5 +1,8 @@ # etnaviv mesa does not have glx PACKAGECONFIG_remove_use-mainline-bsp = "xcomposite-glx" +PACKAGECONFIG_remove_mx6 = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG_remove_mx7 = "xcomposite-egl xcomposite-glx" + # i.MX8 does never provide native x11, so required dependencies are not met PACKAGECONFIG_remove_mx8 = "xcomposite-egl xcomposite-glx" diff --git a/recipes-bsp/alsa-state/alsa-state/imx/asound.state b/recipes-bsp/alsa-state/alsa-state/imx/asound.state index c0dfc0e8..ace734df 100755 --- a/recipes-bsp/alsa-state/alsa-state/imx/asound.state +++ b/recipes-bsp/alsa-state/alsa-state/imx/asound.state @@ -5215,7 +5215,7 @@ state.wm8958audio { } } } -state.cs42888audio { +state.imxcs42888 { control.1 { iface MIXER name 'DAC1 Playback Volume' @@ -9157,3 +9157,692 @@ state.wm8960audio3 { } } } +state.wm8960audio4 { + control.1 { + iface MIXER + name 'Capture Volume' + value.0 35 + value.1 35 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 63' + dbmin -1725 + dbmax 3000 + dbvalue.0 900 + dbvalue.1 900 + } + } + control.2 { + iface MIXER + name 'Capture Volume ZC Switch' + value.0 0 + value.1 0 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 1' + } + } + control.3 { + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + comment { + access 'read write' + type BOOLEAN + count 2 + } + } + control.4 { + iface MIXER + name 'Right Input Boost Mixer RINPUT3 Volume' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + dbmin -9999999 + dbmax 600 + dbvalue.0 -9999999 + } + } + control.5 { + iface MIXER + name 'Right Input Boost Mixer RINPUT2 Volume' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + dbmin -9999999 + dbmax 600 + dbvalue.0 -9999999 + } + } + control.6 { + iface MIXER + name 'Left Input Boost Mixer LINPUT3 Volume' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + dbmin -9999999 + dbmax 600 + dbvalue.0 -9999999 + } + } + control.7 { + iface MIXER + name 'Left Input Boost Mixer LINPUT2 Volume' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + dbmin -9999999 + dbmax 600 + dbvalue.0 -9999999 + } + } + control.8 { + iface MIXER + name 'Right Input Boost Mixer RINPUT1 Volume' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 3' + dbmin 0 + dbmax 2900 + dbvalue.0 0 + } + } + control.9 { + iface MIXER + name 'Left Input Boost Mixer LINPUT1 Volume' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 3' + dbmin 0 + dbmax 2900 + dbvalue.0 0 + } + } + control.10 { + iface MIXER + name 'Playback Volume' + value.0 235 + value.1 235 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 255' + dbmin -9999999 + dbmax 0 + dbvalue.0 -1000 + dbvalue.1 -1000 + } + } + control.11 { + iface MIXER + name 'Headphone Playback Volume' + value.0 101 + value.1 101 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 127' + dbmin -9999999 + dbmax 600 + dbvalue.0 -2000 + dbvalue.1 -2000 + } + } + control.12 { + iface MIXER + name 'Headphone Playback ZC Switch' + value.0 false + value.1 false + comment { + access 'read write' + type BOOLEAN + count 2 + } + } + control.13 { + iface MIXER + name 'Speaker Playback Volume' + value.0 110 + value.1 110 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 127' + dbmin -9999999 + dbmax 600 + dbvalue.0 -1100 + dbvalue.1 -1100 + } + } + control.14 { + iface MIXER + name 'Speaker Playback ZC Switch' + value.0 false + value.1 false + comment { + access 'read write' + type BOOLEAN + count 2 + } + } + control.15 { + iface MIXER + name 'Speaker DC Volume' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 5' + } + } + control.16 { + iface MIXER + name 'Speaker AC Volume' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 5' + } + } + control.17 { + iface MIXER + name 'PCM Playback -6dB Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.18 { + iface MIXER + name 'ADC Polarity' + value 'No Inversion' + comment { + access 'read write' + type ENUMERATED + count 1 + item.0 'No Inversion' + item.1 'Left Inverted' + item.2 'Right Inverted' + item.3 'Stereo Inversion' + } + } + control.19 { + iface MIXER + name 'ADC High Pass Filter Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.20 { + iface MIXER + name 'DAC Polarity' + value 'No Inversion' + comment { + access 'read write' + type ENUMERATED + count 1 + item.0 'No Inversion' + item.1 'Left Inverted' + item.2 'Right Inverted' + item.3 'Stereo Inversion' + } + } + control.21 { + iface MIXER + name 'DAC Deemphasis Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.22 { + iface MIXER + name '3D Filter Upper Cut-Off' + value High + comment { + access 'read write' + type ENUMERATED + count 1 + item.0 High + item.1 Low + } + } + control.23 { + iface MIXER + name '3D Filter Lower Cut-Off' + value Low + comment { + access 'read write' + type ENUMERATED + count 1 + item.0 Low + item.1 High + } + } + control.24 { + iface MIXER + name '3D Volume' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 15' + } + } + control.25 { + iface MIXER + name '3D Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.26 { + iface MIXER + name 'ALC Function' + value Off + comment { + access 'read write' + type ENUMERATED + count 1 + item.0 Off + item.1 Right + item.2 Left + item.3 Stereo + } + } + control.27 { + iface MIXER + name 'ALC Max Gain' + value 7 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + } + } + control.28 { + iface MIXER + name 'ALC Target' + value 4 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 15' + } + } + control.29 { + iface MIXER + name 'ALC Min Gain' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + } + } + control.30 { + iface MIXER + name 'ALC Hold Time' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 15' + } + } + control.31 { + iface MIXER + name 'ALC Mode' + value ALC + comment { + access 'read write' + type ENUMERATED + count 1 + item.0 ALC + item.1 Limiter + } + } + control.32 { + iface MIXER + name 'ALC Decay' + value 3 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 15' + } + } + control.33 { + iface MIXER + name 'ALC Attack' + value 2 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 15' + } + } + control.34 { + iface MIXER + name 'Noise Gate Threshold' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 31' + } + } + control.35 { + iface MIXER + name 'Noise Gate Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.36 { + iface MIXER + name 'ADC PCM Capture Volume' + value.0 195 + value.1 195 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 255' + dbmin -9999999 + dbmax 3000 + dbvalue.0 0 + dbvalue.1 0 + } + } + control.37 { + iface MIXER + name 'Left Output Mixer Boost Bypass Volume' + value 2 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + dbmin -2100 + dbmax 0 + dbvalue.0 -1500 + } + } + control.38 { + iface MIXER + name 'Left Output Mixer LINPUT3 Volume' + value 2 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + dbmin -2100 + dbmax 0 + dbvalue.0 -1500 + } + } + control.39 { + iface MIXER + name 'Right Output Mixer Boost Bypass Volume' + value 2 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + dbmin -2100 + dbmax 0 + dbvalue.0 -1500 + } + } + control.40 { + iface MIXER + name 'Right Output Mixer RINPUT3 Volume' + value 2 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + dbmin -2100 + dbmax 0 + dbvalue.0 -1500 + } + } + control.41 { + iface MIXER + name 'ADC Data Output Select' + value 'Left Data = Left ADC; Right Data = Left ADC' + comment { + access 'read write' + type ENUMERATED + count 1 + item.0 'Left Data = Left ADC; Right Data = Right ADC' + item.1 'Left Data = Left ADC; Right Data = Left ADC' + item.2 'Left Data = Right ADC; Right Data = Right ADC' + item.3 'Left Data = Right ADC; Right Data = Left ADC' + } + } + control.42 { + iface MIXER + name 'Mono Output Mixer Left Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.43 { + iface MIXER + name 'Mono Output Mixer Right Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.44 { + iface MIXER + name 'Right Output Mixer PCM Playback Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.45 { + iface MIXER + name 'Right Output Mixer RINPUT3 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.46 { + iface MIXER + name 'Right Output Mixer Boost Bypass Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.47 { + iface MIXER + name 'Left Output Mixer PCM Playback Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.48 { + iface MIXER + name 'Left Output Mixer LINPUT3 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.49 { + iface MIXER + name 'Left Output Mixer Boost Bypass Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.50 { + iface MIXER + name 'Right Input Mixer Boost Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.51 { + iface MIXER + name 'Left Input Mixer Boost Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.52 { + iface MIXER + name 'Right Boost Mixer RINPUT2 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.53 { + iface MIXER + name 'Right Boost Mixer RINPUT3 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.54 { + iface MIXER + name 'Right Boost Mixer RINPUT1 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.55 { + iface MIXER + name 'Left Boost Mixer LINPUT2 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.56 { + iface MIXER + name 'Left Boost Mixer LINPUT3 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.57 { + iface MIXER + name 'Left Boost Mixer LINPUT1 Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.58 { + iface CARD + name 'Headphone Jack' + value true + comment { + access read + type BOOLEAN + count 1 + } + } +} diff --git a/recipes-bsp/atf/qoriq-atf-2.3.inc b/recipes-bsp/atf/qoriq-atf-2.3.inc new file mode 100644 index 00000000..bc8b912a --- /dev/null +++ b/recipes-bsp/atf/qoriq-atf-2.3.inc @@ -0,0 +1,13 @@ +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" + +PV = "2.3+git${SRCPV}" + +SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;nobranch=1 \ + git://github.com/ARMmbed/mbedtls;nobranch=1;destsuffix=git/mbedtls;name=mbedtls \ +" +SRCREV = "4e40e24590ab908773ef842cd0e17faf233767d4" +SRCREV_mbedtls = "85da85555e5b086b0250780693c3ee584f63e79f" +SRCREV_FORMAT = "atf" + +S = "${WORKDIR}/git" diff --git a/recipes-bsp/atf/atf-tools_git.bb b/recipes-bsp/atf/qoriq-atf-tools_2.3.bb index 33ec51c2..d4be32be 100644 --- a/recipes-bsp/atf/atf-tools_git.bb +++ b/recipes-bsp/atf/qoriq-atf-tools_2.3.bb @@ -1,11 +1,6 @@ -SUMMARY = "Tools for ARM Trusted Firmware, e.g. FIP image creation tool" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443" - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;nobranch=1" -SRCREV = "7d748e6f0ec652ba7c43733dc67a3d0b0217390a" +require qoriq-atf-${PV}.inc -S = "${WORKDIR}/git" +SUMMARY = "Tools for ARM Trusted Firmware, e.g. FIP image creation tool" DEPENDS += "openssl" diff --git a/recipes-bsp/atf/atf_git.bb b/recipes-bsp/atf/qoriq-atf_1.5.bb index a93cb804..650acc3b 100644 --- a/recipes-bsp/atf/atf_git.bb +++ b/recipes-bsp/atf/qoriq-atf_1.5.bb @@ -3,16 +3,18 @@ DESCRIPTION = "ARM Trusted Firmware" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443" +PV = "1.5+git${SRCPV}" + inherit deploy DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native mbedtls rcw cst-native" -DEPENDS_append_lx2160a += "ddr-phy" +DEPENDS_append_lx2160a = " ddr-phy" do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy" S = "${WORKDIR}/git" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;nobranch=1" -SRCREV = "7d748e6f0ec652ba7c43733dc67a3d0b0217390a" +SRCREV = "9225ad51f026975fa6b86db800f43c55db11fa4d" COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-bsp/atf/qoriq-atf_2.3.bb b/recipes-bsp/atf/qoriq-atf_2.3.bb new file mode 100644 index 00000000..aed32851 --- /dev/null +++ b/recipes-bsp/atf/qoriq-atf_2.3.bb @@ -0,0 +1,175 @@ +require qoriq-atf-${PV}.inc + +DESCRIPTION = "ARM Trusted Firmware" + +inherit deploy + +DEPENDS += "cst-native" +do_compile[depends] += "u-boot:do_deploy rcw:do_deploy ddr-phy:do_deploy" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +PLATFORM = "${MACHINE}" +MBEDTLS_FOLDER ?= "${S}/mbedtls" +RCW_FOLDER ?= "${MACHINE}" + +# requires CROSS_COMPILE set by hand as there is no configure script +export CROSS_COMPILE="${TARGET_PREFIX}" +export ARCH="arm64" + +# Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is +# a standalone application +CFLAGS[unexport] = "1" +LDFLAGS[unexport] = "1" +AS[unexport] = "1" +LD[unexport] = "1" + +EXTRA_OEMAKE += "HOSTCC='${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}'" + +BOOTTYPE ?= "flexspi_nor sd emmc" +ARM_COT = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-cot', 'true', 'false', d)}" +NXP_COT = "${@bb.utils.contains('DISTRO_FEATURES', 'secure', 'true', 'false', d)}" +BUILD_OPTEE = "${@bb.utils.contains('COMBINED_FEATURES', 'optee', 'true', 'false', d)}" + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'arm-cot', 'optee', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'secure', 'optee', '', d)} \ + ${@bb.utils.filter('COMBINED_FEATURES', 'optee', d)} \ +" +PACKAGECONFIG[optee] = ",,optee-os-qoriq" + +uboot_sec ?= "${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa-secure-boot" +uboot ?= "${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa" + +do_configure[noexec] = "1" + +do_compile() { + if [ "${NXP_COT}" = "true" -a "${ARM_COT}" = "true" ]; then + bbfatal " \ + Error!, Both ARM CoT and NXP CoT are enabled. Only one CoT is built in a yocto build, \ + Don't add nxp-cot and arm-cot into DISTRO_FEATURES_append at the same time." + fi + + if [ "${NXP_COT}" = "true" ]; then + rm -fr ${S}/nxp-cot + mkdir -p ${S}/nxp-cot + outputdir="${S}/nxp-cot" + elif [ "${ARM_COT}" = "true" ]; then + rm -fr ${S}/arm-cot + mkdir -p ${S}/arm-cot + outputdir="${S}/arm-cot" + else + outputdir="${S}" + fi + + if [ "${NXP_COT}" = "true" -o "${ARM_COT}" = "true" ]; then + if [ ! -f ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/srk.pri ]; then + ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/gen_keys 1024 + else + cp ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/srk.pri ${S} + cp ${RECIPE_SYSROOT_NATIVE}/usr/bin/cst/srk.pub ${S} + fi + + bl32="${RECIPE_SYSROOT}${nonarch_base_libdir}/firmware/tee_${MACHINE}.bin" + bl33="${uboot_sec}" + secext="_sec" + else + bl33="${uboot}" + fi + + for d in ${BOOTTYPE}; do + case $d in + sd) + rcwimg="${RCWSD}.bin" + ;; + emmc) + rcwimg="${RCWEMMC}.bin" + ;; + flexspi_nor) + rcwimg="${RCWXSPI}.bin" + ;; + esac + + if [ -f "${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/${rcwimg}" ]; then + oe_runmake V=1 -C ${S} realclean + if [ "${ARM_COT}" = "true" ]; then + mkdir -p ${S}/build/${PLATFORM}/release + if [ -f ${outputdir}/rot_key.pem ]; then + cp -fr ${outputdir}/*.pem ${S}/build/${PLATFORM}/release + fi + oe_runmake V=1 -C ${S} fip pbl PLAT=${PLATFORM} BOOT_MODE=${d} SPD=opteed BL32=${bl32} \ + BL33=${bl33} RCW=${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/${rcwimg} TRUSTED_BOARD_BOOT=1 \ + GENERATE_COT=1 MBEDTLS_DIR=${MBEDTLS_FOLDER} CST_DIR=${RECIPE_SYSROOT_NATIVE}/usr/bin/cst + + if [ ! -f ${outputdir}/ddr_fip_sec.bin ]; then + oe_runmake V=1 -C ${S} fip_ddr PLAT=${PLATFORM} TRUSTED_BOARD_BOOT=1 GENERATE_COT=1 \ + MBEDTLS_DIR=${MBEDTLS_FOLDER} DDR_PHY_BIN_PATH=${DEPLOY_DIR_IMAGE}/ddr-phy + cp -r ${S}/build/${PLATFORM}/release/ddr_fip_sec.bin ${outputdir} + cp -r ${S}/build/${PLATFORM}/release/*.pem ${outputdir} + fi + elif [ "${NXP_COT}" = "true" ]; then + oe_runmake V=1 -C ${S} fip pbl PLAT=${PLATFORM} BOOT_MODE=${d} SPD=opteed BL32=${bl32} \ + BL33=${bl33} RCW=${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/${rcwimg} TRUSTED_BOARD_BOOT=1 \ + CST_DIR=${RECIPE_SYSROOT_NATIVE}/usr/bin/cst + + if [ ! -f ${outputdir}/ddr_fip_sec.bin ]; then + oe_runmake V=1 -C ${S} fip_ddr PLAT=${PLATFORM} TRUSTED_BOARD_BOOT=1 \ + CST_DIR=${RECIPE_SYSROOT_NATIVE}/usr/bin/cst DDR_PHY_BIN_PATH=${DEPLOY_DIR_IMAGE}/ddr-phy + cp -r ${S}/build/${PLATFORM}/release/ddr_fip_sec.bin ${outputdir} + fi + elif [ "${BUILD_OPTEE}" = "true" ]; then + bl32="${RECIPE_SYSROOT}${nonarch_base_libdir}/firmware/tee_${MACHINE}.bin" + oe_runmake V=1 -C ${S} all fip pbl PLAT=${PLATFORM} BOOT_MODE=${d} SPD=opteed BL32=${bl32} \ + RCW=${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/${rcwimg} BL33=${bl33} + else + oe_runmake V=1 -C ${S} all fip pbl PLAT=${PLATFORM} BOOT_MODE=${d} \ + RCW=${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/${rcwimg} BL33=${bl33} + fi + + cp -r ${S}/build/${PLATFORM}/release/bl2_${d}${secext}.pbl ${outputdir} + cp -r ${S}/build/${PLATFORM}/release/fip.bin ${outputdir} + fi + rcwimg="" + done +} + +do_install() { + install -d ${D}/boot/atf + if [ "${ARM_COT}" = "true" ]; then + outputdir="${S}/arm-cot" + secext="_sec" + elif [ "${NXP_COT}" = "true" ]; then + outputdir="${S}/nxp-cot" + secext="_sec" + else + outputdir="${S}" + fi + if [ -f "${outputdir}/fip.bin" ]; then + cp -r ${outputdir}/fip.bin ${D}/boot/atf/fip_uboot${secext}.bin + fi + if [ -f "${outputdir}/ddr_fip_sec.bin" ]; then + cp -r ${outputdir}/ddr_fip_sec.bin ${D}/boot/atf/ + fi + for d in ${BOOTTYPE}; do + if [ -e ${outputdir}/bl2_${d}${secext}.pbl ]; then + cp -r ${outputdir}/bl2_${d}${secext}.pbl ${D}/boot/atf/bl2_${d}${secext}.pbl + fi + done + chown -R root:root ${D} +} + +do_deploy() { + if [ "${ARM_COT}" = "true" ]; then + outputdir="atf_arm-cot" + elif [ "${NXP_COT}" = "true" ]; then + outputdir="atf_nxp-cot" + else + outputdir="atf" + fi + + install -d ${DEPLOYDIR}/${outputdir} + cp -fr ${D}/boot/atf/* ${DEPLOYDIR}/${outputdir}/ +} +addtask deploy after do_install +FILES_${PN} += "/boot" +COMPATIBLE_MACHINE = "(lx2160a|lx2162a)" diff --git a/recipes-bsp/ddr-phy/ddr-phy_git.bb b/recipes-bsp/ddr-phy/ddr-phy_git.bb index 31f6c101..fa8833fd 100644 --- a/recipes-bsp/ddr-phy/ddr-phy_git.bb +++ b/recipes-bsp/ddr-phy/ddr-phy_git.bb @@ -9,9 +9,9 @@ SRCREV = "fbc036b88acb6c06ffed02c898cbae9856ec75ba" S = "${WORKDIR}/git" -REGLEX_lx2160a = "lx2160a" +REGLEX = "lx2160a" -DEPENDS += "atf-tools-native" +DEPENDS += "qoriq-atf-tools-native" do_compile() { cd ${S}/${REGLEX} @@ -40,5 +40,5 @@ addtask deploy before do_populate_sysroot after do_install PACKAGES += "${PN}-image" FILES_${PN}-image += "/boot" -COMPATIBLE_MACHINE = "(lx2160a)" +COMPATIBLE_MACHINE = "(lx2160a|lx2162a)" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.9.inc b/recipes-bsp/firmware-imx/firmware-imx-8.10.inc index fcf88f9b..6f1222aa 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8.9.inc +++ b/recipes-bsp/firmware-imx/firmware-imx-8.10.inc @@ -3,14 +3,14 @@ # Copyright (C) 2018 O.S. Systems Software LTDA. SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=983e4c77621568488dd902b27e0c2143" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" SRC_URI = " \ ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \ " -SRC_URI[md5sum] = "7b36242be60a882f9b5f74bb6e2c6aa1" -SRC_URI[sha256sum] = "a72f70fd2ecaa58800bb88ed672fddc322ab9843ee7777eb89b82016b0aa3614" +SRC_URI[md5sum] = "3f8c4661ca0f64ca30fd239f66b6a471" +SRC_URI[sha256sum] = "2b70f169d4065b2a7ac7a676afe24636128bd2dacc9f5230346758c3b146b2be" S = "${WORKDIR}/firmware-imx-${PV}" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.9.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.10.bb index 650c1cfd..650c1cfd 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8_8.9.bb +++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.10.bb diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.9.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.10.bb index 44e9ff4a..a48356ed 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.9.bb +++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.10.bb @@ -21,4 +21,4 @@ addtask deploy after do_install before do_build PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8m)" +COMPATIBLE_MACHINE = "(mx8m|imx-boot-container)" diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.9.bb b/recipes-bsp/firmware-imx/firmware-imx_8.10.bb index f8a6c491..8ff4a321 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.9.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.10.bb @@ -16,6 +16,8 @@ do_install() { # SDMA Firmware section install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma + rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin + rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin # EASRC Firmware section install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc @@ -51,12 +53,7 @@ do_install() { # Do the same thing as above for HDMI - only install a pre-defined list of firmware files, # as some of other files are provided by packages from other recipes. install -d ${D}${nonarch_base_libdir}/firmware/vpu - install -m 0644 ${S}/firmware/vpu/vpu_fw_imx27_TO1.bin ${D}${nonarch_base_libdir}/firmware/vpu - install -m 0644 ${S}/firmware/vpu/vpu_fw_imx27_TO2.bin ${D}${nonarch_base_libdir}/firmware/vpu - install -m 0644 ${S}/firmware/vpu/vpu_fw_imx51.bin ${D}${nonarch_base_libdir}/firmware/vpu - install -m 0644 ${S}/firmware/vpu/vpu_fw_imx53.bin ${D}${nonarch_base_libdir}/firmware/vpu - install -m 0644 ${S}/firmware/vpu/vpu_fw_imx6d.bin ${D}${nonarch_base_libdir}/firmware/vpu - install -m 0644 ${S}/firmware/vpu/vpu_fw_imx6q.bin ${D}${nonarch_base_libdir}/firmware/vpu + install -m 0644 ${S}/firmware/vpu/vpu_fw_imx*.bin ${D}${nonarch_base_libdir}/firmware/vpu } # diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb new file mode 100644 index 00000000..0f0a2af0 --- /dev/null +++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb @@ -0,0 +1,46 @@ +# Copyright 2020-2021 NXP + +SUMMARY = "Wi-Fi firmware redistributed by NXP" +DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP, \ +which is not covered by linux-firmware package. Once package becomes \ +available as a part of linux-firmware - it can be dropped from this \ +recipe in favor of upstream." + +SECTION = "kernel" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://cyw-wifi-bt/EULA.txt;md5=80c0478f4339af024519b3723023fe28" + +SRC_URI = "git://github.com/NXP/imx-firmware.git;protocol=https" +SRCREV = "484d38224fa2c26b8859a7bf20b7c4d49100f5bc" + +S = "${WORKDIR}/git" + +inherit allarch + +CLEANBROKEN = "1" +ALLOW_EMPTY_${PN} = "1" + +do_compile() { + : +} + +do_install() { + install -d ${D}${sysconfdir}/firmware + install -d ${D}${nonarch_base_libdir}/firmware/brcm + + # Install various flavors of Broadcom firmware provided by Murata: + # - bcm4359-pcie + install -m 0644 cyw-wifi-bt/*_CYW*/brcmfmac4359-pcie* ${D}${nonarch_base_libdir}/firmware/brcm + install -m 0644 cyw-wifi-bt/*_CYW*/BCM4349B1*.hcd ${D}${sysconfdir}/firmware +} + +PACKAGES =+ " \ + ${PN}-bcm4359-pcie \ +" + +FILES_${PN}-bcm4359-pcie = " \ + ${nonarch_base_libdir}/firmware/brcm/brcmfmac4359-pcie.* \ + ${sysconfdir}/firmware/BCM4349B1_*.hcd \ +" + +RPROVIDES_${PN}-bcm4359-pcie = "linux-firmware-bcm4359-pcie" diff --git a/recipes-bsp/firmware-imx/firmware-sof-imx_1.5.0-2.bb b/recipes-bsp/firmware-imx/firmware-sof-imx_1.5.0-3.bb index 31d0b8e2..22f4c25f 100644 --- a/recipes-bsp/firmware-imx/firmware-sof-imx_1.5.0-2.bb +++ b/recipes-bsp/firmware-imx/firmware-sof-imx_1.5.0-3.bb @@ -8,8 +8,8 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=0f00d99239d922ffd13cabef83b33444" SRC_URI = "${FSL_MIRROR}/sof-imx-${PV}.tar.gz" -SRC_URI[md5sum] = "15fecc1da50ea94bc84c183f8a25e897" -SRC_URI[sha256sum] = "39eb281ac9805fe4e07f5d156aafbf39ef6365ca8a6fa4114703961cffca6712" +SRC_URI[md5sum] = "4deaf1bc81238ef57be29cec3cf5f636" +SRC_URI[sha256sum] = "14394ffcf145536569bcc20910cda7c8b58a99fdb3a04b125453146739541da9" S = "${WORKDIR}/sof-imx-${PV}" diff --git a/recipes-bsp/imx-atf/imx-atf/0001-imx-Fix-missing-inclusion-of-cdefs.h.patch b/recipes-bsp/imx-atf/imx-atf/0001-imx-Fix-missing-inclusion-of-cdefs.h.patch deleted file mode 100644 index 209098d6..00000000 --- a/recipes-bsp/imx-atf/imx-atf/0001-imx-Fix-missing-inclusion-of-cdefs.h.patch +++ /dev/null @@ -1,62 +0,0 @@ -From e8bb1c2caa19fa224090eca0793586857199af9e Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Wed, 4 Dec 2019 02:48:37 -0600 -Subject: [PATCH] imx: Fix missing inclusion of cdefs.h - -This was found by compiling with -fno-common: - -./build/picopi/release/bl2/imx_snvs.o:(.bss.__packed+0x0): multiple definition of `__packed'; -./build/picopi/release/bl2/imx_caam.o:(.bss.__packed+0x0): first defined here - -__packed was intended to be the attribute macro from cdefs.h, not an -object of the structure type. - -Upstream-Status: Backport - -Signed-off-by: Samuel Holland <samuel@sholland.org> -Change-Id: Id02fac3f098be2d71c35c6b4a18012515532f32a ---- - plat/imx/common/include/imx_caam.h | 3 ++- - plat/imx/common/include/imx_snvs.h | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/plat/imx/common/include/imx_caam.h b/plat/imx/common/include/imx_caam.h -index 335bd0f8b..61005b51c 100644 ---- a/plat/imx/common/include/imx_caam.h -+++ b/plat/imx/common/include/imx_caam.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. -+ * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -@@ -7,6 +7,7 @@ - #ifndef IMX_CAAM_H - #define IMX_CAAM_H - -+#include <cdefs.h> - #include <stdint.h> - #include <arch.h> - #include <imx_regs.h> -diff --git a/plat/imx/common/include/imx_snvs.h b/plat/imx/common/include/imx_snvs.h -index 0b3d1085f..565c451dd 100644 ---- a/plat/imx/common/include/imx_snvs.h -+++ b/plat/imx/common/include/imx_snvs.h -@@ -1,11 +1,12 @@ - /* -- * Copyright (C) 2018, ARM Limited and Contributors. All rights reserved. -+ * Copyright (C) 2018-2019, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - #ifndef IMX_SNVS_H - #define IMX_SNVS_H - -+#include <cdefs.h> - #include <stdint.h> - - #include <arch.h> --- -2.28.0 - diff --git a/recipes-bsp/imx-atf/imx-atf/0001-imx-Fix-multiple-definition-of-ipc_handle.patch b/recipes-bsp/imx-atf/imx-atf/0001-imx-Fix-multiple-definition-of-ipc_handle.patch deleted file mode 100644 index 94050a06..00000000 --- a/recipes-bsp/imx-atf/imx-atf/0001-imx-Fix-multiple-definition-of-ipc_handle.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 2338329e35254c1b8a887409d930ca76d9612093 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Wed, 4 Dec 2019 02:45:58 -0600 -Subject: [PATCH] imx: Fix multiple definition of ipc_handle - -This is not conforming C and does not compile with -fno-common. - -Upstream-Status: Backport - -Signed-off-by: Samuel Holland <samuel@sholland.org> -Change-Id: I6535954cc567d6efa06919069b91e3f50975b073 ---- - plat/imx/common/include/sci/sci_ipc.h | 2 +- - plat/imx/common/sci/ipc.c | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/plat/imx/common/include/sci/sci_ipc.h b/plat/imx/common/include/sci/sci_ipc.h -index cc8e47b28..1e3e53247 100755 ---- a/plat/imx/common/include/sci/sci_ipc.h -+++ b/plat/imx/common/include/sci/sci_ipc.h -@@ -63,6 +63,6 @@ void sc_ipc_read(sc_ipc_t ipc, void *data); - */ - void sc_ipc_write(sc_ipc_t ipc, const void *data); - --sc_ipc_t ipc_handle; -+extern sc_ipc_t ipc_handle; - - #endif /* SCI_IPC_H */ -diff --git a/plat/imx/common/sci/ipc.c b/plat/imx/common/sci/ipc.c -index f329482fe..bf35a5ead 100755 ---- a/plat/imx/common/sci/ipc.c -+++ b/plat/imx/common/sci/ipc.c -@@ -11,6 +11,8 @@ - - #include "imx8_mu.h" - -+sc_ipc_t ipc_handle; -+ - #include <lib/bakery_lock.h> - DEFINE_BAKERY_LOCK(sc_ipc_bakery_lock); - #define sc_ipc_lock_init() bakery_lock_init(&sc_ipc_bakery_lock) --- -2.28.0 - diff --git a/recipes-bsp/imx-atf/imx-atf_2.2.bb b/recipes-bsp/imx-atf/imx-atf_2.2.bb index ca07dcad..6be81e59 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.2.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.2.bb @@ -7,12 +7,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m PV .= "+git${SRCPV}" -SRCBRANCH = "imx_5.4.47_2.2.0" +SRCBRANCH = "imx_5.4.70_2.3.0" SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-imx-Fix-missing-inclusion-of-cdefs.h.patch \ - file://0001-imx-Fix-multiple-definition-of-ipc_handle.patch \ " -SRCREV = "c949a888e909811db191500c51456391dff61284" +SRCREV = "f1d7187f261ebf4b8a2a70d638d4bfc0a9b26c29" S = "${WORKDIR}/git" @@ -20,20 +18,11 @@ inherit deploy BOOT_TOOLS = "imx-boot-tools" -PLATFORM ?= "INVALID" -PLATFORM_mx8qm = "imx8qm" -PLATFORM_mx8x = "imx8qx" -PLATFORM_mx8mq = "imx8mq" -PLATFORM_mx8mm = "imx8mm" -PLATFORM_mx8mn = "imx8mn" -PLATFORM_mx8mp = "imx8mp" -PLATFORM_mx8dx = "imx8dx" -PLATFORM_imx8dxlevk = "imx8dxl" -PLATFORM_mx8dxlevk-phantom = "imx8qx" +ATF_PLATFORM ??= "INVALID" EXTRA_OEMAKE += " \ CROSS_COMPILE="${TARGET_PREFIX}" \ - PLAT=${PLATFORM} \ + PLAT=${ATF_PLATFORM} \ " BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" @@ -51,12 +40,12 @@ do_compile() { do_install[noexec] = "1" do_deploy() { - install -Dm 0644 ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${PLATFORM}.bin + install -Dm 0644 ${S}/build/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${ATF_PLATFORM}.bin if ${BUILD_OPTEE}; then - install -m 0644 ${S}/build-optee/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${PLATFORM}.bin-optee + install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${ATF_PLATFORM}.bin-optee fi } addtask deploy after do_compile PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8)" +COMPATIBLE_MACHINE = "(mx8|imx-boot-container)" diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb index b104fafd..d93a3f25 100644 --- a/recipes-bsp/imx-kobs/imx-kobs_git.bb +++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" PV = "5.5+git${SRCPV}" SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocol=https \ " -SRCREV = "cee66d0e956a64d03cc866fa8819da5b798c7f1b" +SRCREV = "269fdffcf97238684de9f28977a73677282e061f" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb index d94b2daa..c5619070 100644 --- a/recipes-bsp/imx-lib/imx-lib_git.bb +++ b/recipes-bsp/imx-lib/imx-lib_git.bb @@ -26,6 +26,7 @@ PLATFORM_mx6sl = "IMX6S" PLATFORM_mx6sll = "IMX6UL" PLATFORM_mx6sx = "IMX6S" PLATFORM_mx6ul = "IMX6UL" +PLATFORM_mx6ull = "IMX6UL" PLATFORM_mx7d = "IMX7" PLATFORM_mx7ulp = "IMX7" diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index a54b439d..ba1507eb 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -4,7 +4,7 @@ require imx-mkimage_git.inc DESCRIPTION = "Generate Boot Loader for i.MX 8 device" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SECTION = "BSP" inherit use-imx-security-controller-firmware @@ -38,16 +38,7 @@ do_compile[depends] += " \ SC_FIRMWARE_NAME ?= "scfw_tcm.bin" -ATF_MACHINE_NAME ?= "bl31-imx8qm.bin" -ATF_MACHINE_NAME_mx8qm = "bl31-imx8qm.bin" -ATF_MACHINE_NAME_mx8x = "bl31-imx8qx.bin" -ATF_MACHINE_NAME_mx8mq = "bl31-imx8mq.bin" -ATF_MACHINE_NAME_mx8mm = "bl31-imx8mm.bin" -ATF_MACHINE_NAME_mx8mn = "bl31-imx8mn.bin" -ATF_MACHINE_NAME_mx8mp = "bl31-imx8mp.bin" -ATF_MACHINE_NAME_mx8phantomdxl = "bl31-imx8qx.bin" -ATF_MACHINE_NAME_mx8dxl = "bl31-imx8dxl.bin" -ATF_MACHINE_NAME_mx8dx = "bl31-imx8dx.bin" +ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin" ATF_MACHINE_NAME_append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}" UBOOT_NAME = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}" @@ -55,16 +46,7 @@ BOOT_CONFIG_MACHINE = "${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG}.bin" TOOLS_NAME ?= "mkimage_imx8" -SOC_TARGET ?= "INVALID" -SOC_TARGET_mx8qm = "iMX8QM" -SOC_TARGET_mx8x = "iMX8QX" -SOC_TARGET_mx8mq = "iMX8M" -SOC_TARGET_mx8mm = "iMX8MM" -SOC_TARGET_mx8mn = "iMX8MN" -SOC_TARGET_mx8mp = "iMX8MP" -SOC_TARGET_mx8dxl = "iMX8DXL" -SOC_TARGET_mx8phantomdxl = "iMX8QX" -SOC_TARGET_mx8dx = "iMX8DX" +IMX_BOOT_SOC_TARGET ?= "INVALID" DEPLOY_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" @@ -73,7 +55,7 @@ IMXBOOT_TARGETS ?= \ bb.utils.contains('UBOOT_CONFIG', 'nand', 'flash_nand', \ 'flash_multi_cores flash_dcd', d), d)}" -BOOT_STAGING = "${S}/${SOC_TARGET}" +BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}" BOOT_STAGING_mx8m = "${S}/iMX8M" BOOT_STAGING_mx8dx = "${S}/iMX8QX" @@ -83,7 +65,9 @@ SOC_FAMILY_mx8m = "mx8m" SOC_FAMILY_mx8x = "mx8x" REV_OPTION ?= "" -REV_OPTION_mx8qxpc0 = "REV=C0" +REV_OPTION_mx8qxp = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \ + 'REV=C0', d)}" compile_mx8m() { bbnote 8MQ/8MM/8MN/8MP boot binary build @@ -135,11 +119,11 @@ do_compile() { compile_${SOC_FAMILY} if [ "$target" = "flash_linux_m4_no_v2x" ]; then # Special target build for i.MX 8DXL with V2X off - bbnote "building ${SOC_TARGET} - ${REV_OPTION} V2X=NO ${target}" - make SOC=${SOC_TARGET} ${REV_OPTION} V2X=NO dtbs=${UBOOT_DTB_NAME} flash_linux_m4 + bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} V2X=NO ${target}" + make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} V2X=NO dtbs=${UBOOT_DTB_NAME} flash_linux_m4 else - bbnote "building ${SOC_TARGET} - ${REV_OPTION} ${target}" - make SOC=${SOC_TARGET} ${REV_OPTION} dtbs=${UBOOT_DTB_NAME} ${target} + bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${target}" + make SOC=${IMX_BOOT_SOC_TARGET} ${REV_OPTION} dtbs=${UBOOT_DTB_NAME} ${target} fi if [ -e "${BOOT_STAGING}/flash.bin" ]; then cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE}-${target} diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb index ed15c6f8..4e154f6d 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb @@ -5,15 +5,17 @@ require imx-mkimage_git.inc DESCRIPTION = "i.MX make image" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SECTION = "BSP" -inherit native deploy +inherit deploy native CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR} -L ${STAGING_LIBDIR}" REV_CHIP ?= "B0" -REV_CHIP_mx8qxpc0 = "C0" +REV_CHIP_mx8qxp = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'B0', \ + 'C0', d)}" do_compile () { cd ${S} diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc index 28eaff6e..1eba5109 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc @@ -1,10 +1,10 @@ -# Copyright 2017-2019 NXP +# Copyright 2017-2020 NXP DEPENDS = "zlib-native openssl-native" -SRCBRANCH = "imx_5.4.47_2.2.0" +SRCBRANCH = "imx_5.4.70_2.3.0" SRC_URI = "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}" -SRCREV = "8da5cd231881df44b5fa21a36820536d86e413db" +SRCREV = "8947fea369ab3932259630232cfb9f87b8f9dda1" S = "${WORKDIR}/git" BOOT_TOOLS = "imx-boot-tools" diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.6.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb index 2be864a3..ade228d0 100644 --- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.6.0.bb +++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb @@ -3,15 +3,15 @@ DESCRIPTION = "i.MX System Controller Firmware" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=983e4c77621568488dd902b27e0c2143" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" SECTION = "BSP" inherit fsl-eula-unpack pkgconfig deploy SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "1464ee5687abb9e7b9249940d23dfb3b" -SRC_URI[sha256sum] = "d3b04a49bcfdb5c7aa7e8f5ff89c040e9dfde0e8cb4b22bfb31f9cbb22a9d310" +SRC_URI[md5sum] = "962aebbb0100cc0e049fa88cea594a00" +SRC_URI[sha256sum] = "9a37353c07c187078be02d76ac55f615cd0c60ea9a1c4233c1929e4b2c43aebc" BOARD_TYPE ?= "mek" SC_FIRMWARE_NAME ?= "INVALID" diff --git a/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch b/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch new file mode 100644 index 00000000..757b9a6a --- /dev/null +++ b/recipes-bsp/imx-seco/imx-seco-libs/0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch @@ -0,0 +1,34 @@ +From 59608dcb0f0a6f6d8154b1d331c2403d7c1143eb Mon Sep 17 00:00:00 2001 +From: Cristinel Panfir <cristinel.panfir@nxp.com> +Date: Fri, 5 Feb 2021 19:27:00 +0200 +Subject: [PATCH] Makefile: Fix install to clear host-user-contaminated + warnings [HSM-483] + +WARNING: imx-seco-libs-git-r0 do_package_qa: QA Issue: +imx-seco-libs: /usr/lib/hsm_lib.a is owned by uid 26292, which is the same as the user running bitbake. This may be due to host contamination +imx-seco-libs: /usr/lib/she_lib.a is owned by uid 26292, which is the same as the user running bitbake. This may be due to host contamination +imx-seco-libs: /usr/lib/seco_nvm_manager.a is owned by uid 26292, which is the same as the user running bitbake. +This may be due to host contamination [host-user-contaminated] + +Upstream-Status: Pending + +Signed-off-by: Cristinel Panfir <cristinel.panfir@nxp.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 492d700..25ad333 100644 +--- a/Makefile ++++ b/Makefile +@@ -63,7 +63,7 @@ hsm_doc: include/hsm/hsm_api.h + + install: hsm_test she_test she_lib.a seco_nvm_manager.a hsm_lib.a + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR) +- cp -a seco_nvm_manager.a hsm_lib.a she_lib.a $(DESTDIR)$(LIBDIR) ++ cp seco_nvm_manager.a hsm_lib.a she_lib.a $(DESTDIR)$(LIBDIR) + cp hsm_test she_test $(DESTDIR)$(BINDIR) + cp -a include/* $(DESTDIR)$(INCLUDEDIR) + +-- +2.25.1 diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb index 8184b56a..dc37cdfc 100644 --- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb +++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb @@ -8,9 +8,10 @@ LIC_FILES_CHKSUM = "file://EULA.txt;md5=228c72f2a91452b8a03c4cab30f30ef9" DEPENDS = "zlib" -SRCBRANCH = "imx_5.4.47_2.2.0" -SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH}" -SRCREV = "5932c1e5240eb36c3cddc7bcbdc7abd9bd8b562c" +SRCBRANCH = "imx_5.4.70_2.3.1" +SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH} \ + file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch" +SRCREV = "79e5fb5d096c61b1c3163c9fa8e42719509d95a0" S = "${WORKDIR}/git" @@ -20,4 +21,4 @@ do_install () { oe_runmake DESTDIR=${D} install } -COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8qxpc0|mx8phantomdxl|mx8dxl)" +COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8phantomdxl|mx8dxl)" diff --git a/recipes-bsp/imx-seco/imx-seco_3.7.1.bb b/recipes-bsp/imx-seco/imx-seco_3.7.5.bb index 62c22dc2..0539b887 100644 --- a/recipes-bsp/imx-seco/imx-seco_3.7.1.bb +++ b/recipes-bsp/imx-seco/imx-seco_3.7.5.bb @@ -4,14 +4,14 @@ SUMMARY = "NXP i.MX SECO firmware" DESCRIPTION = "NXP IMX SECO firmware" SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=983e4c77621568488dd902b27e0c2143" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" inherit fsl-eula-unpack use-imx-security-controller-firmware deploy SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "29d563790bf46629a083ba031a7de46d" -SRC_URI[sha256sum] = "b09f63139df6c4dfef3533570cd60b22eb4c48eed05f314268178e80b8de40fc" +SRC_URI[md5sum] = "d4faca131abfc51a1dd0278d7d201159" +SRC_URI[sha256sum] = "08cf25a4be6841ca7264a50b29c311b386eae1c02fced8a3b55fd04213acb4bc" do_compile[noexec] = "1" @@ -23,4 +23,4 @@ do_deploy () { install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} } -COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8qxpc0|mx8phantomdxl|mx8dxl)" +COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8phantomdxl|mx8dxl)" diff --git a/recipes-bsp/imx-test/imx-test/0001-pxp-test-Fix-format-security-error.patch b/recipes-bsp/imx-test/imx-test/0001-pxp-test-Fix-format-security-error.patch deleted file mode 100644 index 1fe997d7..00000000 --- a/recipes-bsp/imx-test/imx-test/0001-pxp-test-Fix-format-security-error.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 97a55fe4b1e02b9a4992517234a8b24f8f9f0009 Mon Sep 17 00:00:00 2001 -From: "i.MX Yocto Project Build" <imx.build@nxp.com> -Date: Mon, 27 Jan 2020 13:43:47 -0600 -Subject: [PATCH] pxp test: Fix format-security error - -| pxp_lib_test/pxp_test.c: In function 'main': -| pxp_lib_test/pxp_test.c:541:2: error: format not a string literal and no format arguments [-Werror=format-security] -| 541 | printf(usage); -| | ^~~~~~ - -Upstream-Status: Pending - -Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> ---- - test/pxp_lib_test/pxp_test.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/pxp_lib_test/pxp_test.c b/test/pxp_lib_test/pxp_test.c -index 107198f..72c984d 100644 ---- a/test/pxp_lib_test/pxp_test.c -+++ b/test/pxp_lib_test/pxp_test.c -@@ -538,6 +538,6 @@ int main(int argc, char *argv[]) - - return 0; - usage: -- printf(usage); -+ printf("%s", usage); - return -1; - } --- -2.17.1 - diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index b9c12e18..4e139cc4 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb @@ -5,8 +5,8 @@ SUMMARY = "Test programs for i.MX BSP" DESCRIPTION = "Unit tests for the i.MX BSP" SECTION = "base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" DEPENDS = "alsa-lib libdrm" DEPENDS_append_mx6 = " imx-lib" @@ -16,13 +16,12 @@ DEPENDS_append_imxvpu = " virtual/imxvpu" PE = "1" PV = "7.0+${SRCPV}" -SRCBRANCH = "imx_5.4.47_2.2.0" +SRCBRANCH = "imx_5.4.70_2.3.0" SRC_URI = " \ git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-pxp-test-Fix-format-security-error.patch \ file://memtool_profile \ " -SRCREV = "31623a4972bf6f2f4239b4667aeb33baba07a3c8" +SRCREV = "90fd7168fe5f15de9b2b1992a719024fc73a185a" S = "${WORKDIR}/git" inherit module-base use-imx-headers @@ -48,6 +47,7 @@ PACKAGECONFIG_append_imxvpu = " vpu" PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr" PACKAGECONFIG[vpu] = "HAS_VPU=true,HAS_VPU=false,virtual/imxvpu" +PACKAGECONFIG[swpdm] = "HAS_IMX_SW_PDM=true,HAS_IMX_SW_PDM=false,imx-sw-pdm" do_compile() { CFLAGS="${TOOLCHAIN_OPTIONS}" diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.2.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.2.0.bb deleted file mode 100644 index 425f5994..00000000 --- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.2.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2019-2020 NXP - -DESCRIPTION = "i.MX VC8000E Encoder library" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=983e4c77621568488dd902b27e0c2143" - -inherit fsl-eula-unpack - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" - -S = "${WORKDIR}/${BPN}-${PV}" - -SRC_URI[md5sum] = "d2b7c0cfdb380e5a65a94251c2437a34" -SRC_URI[sha256sum] = "10a7f60964feb9641291815876fb8110dfec603c6451ed9b9c7fe57c23afd10e" - -COMPATIBLE_MACHINE = "(imx8mpevk)" diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.3.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.3.0.bb new file mode 100644 index 00000000..bd087898 --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.3.0.bb @@ -0,0 +1,35 @@ +# Copyright (C) 2019-2020 NXP + +DESCRIPTION = "i.MX VC8000E Encoder library" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" + +S = "${WORKDIR}/${BPN}-${PV}" + +SRC_URI[md5sum] = "37c61718602ff08041b81319cfd6a8d9" +SRC_URI[sha256sum] = "8425796fc63d7107f2f57c51497281c4d54c883b2670817347fbe55f39dc2b8c" + +# SCR is the location and name of the Software Content Register file +# relative to ${D}${D_SUBDIR}. +SCR = "SCR.txt" + +do_install () { + install -d ${D}${D_SUBDIR} + cp -r ${S}/* ${D}${D_SUBDIR} + if [ -d "${D}/usr/lib" ] && [ "${D}/usr/lib" != "${D}${libdir}" ]; then + mv ${D}/usr/lib ${D}${libdir} + fi + rm ${D}${D_SUBDIR}/COPYING + if [ ! -f ${D}${D_SUBDIR}/${SCR} ]; then + bbfatal "Missing Software Content Register \"${D}${D_SUBDIR}/${SCR}\"" + fi + rm ${D}${D_SUBDIR}/${SCR} +} + +FILES_${PN} = "/" + +COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.19.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.20.0.bb index 1e347ca8..b7c64cbb 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.19.0.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.20.0.bb @@ -2,16 +2,15 @@ DESCRIPTION = "i.MX Hantro VPU library" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=983e4c77621568488dd902b27e0c2143" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" PROVIDES = "virtual/imxvpu" SRC_URI = " \ ${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \ - file://0001-decoder_sw-resolve-compilation-error-with-fcommon.patch \ " -SRC_URI[md5sum] = "05a2c37fddcabdadd5fa37d3a38914c6" -SRC_URI[sha256sum] = "261cab83954bd66e95b1650a737cb36261a2098597d904e517da638097ed4fd2" +SRC_URI[md5sum] = "682b3a73bf5aa22a37d56a433d11fc91" +SRC_URI[sha256sum] = "e6cdd5b4c628604906466fc9620e2b048cf1b2c863f9ee49616dd5212b9261b0" inherit fsl-eula-unpack use-imx-headers diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.6.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.6.0.bb new file mode 100644 index 00000000..369ca5ce --- /dev/null +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.6.0.bb @@ -0,0 +1,27 @@ +# Copyright 2020 NXP + +DESCRIPTION = "Basler camera binary drivers" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "8c94839802598853f7b91f6386b4643e" +SRC_URI[sha256sum] = "6456dbb0095d988cce65f94e92a3ea80d796e02fd410987c937cfc0a09ca2e4a" + +do_install() { + dest_dir=${D}/opt/imx8-isp/bin + install -d ${D}/${libdir} + install -d $dest_dir + cp -r ${S}/opt/imx8-isp/bin/* $dest_dir + cp -r ${S}/usr/lib/* ${D}/${libdir} +} + +SYSTEMD_AUTO_ENABLE = "enable" + +FILES_${PN} = "${libdir} /opt" +INSANE_SKIP_${PN} = "file-rdeps already-stripped" + +COMPATIBLE_MACHINE = "(imx|use-nxp-bsp)" diff --git a/recipes-bsp/isp-imx/isp-imx/0001-BufferManager.h-add-missing-header-file.patch b/recipes-bsp/isp-imx/isp-imx/0001-BufferManager.h-add-missing-header-file.patch new file mode 100644 index 00000000..725a9907 --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx/0001-BufferManager.h-add-missing-header-file.patch @@ -0,0 +1,27 @@ +From 325b4bf687ead6598de702df9829a4dad0b6458c Mon Sep 17 00:00:00 2001 +From: Chris Dimich <Chris.Dimich@boundarydevices.com> +Date: Mon, 15 Feb 2021 22:51:01 -0800 +Subject: [PATCH 1/1] BufferManager.h: add missing header file + +Needed to compile with Yocto Gatesgarth. + +Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com> +--- + mediacontrol/buffer/BufferManager.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mediacontrol/buffer/BufferManager.h b/mediacontrol/buffer/BufferManager.h +index f5691e111..4d5ce6965 100755 +--- a/mediacontrol/buffer/BufferManager.h ++++ b/mediacontrol/buffer/BufferManager.h +@@ -16,6 +16,7 @@ + #include <deque> + #include <map> + #include <EAutoLock.h> ++#include <stdint.h> + + enum { + BUFFER_TYPE_INPUT_FREE = 0, +-- +2.29.0 + diff --git a/recipes-bsp/isp-imx/isp-imx/0001-imx8-isp.service-do-not-prevent-restart-of-service.patch b/recipes-bsp/isp-imx/isp-imx/0001-imx8-isp.service-do-not-prevent-restart-of-service.patch new file mode 100644 index 00000000..86391d4b --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx/0001-imx8-isp.service-do-not-prevent-restart-of-service.patch @@ -0,0 +1,26 @@ +From ce8dd8db37de85952419a5b28a48ec20d1310cf7 Mon Sep 17 00:00:00 2001 +From: Chris Dimich <Chris.Dimich@boundarydevices.com> +Date: Wed, 17 Feb 2021 14:09:39 -0800 +Subject: [PATCH 1/1] imx8-isp.service: do not prevent restart of service + +Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com> +--- + imx/imx8-isp.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/imx/imx8-isp.service b/imx/imx8-isp.service +index 93d2e9b3a..4f0cd88ca 100644 +--- a/imx/imx8-isp.service ++++ b/imx/imx8-isp.service +@@ -10,7 +10,7 @@ StartLimitBurst=5 + Restart=on-failure + RestartSec=5s + # ENXIO +-RestartPreventExitStatus=6 ++#RestartPreventExitStatus=6 + ExecStart=/opt/imx8-isp/bin/start_isp.sh + + [Install] +-- +2.29.0 + diff --git a/recipes-bsp/isp-imx/isp-imx/0001-run.sh-fix-bashism.patch b/recipes-bsp/isp-imx/isp-imx/0001-run.sh-fix-bashism.patch new file mode 100644 index 00000000..715bed2a --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx/0001-run.sh-fix-bashism.patch @@ -0,0 +1,23 @@ +From 7070abd558e753b89955a966bb83e11f5a7b8462 Mon Sep 17 00:00:00 2001 +From: Chris Dimich <Chris.Dimich@boundarydevices.com> +Date: Wed, 17 Feb 2021 14:06:26 -0800 +Subject: [PATCH 1/1] run.sh: fix bashism + +Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com> +--- + imx/run.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/imx/run.sh b/imx/run.sh +index c0d676ae7..ebeb7a6e7 100755 +--- a/imx/run.sh ++++ b/imx/run.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Start the isp_media_server in the configuration from user + # (c) NXP 2020 +-- +2.29.0 + diff --git a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-test-to-be-generic.patch b/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-test-to-be-generic.patch new file mode 100644 index 00000000..cb93223e --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-test-to-be-generic.patch @@ -0,0 +1,46 @@ +From 708f25cfe522df162c3e2c7c56cbe2f7000cb5e4 Mon Sep 17 00:00:00 2001 +From: Gary Bisson <gary.bisson@boundarydevices.com> +Date: Mon, 14 Dec 2020 14:26:01 +0100 +Subject: [PATCH] start_isp.sh: fix test to be generic + +So that it works on EVK and any other i.MX 8M Plus platform. + +Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> +--- + imx/start_isp.sh | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/imx/start_isp.sh b/imx/start_isp.sh +index 02ee7d3b5..fee0492ad 100755 +--- a/imx/start_isp.sh ++++ b/imx/start_isp.sh +@@ -7,21 +7,18 @@ + # + + RUNTIME_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" +-DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l 2> /dev/null) +- ++BASLER=`dmesg | grep Basler` + + # check if the basler device has been enabled in the device tree +-if [ -f "$DEVICE_TREE_BASLER" ]; then +- ++if [ ! -z "$BASLER" ]; then + echo "Starting isp_media_server for Basler daA3840-30mc" +- + cd $RUNTIME_DIR + # Default configuration for Basler daA3840-30mc: basler_4k + # Available configurations: basler_4k, basler_1080p60, basler_4khdr, basler_1080p60hdr +- exec ./run.sh -c basler_4k -lm +- ++ #exec ./run.sh -c basler_4k ++ exec ./run.sh -c basler_1080p60 + else + # no device tree found exit with code no device or address +- echo "No device tree found for Basler, check dtb file!" >&2 ++ echo "Basler camera not found!" >&2 + exit 6 + fi +-- +2.29.2 + diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.6.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.6.0.bb new file mode 100644 index 00000000..363089f0 --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.6.0.bb @@ -0,0 +1,84 @@ +# Copyright 2020 NXP + +DESCRIPTION = "i.MX Verisilicon Software ISP" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" + + +inherit fsl-eula-unpack cmake systemd + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \ + file://0001-BufferManager.h-add-missing-header-file.patch;patchdir=.. \ + file://0001-imx8-isp.service-do-not-prevent-restart-of-service.patch;patchdir=.. \ + file://0001-run.sh-fix-bashism.patch;patchdir=.. \ + file://0001-start_isp.sh-fix-test-to-be-generic.patch;patchdir=.. \ +" + +SRC_URI[md5sum] = "2246009411af32b1e02fbb0b242a0fc0" +SRC_URI[sha256sum] = "7a245abb5fee23319f59b970db0bb014a2932fd6d5bd44f16f7dd31bbe25003a" + +S = "${WORKDIR}/${PN}-${PV}/appshell" + +DEPENDS = "python3 libdrm" + +OECMAKE_GENERATOR = "Unix Makefiles" + +SYSTEMD_SERVICE_${PN} = "imx8-isp.service" + +EXTRA_OECMAKE += " \ + -DCMAKE_BUILD_TYPE=release \ + -DISP_VERSION=ISP8000NANO_V1802 \ + -DPLATFORM=ARM64 \ + -DAPPMODE=V4L2 \ + -DQTLESS=1 \ + -DFULL_SRC_COMPILE=1 \ + -DWITH_DRM=1 \ + -DWITH_DWE=1 \ + -DSERVER_LESS=1 \ + -DSUBDEV_V4L2=1 \ + -DENABLE_IRQ=1 \ + -DPARTITION_BUILD=0 \ + -D3A_SRC_BUILD=0 \ + -Wno-dev \ +" + +do_configure_prepend() { + export SDKTARGETSYSROOT=${STAGING_DIR_HOST} +} + +do_install() { + install -d ${D}/${libdir} + install -d ${D}/${includedir} + install -d ${D}/opt/imx8-isp/bin + + cp -r ${WORKDIR}/build/generated/release/bin/*_test ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/build/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/build/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/build/generated/release/bin/vvext ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/${PN}-${PV}/mediacontrol/case/ ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir} + cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir} + + cp ${WORKDIR}/${PN}-${PV}/imx/run.sh ${D}/opt/imx8-isp/bin + cp ${WORKDIR}/${PN}-${PV}/imx/start_isp.sh ${D}/opt/imx8-isp/bin + + chmod +x ${D}/opt/imx8-isp/bin/run.sh + chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/${PN}-${PV}/imx/imx8-isp.service ${D}${systemd_system_unitdir} + fi +} + +RDEPENDS_${PN} = "libdrm libpython3" + +PACKAGES = "${PN} ${PN}-dev ${PN}-dbg" + +FILES_${PN} = "${libdir} /opt ${systemd_system_unitdir}/imx8-isp.service" +FILES_${PN}-dbg += "${libdir}/.debug" + +INSANE_SKIP_${PN} += "rpaths dev-deps dev-so" +INSANE_SKIP_${PN}-dev += "rpaths dev-elf" + +COMPATIBLE_MACHINE = "(imx|use-nxp-bsp)" diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb index 31645061..b3c79b99 100644 --- a/recipes-bsp/mc-utils/mc-utils_git.bb +++ b/recipes-bsp/mc-utils/mc-utils_git.bb @@ -10,7 +10,7 @@ DEPENDS += "dtc-native" inherit deploy SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/mc-utils;nobranch=1" -SRCREV = "8672a5f5abcd3a354dcab07e03f2a8a69b2e962d" +SRCREV = "8e0b863693fc2ccbc62a62c79b4e3db6da88c16e" S = "${WORKDIR}/git" @@ -18,8 +18,10 @@ MC_CFG ?= "" MC_CFG_ls1088a = "ls1088a" MC_CFG_ls2088a = "ls2088a" MC_CFG_lx2160a = "lx2160a" +MC_CFG_lx2162aqds = "lx2162aqds" MC_FLAVOUR ?= "RDB" +MC_FLAVOUR_lx2162a = "" do_compile () { oe_runmake -C config diff --git a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb index fd53807f..24bb8d9f 100644 --- a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb +++ b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb @@ -8,7 +8,7 @@ INHIBIT_DEFAULT_DEPS = "1" inherit deploy SRC_URI = "git://github.com/NXP/qoriq-engine-pfe-bin.git;nobranch=1" -SRCREV = "d3a8ef0760c54ddc243039c86389497e37be90ab" +SRCREV = "f55ee9f72090309bbb7ab71f48a498fc02909234" S = "${WORKDIR}/git" diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb index e1e63cce..b09a158e 100644 --- a/recipes-bsp/rcw/rcw_git.bb +++ b/recipes-bsp/rcw/rcw_git.bb @@ -8,7 +8,7 @@ DEPENDS += "tcl-native" inherit deploy siteinfo SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/rcw;nobranch=1" -SRCREV = "e0fab6d9b61003caef577f7474c2fac61e6ba2ff" +SRCREV = "bd6675518e6cb22f731c53407cc0631aa240f49f" S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2020.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2020.10.inc index 94db11cc..b0e665e0 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2020.04.inc +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2020.10.inc @@ -4,16 +4,16 @@ inherit fsl-u-boot-localversion LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025" DEPENDS += "bison-native" SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" -SRCREV = "88c58453be8cd87eb55f8e283ac4dcce5b59006d" -SRCBRANCH = "2020.04+fslc" +SRCREV = "80c23498b425447a4a04d2a85ca4c2aec6ec349a" +SRCBRANCH = "2020.10+fslc" -PV = "v2020.04+git${SRCPV}" +PV = "v2020.10+git${SRCPV}" S = "${WORKDIR}/git" B = "${WORKDIR}/build" diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.10.bb new file mode 100644 index 00000000..7f02746b --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.10.bb @@ -0,0 +1,8 @@ +# Copyright (C) 2014 O.S. Systems Software LTDA. +# Copyright (C) 2014-2016 Freescale Semiconductor +# Copyright 2017-2019 NXP + +FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-fslc:" + +require u-boot-fslc_${PV}.bb +require u-boot-mfgtool.inc diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.10.bb index 2492f450..2492f450 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.04.bb +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2020.10.bb diff --git a/recipes-bsp/u-boot/u-boot-fslc_2020.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2020.04.bb deleted file mode 100644 index 64588efc..00000000 --- a/recipes-bsp/u-boot/u-boot-fslc_2020.04.bb +++ /dev/null @@ -1,23 +0,0 @@ -require recipes-bsp/u-boot/u-boot.inc -require u-boot-fslc-common_${PV}.inc - -DESCRIPTION = "U-Boot based on mainline U-Boot used by FSL Community BSP in \ -order to provide support for some backported features and fixes, or because it \ -was submitted for revision and it takes some time to become part of a stable \ -version, or because it is not applicable for upstreaming." - -DEPENDS_append = " bc-native dtc-native lzop-native" - -PROVIDES += "u-boot" - -B = "${WORKDIR}/build" - -# FIXME: Allow linking of 'tools' binaries with native libraries -# used for generating the boot logo and other tools used -# during the build process. -EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ - HOSTLDFLAGS="${BUILD_LDFLAGS}" \ - HOSTSTRIP=true' - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2020.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2020.10.bb new file mode 100644 index 00000000..86620c44 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc_2020.10.bb @@ -0,0 +1,73 @@ +require recipes-bsp/u-boot/u-boot.inc +require u-boot-fslc-common_${PV}.inc + +DESCRIPTION = "U-Boot based on mainline U-Boot used by FSL Community BSP in \ +order to provide support for some backported features and fixes, or because it \ +was submitted for revision and it takes some time to become part of a stable \ +version, or because it is not applicable for upstreaming." + +inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')} + +DEPENDS += "bc-native dtc-native lzop-native" + +# Location known to imx-boot component, where U-Boot artifacts +# should be additionally deployed. +# See below note above do_deploy_append_mx8m for the purpose of +# this delopyment location +BOOT_TOOLS = "imx-boot-tools" + +PROVIDES += "u-boot" + +B = "${WORKDIR}/build" + +# FIXME: Allow linking of 'tools' binaries with native libraries +# used for generating the boot logo and other tools used +# during the build process. +EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ + HOSTLDFLAGS="${BUILD_LDFLAGS}" \ + HOSTSTRIP=true' + +# +# imx8m machines require additional deployment tasks to be +# carried out due to the fact that final boot image is constructed +# using imx-boot recipe. It produces a boot binary image, which is +# constructed from various binary components (u-boot with separate +# dtb, atf, DDR firmware and optional op-tee) into a single image +# using FIT format. This image is then parsed and loaded either via +# SPL directly (imx8mm), or using bootrom code (imx8mn and imx8mp). +# +# In order for imx-boot to construct the final binary boot image, +# it is required that the U-Boot dtb files are to be deployed into +# a location known by imx-boot so they could be picked up and +# inserted into the boot container. +# +# NOTE: This is only applicable to those derivatives of mx8m family, +# which did not adopt the boot container mechanism provided by U-Boot +# build system itself. U-Boot is capable of producing a result binary, +# which includes all those deployed pieces below, hence once derivative +# starts to use it - below append would not be necessary. +# Once all mx8m derivatives are migrated to use the 'flash.bin' boot +# container - this append can be dropped completely. +do_deploy_append_mx8m() { + # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary + if [ -n "${UBOOT_CONFIG}" ]; then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -d ${DEPLOYDIR}/${BOOT_TOOLS} + install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} + install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} + fi + done + unset j + done + unset i + fi +} + + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)" diff --git a/recipes-bsp/u-boot/u-boot-imx-common.inc b/recipes-bsp/u-boot/u-boot-imx-common.inc index fd5371bb..2a08aa8a 100644 --- a/recipes-bsp/u-boot/u-boot-imx-common.inc +++ b/recipes-bsp/u-boot/u-boot-imx-common.inc @@ -3,9 +3,9 @@ DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards." LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCBRANCH = "imx_v2020.04_5.4.47_2.2.0" +SRCBRANCH = "imx_v2020.04_5.4.70_2.3.0" SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" -SRCREV = "ffc3fbe7e5418d16f492c78693c3c4fa41f06f27" +SRCREV = "e42dee801ec55bc40347cbb98f13bfb5899f0368" DEPENDS += "flex-native bison-native bc-native dtc-native" diff --git a/recipes-bsp/u-boot/u-boot-imx-tools_2020.04.bb b/recipes-bsp/u-boot/u-boot-imx-tools_2020.04.bb index 12ac72e2..d1e9512c 100644 --- a/recipes-bsp/u-boot/u-boot-imx-tools_2020.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx-tools_2020.04.bb @@ -6,5 +6,10 @@ PROVIDES_append_class-native = " u-boot-tools-native" PROVIDES_append_class-nativesdk = " nativesdk-u-boot-tools" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" -COMPATIBLE_MACHINE_class-target = "(mx6|mx7|mx8)" + +# Set recipe as incompatible by default +COMPATIBLE_MACHINE = "(^$)" + +# Whitelist its use for i.MX based machines +COMPATIBLE_MACHINE_use-mainline-bsp = "(.)" +COMPATIBLE_MACHINE_use-nxp-bsp = "(.)" diff --git a/recipes-bsp/u-boot/u-boot-imx_2020.04.bb b/recipes-bsp/u-boot/u-boot-imx_2020.04.bb index b36730e0..55d3e7c5 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2020.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2020.04.bb @@ -29,4 +29,4 @@ do_deploy_append_mx8m() { } PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" +COMPATIBLE_MACHINE = "(mx6|mx7|mx8|use-mainline-bsp)" diff --git a/recipes-bsp/u-boot/u-boot-qoriq/0001-Remove-redundant-YYLOC-global-declaration.patch b/recipes-bsp/u-boot/u-boot-qoriq/0001-Remove-redundant-YYLOC-global-declaration.patch deleted file mode 100644 index 2609760c..00000000 --- a/recipes-bsp/u-boot/u-boot-qoriq/0001-Remove-redundant-YYLOC-global-declaration.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 018921ee79d3f30893614b3b2b63b588d8544f73 Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Thu, 30 Jan 2020 09:37:15 +0000 -Subject: [PATCH] Remove redundant YYLOC global declaration - -Same as the upstream fix for building dtc with gcc 10. - -Upstream-Status: Backport - -Signed-off-by: Peter Robinson <pbrobinson@gmail.com> ---- - scripts/dtc/dtc-lexer.l | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l -index fd825ebba69c..24af54997758 100644 ---- a/scripts/dtc/dtc-lexer.l -+++ b/scripts/dtc/dtc-lexer.l -@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n - #include "srcpos.h" - #include "dtc-parser.tab.h" - --YYLTYPE yylloc; - extern bool treesource_error; - - /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ --- -2.26.2 - diff --git a/recipes-bsp/u-boot/u-boot-qoriq/0001-binman-Convert-a-few-tests-to-Python-3.patch b/recipes-bsp/u-boot/u-boot-qoriq/0001-binman-Convert-a-few-tests-to-Python-3.patch deleted file mode 100644 index e530b7ca..00000000 --- a/recipes-bsp/u-boot/u-boot-qoriq/0001-binman-Convert-a-few-tests-to-Python-3.patch +++ /dev/null @@ -1,79 +0,0 @@ -From b6ee0cf89f9405094cbb6047076a13e14ebc030b Mon Sep 17 00:00:00 2001 -From: Simon Glass <sjg@chromium.org> -Date: Thu, 31 Oct 2019 07:43:03 -0600 -Subject: [PATCH] binman: Convert a few tests to Python 3 - -Some tests have crept in with Python 2 strings and constructs. Convert -then. - -Upstream-Status: Backport - -Signed-off-by: Simon Glass <sjg@chromium.org> ---- - tools/binman/ftest.py | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py -index 93507993a0..80df0e3ca9 100644 ---- a/tools/binman/ftest.py -+++ b/tools/binman/ftest.py -@@ -2113,7 +2113,7 @@ class TestFunctional(unittest.TestCase): - data = self.data = self._DoReadFileRealDtb('115_fdtmap.dts') - fdtmap_data = data[len(U_BOOT_DATA):] - magic = fdtmap_data[:8] -- self.assertEqual('_FDTMAP_', magic) -+ self.assertEqual(b'_FDTMAP_', magic) - self.assertEqual(tools.GetBytes(0, 8), fdtmap_data[8:16]) - - fdt_data = fdtmap_data[16:] -@@ -2156,7 +2156,7 @@ class TestFunctional(unittest.TestCase): - dtb = fdt.Fdt.FromData(fdt_data) - fdt_size = dtb.GetFdtObj().totalsize() - hdr_data = data[-8:] -- self.assertEqual('BinM', hdr_data[:4]) -+ self.assertEqual(b'BinM', hdr_data[:4]) - offset = struct.unpack('<I', hdr_data[4:])[0] & 0xffffffff - self.assertEqual(fdtmap_pos - 0x400, offset - (1 << 32)) - -@@ -2165,7 +2165,7 @@ class TestFunctional(unittest.TestCase): - data = self.data = self._DoReadFileRealDtb('117_fdtmap_hdr_start.dts') - fdtmap_pos = 0x100 + len(U_BOOT_DATA) - hdr_data = data[:8] -- self.assertEqual('BinM', hdr_data[:4]) -+ self.assertEqual(b'BinM', hdr_data[:4]) - offset = struct.unpack('<I', hdr_data[4:])[0] - self.assertEqual(fdtmap_pos, offset) - -@@ -2174,7 +2174,7 @@ class TestFunctional(unittest.TestCase): - data = self.data = self._DoReadFileRealDtb('118_fdtmap_hdr_pos.dts') - fdtmap_pos = 0x100 + len(U_BOOT_DATA) - hdr_data = data[0x80:0x88] -- self.assertEqual('BinM', hdr_data[:4]) -+ self.assertEqual(b'BinM', hdr_data[:4]) - offset = struct.unpack('<I', hdr_data[4:])[0] - self.assertEqual(fdtmap_pos, offset) - -@@ -2435,9 +2435,9 @@ class TestFunctional(unittest.TestCase): - ' section 100 %x section 100' % section_size, - ' cbfs 100 400 cbfs 0', - ' u-boot 138 4 u-boot 38', --' u-boot-dtb 180 10f u-boot-dtb 80 3c9', -+' u-boot-dtb 180 105 u-boot-dtb 80 3c9', - ' u-boot-dtb 500 %x u-boot-dtb 400 3c9' % fdt_size, --' fdtmap %x 3b4 fdtmap %x' % -+' fdtmap %x 3bd fdtmap %x' % - (fdtmap_offset, fdtmap_offset), - ' image-header bf8 8 image-header bf8', - ] -@@ -2522,7 +2522,7 @@ class TestFunctional(unittest.TestCase): - data = self._RunExtractCmd('section') - cbfs_data = data[:0x400] - cbfs = cbfs_util.CbfsReader(cbfs_data) -- self.assertEqual(['u-boot', 'u-boot-dtb', ''], cbfs.files.keys()) -+ self.assertEqual(['u-boot', 'u-boot-dtb', ''], list(cbfs.files.keys())) - dtb_data = data[0x400:] - dtb = self._decompress(dtb_data) - self.assertEqual(EXTRACT_DTB_SIZE, len(dtb)) --- -2.24.0 - diff --git a/recipes-bsp/u-boot/u-boot-qoriq/0001-binman-Move-to-use-Python-3.patch b/recipes-bsp/u-boot/u-boot-qoriq/0001-binman-Move-to-use-Python-3.patch deleted file mode 100644 index c1a05b32..00000000 --- a/recipes-bsp/u-boot/u-boot-qoriq/0001-binman-Move-to-use-Python-3.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 388560134b99dc4cc752627d3a7e9f8c8c2a89a7 Mon Sep 17 00:00:00 2001 -From: Simon Glass <sjg@chromium.org> -Date: Thu, 31 Oct 2019 07:43:05 -0600 -Subject: [PATCH] binman: Move to use Python 3 - -Update this tool to use Python 3 to meet the 2020 deadline. - -Unfortunately this introduces a test failure due to a problem in pylibfdt -on Python 3. I will investigate. - -Upstream-Status: Backport - -Signed-off-by: Simon Glass <sjg@chromium.org> ---- - tools/binman/binman.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/binman/binman.py b/tools/binman/binman.py -index 8bd5868df2..9e6fd72117 100755 ---- a/tools/binman/binman.py -+++ b/tools/binman/binman.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python3 - # SPDX-License-Identifier: GPL-2.0+ - - # Copyright (c) 2016 Google, Inc --- -2.24.0 - diff --git a/recipes-bsp/u-boot/u-boot-qoriq/0001-buildman-Convert-to-Python-3.patch b/recipes-bsp/u-boot/u-boot-qoriq/0001-buildman-Convert-to-Python-3.patch deleted file mode 100644 index 5d7ec42f..00000000 --- a/recipes-bsp/u-boot/u-boot-qoriq/0001-buildman-Convert-to-Python-3.patch +++ /dev/null @@ -1,928 +0,0 @@ -From c05aa0364280803d8274e260a739553d588ea052 Mon Sep 17 00:00:00 2001 -From: Simon Glass <sjg@chromium.org> -Date: Thu, 31 Oct 2019 07:42:53 -0600 -Subject: [PATCH] buildman: Convert to Python 3 - -Convert buildman to Python 3 and make it use that, to meet the 2020 -deadline. - -Upstream-Status: Backport - -Signed-off-by: Simon Glass <sjg@chromium.org> ---- - tools/buildman/board.py | 9 +-- - tools/buildman/bsettings.py | 20 +++---- - tools/buildman/builder.py | 47 ++++++++-------- - tools/buildman/builderthread.py | 24 ++++---- - tools/buildman/buildman.py | 10 ++-- - tools/buildman/control.py | 44 +++++++-------- - tools/buildman/func_test.py | 16 +++--- - tools/buildman/test.py | 22 ++++---- - tools/buildman/toolchain.py | 99 +++++++++++++++++---------------- - 9 files changed, 146 insertions(+), 145 deletions(-) - -diff --git a/tools/buildman/board.py b/tools/buildman/board.py -index 2a1d021574..447aaabea8 100644 ---- a/tools/buildman/board.py -+++ b/tools/buildman/board.py -@@ -1,6 +1,7 @@ - # SPDX-License-Identifier: GPL-2.0+ - # Copyright (c) 2012 The Chromium OS Authors. - -+from collections import OrderedDict - import re - - class Expr: -@@ -120,7 +121,7 @@ class Boards: - Args: - fname: Filename of boards.cfg file - """ -- with open(fname, 'r') as fd: -+ with open(fname, 'r', encoding='utf-8') as fd: - for line in fd: - if line[0] == '#': - continue -@@ -155,7 +156,7 @@ class Boards: - key is board.target - value is board - """ -- board_dict = {} -+ board_dict = OrderedDict() - for board in self._boards: - board_dict[board.target] = board - return board_dict -@@ -166,7 +167,7 @@ class Boards: - Returns: - List of Board objects that are marked selected - """ -- board_dict = {} -+ board_dict = OrderedDict() - for board in self._boards: - if board.build_it: - board_dict[board.target] = board -@@ -259,7 +260,7 @@ class Boards: - due to each argument, arranged by argument. - List of errors found - """ -- result = {} -+ result = OrderedDict() - warnings = [] - terms = self._BuildTerms(args) - -diff --git a/tools/buildman/bsettings.py b/tools/buildman/bsettings.py -index 03d7439aa5..0b7208da37 100644 ---- a/tools/buildman/bsettings.py -+++ b/tools/buildman/bsettings.py -@@ -1,9 +1,9 @@ - # SPDX-License-Identifier: GPL-2.0+ - # Copyright (c) 2012 The Chromium OS Authors. - --import ConfigParser -+import configparser - import os --import StringIO -+import io - - - def Setup(fname=''): -@@ -15,20 +15,20 @@ def Setup(fname=''): - global settings - global config_fname - -- settings = ConfigParser.SafeConfigParser() -+ settings = configparser.SafeConfigParser() - if fname is not None: - config_fname = fname - if config_fname == '': - config_fname = '%s/.buildman' % os.getenv('HOME') - if not os.path.exists(config_fname): -- print 'No config file found ~/.buildman\nCreating one...\n' -+ print('No config file found ~/.buildman\nCreating one...\n') - CreateBuildmanConfigFile(config_fname) -- print 'To install tool chains, please use the --fetch-arch option' -+ print('To install tool chains, please use the --fetch-arch option') - if config_fname: - settings.read(config_fname) - - def AddFile(data): -- settings.readfp(StringIO.StringIO(data)) -+ settings.readfp(io.StringIO(data)) - - def GetItems(section): - """Get the items from a section of the config. -@@ -41,7 +41,7 @@ def GetItems(section): - """ - try: - return settings.items(section) -- except ConfigParser.NoSectionError as e: -+ except configparser.NoSectionError as e: - return [] - except: - raise -@@ -68,10 +68,10 @@ def CreateBuildmanConfigFile(config_fname): - try: - f = open(config_fname, 'w') - except IOError: -- print "Couldn't create buildman config file '%s'\n" % config_fname -+ print("Couldn't create buildman config file '%s'\n" % config_fname) - raise - -- print >>f, '''[toolchain] -+ print('''[toolchain] - # name = path - # e.g. x86 = /opt/gcc-4.6.3-nolibc/x86_64-linux - -@@ -93,5 +93,5 @@ openrisc = or1k - # snapper-boards=ENABLE_AT91_TEST=1 - # snapper9260=${snapper-boards} BUILD_TAG=442 - # snapper9g45=${snapper-boards} BUILD_TAG=443 --''' -+''', file=f) - f.close(); -diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py -index fbb236676c..cfbe4c26b1 100644 ---- a/tools/buildman/builder.py -+++ b/tools/buildman/builder.py -@@ -9,7 +9,7 @@ from datetime import datetime, timedelta - import glob - import os - import re --import Queue -+import queue - import shutil - import signal - import string -@@ -92,11 +92,10 @@ u-boot/ source directory - """ - - # Possible build outcomes --OUTCOME_OK, OUTCOME_WARNING, OUTCOME_ERROR, OUTCOME_UNKNOWN = range(4) -+OUTCOME_OK, OUTCOME_WARNING, OUTCOME_ERROR, OUTCOME_UNKNOWN = list(range(4)) - - # Translate a commit subject into a valid filename (and handle unicode) --trans_valid_chars = string.maketrans('/: ', '---') --trans_valid_chars = trans_valid_chars.decode('latin-1') -+trans_valid_chars = str.maketrans('/: ', '---') - - BASE_CONFIG_FILENAMES = [ - 'u-boot.cfg', 'u-boot-spl.cfg', 'u-boot-tpl.cfg' -@@ -122,8 +121,8 @@ class Config: - def __hash__(self): - val = 0 - for fname in self.config: -- for key, value in self.config[fname].iteritems(): -- print key, value -+ for key, value in self.config[fname].items(): -+ print(key, value) - val = val ^ hash(key) & hash(value) - return val - -@@ -293,8 +292,8 @@ class Builder: - self._re_dtb_warning = re.compile('(.*): Warning .*') - self._re_note = re.compile('(.*):(\d*):(\d*): note: this is the location of the previous.*') - -- self.queue = Queue.Queue() -- self.out_queue = Queue.Queue() -+ self.queue = queue.Queue() -+ self.out_queue = queue.Queue() - for i in range(self.num_threads): - t = builderthread.BuilderThread(self, i, incremental, - per_board_out_dir) -@@ -781,7 +780,7 @@ class Builder: - config = {} - environment = {} - -- for board in boards_selected.itervalues(): -+ for board in boards_selected.values(): - outcome = self.GetBuildOutcome(commit_upto, board.target, - read_func_sizes, read_config, - read_environment) -@@ -814,13 +813,13 @@ class Builder: - tconfig = Config(self.config_filenames, board.target) - for fname in self.config_filenames: - if outcome.config: -- for key, value in outcome.config[fname].iteritems(): -+ for key, value in outcome.config[fname].items(): - tconfig.Add(fname, key, value) - config[board.target] = tconfig - - tenvironment = Environment(board.target) - if outcome.environment: -- for key, value in outcome.environment.iteritems(): -+ for key, value in outcome.environment.items(): - tenvironment.Add(key, value) - environment[board.target] = tenvironment - -@@ -1040,12 +1039,12 @@ class Builder: - - # We now have a list of image size changes sorted by arch - # Print out a summary of these -- for arch, target_list in arch_list.iteritems(): -+ for arch, target_list in arch_list.items(): - # Get total difference for each type - totals = {} - for result in target_list: - total = 0 -- for name, diff in result.iteritems(): -+ for name, diff in result.items(): - if name.startswith('_'): - continue - total += diff -@@ -1250,7 +1249,7 @@ class Builder: - if self._show_unknown: - self.AddOutcome(board_selected, arch_list, unknown_boards, '?', - self.col.MAGENTA) -- for arch, target_list in arch_list.iteritems(): -+ for arch, target_list in arch_list.items(): - Print('%10s: %s' % (arch, target_list)) - self._error_lines += 1 - if better_err: -@@ -1283,13 +1282,13 @@ class Builder: - environment_minus = {} - environment_change = {} - base = tbase.environment -- for key, value in tenvironment.environment.iteritems(): -+ for key, value in tenvironment.environment.items(): - if key not in base: - environment_plus[key] = value -- for key, value in base.iteritems(): -+ for key, value in base.items(): - if key not in tenvironment.environment: - environment_minus[key] = value -- for key, value in base.iteritems(): -+ for key, value in base.items(): - new_value = tenvironment.environment.get(key) - if new_value and value != new_value: - desc = '%s -> %s' % (value, new_value) -@@ -1342,15 +1341,15 @@ class Builder: - config_minus = {} - config_change = {} - base = tbase.config[name] -- for key, value in tconfig.config[name].iteritems(): -+ for key, value in tconfig.config[name].items(): - if key not in base: - config_plus[key] = value - all_config_plus[key] = value -- for key, value in base.iteritems(): -+ for key, value in base.items(): - if key not in tconfig.config[name]: - config_minus[key] = value - all_config_minus[key] = value -- for key, value in base.iteritems(): -+ for key, value in base.items(): - new_value = tconfig.config.get(key) - if new_value and value != new_value: - desc = '%s -> %s' % (value, new_value) -@@ -1368,7 +1367,7 @@ class Builder: - summary[target] = '\n'.join(lines) - - lines_by_target = {} -- for target, lines in summary.iteritems(): -+ for target, lines in summary.items(): - if lines in lines_by_target: - lines_by_target[lines].append(target) - else: -@@ -1392,7 +1391,7 @@ class Builder: - Print('%s:' % arch) - _OutputConfigInfo(lines) - -- for lines, targets in lines_by_target.iteritems(): -+ for lines, targets in lines_by_target.items(): - if not lines: - continue - Print('%s :' % ' '.join(sorted(targets))) -@@ -1463,7 +1462,7 @@ class Builder: - commits: Selected commits to build - """ - # First work out how many commits we will build -- count = (self.commit_count + self._step - 1) / self._step -+ count = (self.commit_count + self._step - 1) // self._step - self.count = len(board_selected) * count - self.upto = self.warned = self.fail = 0 - self._timestamps = collections.deque() -@@ -1566,7 +1565,7 @@ class Builder: - self.ProcessResult(None) - - # Create jobs to build all commits for each board -- for brd in board_selected.itervalues(): -+ for brd in board_selected.values(): - job = builderthread.BuilderJob() - job.board = brd - job.commits = commits -diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py -index 8a9d47cd5e..570c1f6595 100644 ---- a/tools/buildman/builderthread.py -+++ b/tools/buildman/builderthread.py -@@ -28,7 +28,7 @@ def Mkdir(dirname, parents = False): - except OSError as err: - if err.errno == errno.EEXIST: - if os.path.realpath('.') == os.path.realpath(dirname): -- print "Cannot create the current working directory '%s'!" % dirname -+ print("Cannot create the current working directory '%s'!" % dirname) - sys.exit(1) - pass - else: -@@ -291,15 +291,13 @@ class BuilderThread(threading.Thread): - outfile = os.path.join(build_dir, 'log') - with open(outfile, 'w') as fd: - if result.stdout: -- # We don't want unicode characters in log files -- fd.write(result.stdout.decode('UTF-8').encode('ASCII', 'replace')) -+ fd.write(result.stdout) - - errfile = self.builder.GetErrFile(result.commit_upto, - result.brd.target) - if result.stderr: - with open(errfile, 'w') as fd: -- # We don't want unicode characters in log files -- fd.write(result.stderr.decode('UTF-8').encode('ASCII', 'replace')) -+ fd.write(result.stderr) - elif os.path.exists(errfile): - os.remove(errfile) - -@@ -314,17 +312,17 @@ class BuilderThread(threading.Thread): - else: - fd.write('%s' % result.return_code) - with open(os.path.join(build_dir, 'toolchain'), 'w') as fd: -- print >>fd, 'gcc', result.toolchain.gcc -- print >>fd, 'path', result.toolchain.path -- print >>fd, 'cross', result.toolchain.cross -- print >>fd, 'arch', result.toolchain.arch -+ print('gcc', result.toolchain.gcc, file=fd) -+ print('path', result.toolchain.path, file=fd) -+ print('cross', result.toolchain.cross, file=fd) -+ print('arch', result.toolchain.arch, file=fd) - fd.write('%s' % result.return_code) - - # Write out the image and function size information and an objdump - env = result.toolchain.MakeEnvironment(self.builder.full_path) - with open(os.path.join(build_dir, 'env'), 'w') as fd: - for var in sorted(env.keys()): -- print >>fd, '%s="%s"' % (var, env[var]) -+ print('%s="%s"' % (var, env[var]), file=fd) - lines = [] - for fname in ['u-boot', 'spl/u-boot-spl']: - cmd = ['%snm' % self.toolchain.cross, '--size-sort', fname] -@@ -335,7 +333,7 @@ class BuilderThread(threading.Thread): - nm = self.builder.GetFuncSizesFile(result.commit_upto, - result.brd.target, fname) - with open(nm, 'w') as fd: -- print >>fd, nm_result.stdout, -+ print(nm_result.stdout, end=' ', file=fd) - - cmd = ['%sobjdump' % self.toolchain.cross, '-h', fname] - dump_result = command.RunPipe([cmd], capture=True, -@@ -346,7 +344,7 @@ class BuilderThread(threading.Thread): - objdump = self.builder.GetObjdumpFile(result.commit_upto, - result.brd.target, fname) - with open(objdump, 'w') as fd: -- print >>fd, dump_result.stdout, -+ print(dump_result.stdout, end=' ', file=fd) - for line in dump_result.stdout.splitlines(): - fields = line.split() - if len(fields) > 5 and fields[1] == '.rodata': -@@ -378,7 +376,7 @@ class BuilderThread(threading.Thread): - sizes = self.builder.GetSizesFile(result.commit_upto, - result.brd.target) - with open(sizes, 'w') as fd: -- print >>fd, '\n'.join(lines) -+ print('\n'.join(lines), file=fd) - - # Write out the configuration files, with a special case for SPL - for dirname in ['', 'spl', 'tpl']: -diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py -index f17aa15e7c..30a8690f93 100755 ---- a/tools/buildman/buildman.py -+++ b/tools/buildman/buildman.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python3 - # SPDX-License-Identifier: GPL-2.0+ - # - # Copyright (c) 2012 The Chromium OS Authors. -@@ -6,6 +6,8 @@ - - """See README for more information""" - -+from __future__ import print_function -+ - import multiprocessing - import os - import re -@@ -46,11 +48,11 @@ def RunTests(skip_net_tests): - suite = unittest.TestLoader().loadTestsFromTestCase(module) - suite.run(result) - -- print result -+ print(result) - for test, err in result.errors: -- print err -+ print(err) - for test, err in result.failures: -- print err -+ print(err) - - - options, args = cmdline.ParseArgs() -diff --git a/tools/buildman/control.py b/tools/buildman/control.py -index 9787b86747..216012d001 100644 ---- a/tools/buildman/control.py -+++ b/tools/buildman/control.py -@@ -30,7 +30,7 @@ def GetActionSummary(is_summary, commits, selected, options): - """ - if commits: - count = len(commits) -- count = (count + options.step - 1) / options.step -+ count = (count + options.step - 1) // options.step - commit_str = '%d commit%s' % (count, GetPlural(count)) - else: - commit_str = 'current source' -@@ -59,31 +59,31 @@ def ShowActions(series, why_selected, boards_selected, builder, options, - board_warnings: List of warnings obtained from board selected - """ - col = terminal.Color() -- print 'Dry run, so not doing much. But I would do this:' -- print -+ print('Dry run, so not doing much. But I would do this:') -+ print() - if series: - commits = series.commits - else: - commits = None -- print GetActionSummary(False, commits, boards_selected, -- options) -- print 'Build directory: %s' % builder.base_dir -+ print(GetActionSummary(False, commits, boards_selected, -+ options)) -+ print('Build directory: %s' % builder.base_dir) - if commits: - for upto in range(0, len(series.commits), options.step): - commit = series.commits[upto] -- print ' ', col.Color(col.YELLOW, commit.hash[:8], bright=False), -- print commit.subject -- print -+ print(' ', col.Color(col.YELLOW, commit.hash[:8], bright=False), end=' ') -+ print(commit.subject) -+ print() - for arg in why_selected: - if arg != 'all': -- print arg, ': %d boards' % len(why_selected[arg]) -+ print(arg, ': %d boards' % len(why_selected[arg])) - if options.verbose: -- print ' %s' % ' '.join(why_selected[arg]) -- print ('Total boards to build for each commit: %d\n' % -- len(why_selected['all'])) -+ print(' %s' % ' '.join(why_selected[arg])) -+ print(('Total boards to build for each commit: %d\n' % -+ len(why_selected['all']))) - if board_warnings: - for warning in board_warnings: -- print col.Color(col.YELLOW, warning) -+ print(col.Color(col.YELLOW, warning)) - - def CheckOutputDir(output_dir): - """Make sure that the output directory is not within the current directory -@@ -146,17 +146,17 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, - if options.fetch_arch: - if options.fetch_arch == 'list': - sorted_list = toolchains.ListArchs() -- print col.Color(col.BLUE, 'Available architectures: %s\n' % -- ' '.join(sorted_list)) -+ print(col.Color(col.BLUE, 'Available architectures: %s\n' % -+ ' '.join(sorted_list))) - return 0 - else: - fetch_arch = options.fetch_arch - if fetch_arch == 'all': - fetch_arch = ','.join(toolchains.ListArchs()) -- print col.Color(col.CYAN, '\nDownloading toolchains: %s' % -- fetch_arch) -+ print(col.Color(col.CYAN, '\nDownloading toolchains: %s' % -+ fetch_arch)) - for arch in fetch_arch.split(','): -- print -+ print() - ret = toolchains.FetchAndInstall(arch) - if ret: - return ret -@@ -167,7 +167,7 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, - toolchains.Scan(options.list_tool_chains and options.verbose) - if options.list_tool_chains: - toolchains.List() -- print -+ print() - return 0 - - # Work out how many commits to build. We want to build everything on the -@@ -191,7 +191,7 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, - sys.exit(col.Color(col.RED, "Range '%s' has no commits" % - options.branch)) - if msg: -- print col.Color(col.YELLOW, msg) -+ print(col.Color(col.YELLOW, msg)) - count += 1 # Build upstream commit also - - if not count: -@@ -268,7 +268,7 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, - options.threads = min(multiprocessing.cpu_count(), len(selected)) - if not options.jobs: - options.jobs = max(1, (multiprocessing.cpu_count() + -- len(selected) - 1) / len(selected)) -+ len(selected) - 1) // len(selected)) - - if not options.step: - options.step = len(series.commits) - 1 -diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py -index f90b8ea7f5..4c3d497294 100644 ---- a/tools/buildman/func_test.py -+++ b/tools/buildman/func_test.py -@@ -270,7 +270,7 @@ class TestFunctional(unittest.TestCase): - stdout=''.join(commit_log[:count])) - - # Not handled, so abort -- print 'git log', args -+ print('git log', args) - sys.exit(1) - - def _HandleCommandGitConfig(self, args): -@@ -286,7 +286,7 @@ class TestFunctional(unittest.TestCase): - stdout='refs/heads/master\n') - - # Not handled, so abort -- print 'git config', args -+ print('git config', args) - sys.exit(1) - - def _HandleCommandGit(self, in_args): -@@ -320,7 +320,7 @@ class TestFunctional(unittest.TestCase): - return command.CommandResult(return_code=0) - - # Not handled, so abort -- print 'git', git_args, sub_cmd, args -+ print('git', git_args, sub_cmd, args) - sys.exit(1) - - def _HandleCommandNm(self, args): -@@ -351,7 +351,7 @@ class TestFunctional(unittest.TestCase): - if pipe_list[1] == ['wc', '-l']: - wc = True - else: -- print 'invalid pipe', kwargs -+ print('invalid pipe', kwargs) - sys.exit(1) - cmd = pipe_list[0][0] - args = pipe_list[0][1:] -@@ -371,7 +371,7 @@ class TestFunctional(unittest.TestCase): - - if not result: - # Not handled, so abort -- print 'unknown command', kwargs -+ print('unknown command', kwargs) - sys.exit(1) - - if wc: -@@ -404,14 +404,14 @@ class TestFunctional(unittest.TestCase): - return command.CommandResult(return_code=0) - - # Not handled, so abort -- print 'make', stage -+ print('make', stage) - sys.exit(1) - - # Example function to print output lines - def print_lines(self, lines): -- print len(lines) -+ print(len(lines)) - for line in lines: -- print line -+ print(line) - #self.print_lines(terminal.GetPrintTestLines()) - - def testNoBoards(self): -diff --git a/tools/buildman/test.py b/tools/buildman/test.py -index ed99b9375c..b4e28d6867 100644 ---- a/tools/buildman/test.py -+++ b/tools/buildman/test.py -@@ -212,11 +212,11 @@ class TestBuild(unittest.TestCase): - self.assertEqual(lines[1].text, '02: %s' % commits[1][1]) - - col = terminal.Color() -- self.assertSummary(lines[2].text, 'sandbox', 'w+', ['board4'], -+ self.assertSummary(lines[2].text, 'arm', 'w+', ['board1'], - outcome=OUTCOME_WARN) -- self.assertSummary(lines[3].text, 'arm', 'w+', ['board1'], -+ self.assertSummary(lines[3].text, 'powerpc', 'w+', ['board2', 'board3'], - outcome=OUTCOME_WARN) -- self.assertSummary(lines[4].text, 'powerpc', 'w+', ['board2', 'board3'], -+ self.assertSummary(lines[4].text, 'sandbox', 'w+', ['board4'], - outcome=OUTCOME_WARN) - - # Second commit: The warnings should be listed -@@ -226,10 +226,10 @@ class TestBuild(unittest.TestCase): - - # Third commit: Still fails - self.assertEqual(lines[6].text, '03: %s' % commits[2][1]) -- self.assertSummary(lines[7].text, 'sandbox', '+', ['board4']) -- self.assertSummary(lines[8].text, 'arm', '', ['board1'], -+ self.assertSummary(lines[7].text, 'arm', '', ['board1'], - outcome=OUTCOME_OK) -- self.assertSummary(lines[9].text, 'powerpc', '+', ['board2', 'board3']) -+ self.assertSummary(lines[8].text, 'powerpc', '+', ['board2', 'board3']) -+ self.assertSummary(lines[9].text, 'sandbox', '+', ['board4']) - - # Expect a compiler error - self.assertEqual(lines[10].text, '+%s' % -@@ -237,8 +237,6 @@ class TestBuild(unittest.TestCase): - - # Fourth commit: Compile errors are fixed, just have warning for board3 - self.assertEqual(lines[11].text, '04: %s' % commits[3][1]) -- self.assertSummary(lines[12].text, 'sandbox', 'w+', ['board4'], -- outcome=OUTCOME_WARN) - expect = '%10s: ' % 'powerpc' - expect += ' ' + col.Color(col.GREEN, '') - expect += ' ' -@@ -246,7 +244,9 @@ class TestBuild(unittest.TestCase): - expect += ' ' + col.Color(col.YELLOW, 'w+') - expect += ' ' - expect += col.Color(col.YELLOW, ' %s' % 'board3') -- self.assertEqual(lines[13].text, expect) -+ self.assertEqual(lines[12].text, expect) -+ self.assertSummary(lines[13].text, 'sandbox', 'w+', ['board4'], -+ outcome=OUTCOME_WARN) - - # Compile error fixed - self.assertEqual(lines[14].text, '-%s' % -@@ -259,9 +259,9 @@ class TestBuild(unittest.TestCase): - - # Fifth commit - self.assertEqual(lines[16].text, '05: %s' % commits[4][1]) -- self.assertSummary(lines[17].text, 'sandbox', '+', ['board4']) -- self.assertSummary(lines[18].text, 'powerpc', '', ['board3'], -+ self.assertSummary(lines[17].text, 'powerpc', '', ['board3'], - outcome=OUTCOME_OK) -+ self.assertSummary(lines[18].text, 'sandbox', '+', ['board4']) - - # The second line of errors[3] is a duplicate, so buildman will drop it - expect = errors[3].rstrip().split('\n') -diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py -index a65737fdf8..cc26e2ede5 100644 ---- a/tools/buildman/toolchain.py -+++ b/tools/buildman/toolchain.py -@@ -4,18 +4,19 @@ - - import re - import glob --from HTMLParser import HTMLParser -+from html.parser import HTMLParser - import os - import sys - import tempfile --import urllib2 -+import urllib.request, urllib.error, urllib.parse - - import bsettings - import command - import terminal -+import tools - - (PRIORITY_FULL_PREFIX, PRIORITY_PREFIX_GCC, PRIORITY_PREFIX_GCC_PATH, -- PRIORITY_CALC) = range(4) -+ PRIORITY_CALC) = list(range(4)) - - # Simple class to collect links from a page - class MyHTMLParser(HTMLParser): -@@ -100,15 +101,15 @@ class Toolchain: - raise_on_error=False) - self.ok = result.return_code == 0 - if verbose: -- print 'Tool chain test: ', -+ print('Tool chain test: ', end=' ') - if self.ok: -- print "OK, arch='%s', priority %d" % (self.arch, -- self.priority) -+ print("OK, arch='%s', priority %d" % (self.arch, -+ self.priority)) - else: -- print 'BAD' -- print 'Command: ', cmd -- print result.stdout -- print result.stderr -+ print('BAD') -+ print('Command: ', cmd) -+ print(result.stdout) -+ print(result.stderr) - else: - self.ok = True - -@@ -138,7 +139,7 @@ class Toolchain: - value = '' - for name, value in bsettings.GetItems('toolchain-wrapper'): - if not value: -- print "Warning: Wrapper not found" -+ print("Warning: Wrapper not found") - if value: - value = value + ' ' - -@@ -227,11 +228,11 @@ class Toolchains: - """ - toolchains = bsettings.GetItems('toolchain') - if show_warning and not toolchains: -- print ("Warning: No tool chains. Please run 'buildman " -+ print(("Warning: No tool chains. Please run 'buildman " - "--fetch-arch all' to download all available toolchains, or " - "add a [toolchain] section to your buildman config file " - "%s. See README for details" % -- bsettings.config_fname) -+ bsettings.config_fname)) - - paths = [] - for name, value in toolchains: -@@ -272,10 +273,10 @@ class Toolchains: - if add_it: - self.toolchains[toolchain.arch] = toolchain - elif verbose: -- print ("Toolchain '%s' at priority %d will be ignored because " -+ print(("Toolchain '%s' at priority %d will be ignored because " - "another toolchain for arch '%s' has priority %d" % - (toolchain.gcc, toolchain.priority, toolchain.arch, -- self.toolchains[toolchain.arch].priority)) -+ self.toolchains[toolchain.arch].priority))) - - def ScanPath(self, path, verbose): - """Scan a path for a valid toolchain -@@ -289,9 +290,9 @@ class Toolchains: - fnames = [] - for subdir in ['.', 'bin', 'usr/bin']: - dirname = os.path.join(path, subdir) -- if verbose: print " - looking in '%s'" % dirname -+ if verbose: print(" - looking in '%s'" % dirname) - for fname in glob.glob(dirname + '/*gcc'): -- if verbose: print " - found '%s'" % fname -+ if verbose: print(" - found '%s'" % fname) - fnames.append(fname) - return fnames - -@@ -321,9 +322,9 @@ class Toolchains: - Args: - verbose: True to print out progress information - """ -- if verbose: print 'Scanning for tool chains' -+ if verbose: print('Scanning for tool chains') - for name, value in self.prefixes: -- if verbose: print " - scanning prefix '%s'" % value -+ if verbose: print(" - scanning prefix '%s'" % value) - if os.path.exists(value): - self.Add(value, True, verbose, PRIORITY_FULL_PREFIX, name) - continue -@@ -335,10 +336,10 @@ class Toolchains: - for f in fname_list: - self.Add(f, True, verbose, PRIORITY_PREFIX_GCC_PATH, name) - if not fname_list: -- raise ValueError, ("No tool chain found for prefix '%s'" % -+ raise ValueError("No tool chain found for prefix '%s'" % - value) - for path in self.paths: -- if verbose: print " - scanning path '%s'" % path -+ if verbose: print(" - scanning path '%s'" % path) - fnames = self.ScanPath(path, verbose) - for fname in fnames: - self.Add(fname, True, verbose) -@@ -346,13 +347,13 @@ class Toolchains: - def List(self): - """List out the selected toolchains for each architecture""" - col = terminal.Color() -- print col.Color(col.BLUE, 'List of available toolchains (%d):' % -- len(self.toolchains)) -+ print(col.Color(col.BLUE, 'List of available toolchains (%d):' % -+ len(self.toolchains))) - if len(self.toolchains): -- for key, value in sorted(self.toolchains.iteritems()): -- print '%-10s: %s' % (key, value.gcc) -+ for key, value in sorted(self.toolchains.items()): -+ print('%-10s: %s' % (key, value.gcc)) - else: -- print 'None' -+ print('None') - - def Select(self, arch): - """Returns the toolchain for a given architecture -@@ -370,7 +371,7 @@ class Toolchains: - return self.toolchains[alias] - - if not arch in self.toolchains: -- raise ValueError, ("No tool chain found for arch '%s'" % arch) -+ raise ValueError("No tool chain found for arch '%s'" % arch) - return self.toolchains[arch] - - def ResolveReferences(self, var_dict, args): -@@ -464,9 +465,9 @@ class Toolchains: - links = [] - for version in versions: - url = '%s/%s/%s/' % (base, arch, version) -- print 'Checking: %s' % url -- response = urllib2.urlopen(url) -- html = response.read() -+ print('Checking: %s' % url) -+ response = urllib.request.urlopen(url) -+ html = tools.ToString(response.read()) - parser = MyHTMLParser(fetch_arch) - parser.feed(html) - if fetch_arch == 'list': -@@ -488,14 +489,14 @@ class Toolchains: - Full path to the downloaded archive file in that directory, - or None if there was an error while downloading - """ -- print 'Downloading: %s' % url -+ print('Downloading: %s' % url) - leaf = url.split('/')[-1] - tmpdir = tempfile.mkdtemp('.buildman') -- response = urllib2.urlopen(url) -+ response = urllib.request.urlopen(url) - fname = os.path.join(tmpdir, leaf) - fd = open(fname, 'wb') - meta = response.info() -- size = int(meta.getheaders('Content-Length')[0]) -+ size = int(meta.get('Content-Length')) - done = 0 - block_size = 1 << 16 - status = '' -@@ -504,19 +505,19 @@ class Toolchains: - while True: - buffer = response.read(block_size) - if not buffer: -- print chr(8) * (len(status) + 1), '\r', -+ print(chr(8) * (len(status) + 1), '\r', end=' ') - break - - done += len(buffer) - fd.write(buffer) -- status = r'%10d MiB [%3d%%]' % (done / 1024 / 1024, -- done * 100 / size) -+ status = r'%10d MiB [%3d%%]' % (done // 1024 // 1024, -+ done * 100 // size) - status = status + chr(8) * (len(status) + 1) -- print status, -+ print(status, end=' ') - sys.stdout.flush() - fd.close() - if done != size: -- print 'Error, failed to download' -+ print('Error, failed to download') - os.remove(fname) - fname = None - return tmpdir, fname -@@ -565,11 +566,11 @@ class Toolchains: - """ - # Fist get the URL for this architecture - col = terminal.Color() -- print col.Color(col.BLUE, "Downloading toolchain for arch '%s'" % arch) -+ print(col.Color(col.BLUE, "Downloading toolchain for arch '%s'" % arch)) - url = self.LocateArchUrl(arch) - if not url: -- print ("Cannot find toolchain for arch '%s' - use 'list' to list" % -- arch) -+ print(("Cannot find toolchain for arch '%s' - use 'list' to list" % -+ arch)) - return 2 - home = os.environ['HOME'] - dest = os.path.join(home, '.buildman-toolchains') -@@ -580,28 +581,28 @@ class Toolchains: - tmpdir, tarfile = self.Download(url) - if not tarfile: - return 1 -- print col.Color(col.GREEN, 'Unpacking to: %s' % dest), -+ print(col.Color(col.GREEN, 'Unpacking to: %s' % dest), end=' ') - sys.stdout.flush() - path = self.Unpack(tarfile, dest) - os.remove(tarfile) - os.rmdir(tmpdir) -- print -+ print() - - # Check that the toolchain works -- print col.Color(col.GREEN, 'Testing') -+ print(col.Color(col.GREEN, 'Testing')) - dirpath = os.path.join(dest, path) - compiler_fname_list = self.ScanPath(dirpath, True) - if not compiler_fname_list: -- print 'Could not locate C compiler - fetch failed.' -+ print('Could not locate C compiler - fetch failed.') - return 1 - if len(compiler_fname_list) != 1: -- print col.Color(col.RED, 'Warning, ambiguous toolchains: %s' % -- ', '.join(compiler_fname_list)) -+ print(col.Color(col.RED, 'Warning, ambiguous toolchains: %s' % -+ ', '.join(compiler_fname_list))) - toolchain = Toolchain(compiler_fname_list[0], True, True) - - # Make sure that it will be found by buildman - if not self.TestSettingsHasPath(dirpath): -- print ("Adding 'download' to config file '%s'" % -- bsettings.config_fname) -+ print(("Adding 'download' to config file '%s'" % -+ bsettings.config_fname)) - bsettings.SetItem('toolchain', 'download', '%s/*/*' % dest) - return 0 --- -2.24.0 - diff --git a/recipes-bsp/u-boot/u-boot-qoriq/0001-patman-Adjust-command-to-return-strings-instead-of-b.patch b/recipes-bsp/u-boot/u-boot-qoriq/0001-patman-Adjust-command-to-return-strings-instead-of-b.patch deleted file mode 100644 index 4c4f7acb..00000000 --- a/recipes-bsp/u-boot/u-boot-qoriq/0001-patman-Adjust-command-to-return-strings-instead-of-b.patch +++ /dev/null @@ -1,228 +0,0 @@ -From 3b3e3c0f6c261a8c9f989d437dc261ba84467d4f Mon Sep 17 00:00:00 2001 -From: Simon Glass <sjg@chromium.org> -Date: Thu, 31 Oct 2019 07:42:50 -0600 -Subject: [PATCH] patman: Adjust 'command' to return strings instead of bytes - -At present all the 'command' methods return bytes. Most of the time we -actually want strings, so change this. We still need to keep the internal -representation as bytes since otherwise unicode strings might break over -a read() boundary (e.g. 4KB), causing errors. But we can convert the end -result to strings. - -Add a 'binary' parameter to cover the few cases where bytes are needed. - -Upstream-Status: Backport - -Signed-off-by: Simon Glass <sjg@chromium.org> ---- - tools/binman/cbfs_util_test.py | 2 +- - tools/binman/ftest.py | 2 +- - tools/patman/command.py | 31 +++++++++++++++++++++++-------- - tools/patman/tools.py | 29 +++++++++++++++++++++-------- - 4 files changed, 46 insertions(+), 18 deletions(-) - -diff --git a/tools/binman/cbfs_util_test.py b/tools/binman/cbfs_util_test.py -index 772c794ece..ddc2e09e35 100755 ---- a/tools/binman/cbfs_util_test.py -+++ b/tools/binman/cbfs_util_test.py -@@ -56,7 +56,7 @@ class TestCbfs(unittest.TestCase): - cls.have_lz4 = True - try: - tools.Run('lz4', '--no-frame-crc', '-c', -- tools.GetInputFilename('u-boot.bin')) -+ tools.GetInputFilename('u-boot.bin'), binary=True) - except: - cls.have_lz4 = False - ---- a/tools/binman/ftest.py -+++ b/tools/binman/ftest.py -@@ -151,7 +151,7 @@ class TestFunctional(unittest.TestCase): - self.have_lz4 = True - try: - tools.Run('lz4', '--no-frame-crc', '-c', -- os.path.join(self._indir, 'u-boot.bin')) -+ os.path.join(self._indir, 'u-boot.bin'), binary=True) - except: - self.have_lz4 = False - -diff --git a/tools/patman/command.py b/tools/patman/command.py -index 16299f3f5b..5fbd2c4a3e 100644 ---- a/tools/patman/command.py -+++ b/tools/patman/command.py -@@ -4,6 +4,7 @@ - - import os - import cros_subprocess -+import tools - - """Shell command ease-ups for Python.""" - -@@ -31,6 +32,13 @@ class CommandResult: - self.return_code = return_code - self.exception = exception - -+ def ToOutput(self, binary): -+ if not binary: -+ self.stdout = tools.ToString(self.stdout) -+ self.stderr = tools.ToString(self.stderr) -+ self.combined = tools.ToString(self.combined) -+ return self -+ - - # This permits interception of RunPipe for test purposes. If it is set to - # a function, then that function is called with the pipe list being -@@ -41,7 +49,7 @@ test_result = None - - def RunPipe(pipe_list, infile=None, outfile=None, - capture=False, capture_stderr=False, oneline=False, -- raise_on_error=True, cwd=None, **kwargs): -+ raise_on_error=True, cwd=None, binary=False, **kwargs): - """ - Perform a command pipeline, with optional input/output filenames. - -@@ -67,7 +75,7 @@ def RunPipe(pipe_list, infile=None, outfile=None, - else: - return test_result - # No result: fall through to normal processing -- result = CommandResult() -+ result = CommandResult(b'', b'', b'') - last_pipe = None - pipeline = list(pipe_list) - user_pipestr = '|'.join([' '.join(pipe) for pipe in pipe_list]) -@@ -93,29 +101,36 @@ def RunPipe(pipe_list, infile=None, outfile=None, - if raise_on_error: - raise Exception("Error running '%s': %s" % (user_pipestr, str)) - result.return_code = 255 -- return result -+ return result.ToOutput(binary) - - if capture: - result.stdout, result.stderr, result.combined = ( - last_pipe.CommunicateFilter(None)) - if result.stdout and oneline: -- result.output = result.stdout.rstrip('\r\n') -+ result.output = result.stdout.rstrip(b'\r\n') - result.return_code = last_pipe.wait() - else: - result.return_code = os.waitpid(last_pipe.pid, 0)[1] - if raise_on_error and result.return_code: - raise Exception("Error running '%s'" % user_pipestr) -- return result -+ return result.ToOutput(binary) - - def Output(*cmd, **kwargs): - kwargs['raise_on_error'] = kwargs.get('raise_on_error', True) - return RunPipe([cmd], capture=True, **kwargs).stdout - - def OutputOneLine(*cmd, **kwargs): -+ """Run a command and output it as a single-line string -+ -+ The command us expected to produce a single line of output -+ -+ Returns: -+ String containing output of command -+ """ - raise_on_error = kwargs.pop('raise_on_error', True) -- return (RunPipe([cmd], capture=True, oneline=True, -- raise_on_error=raise_on_error, -- **kwargs).stdout.strip()) -+ result = RunPipe([cmd], capture=True, oneline=True, -+ raise_on_error=raise_on_error, **kwargs).stdout.strip() -+ return result - - def Run(*cmd, **kwargs): - return RunPipe([cmd], **kwargs).stdout -diff --git a/tools/patman/tools.py b/tools/patman/tools.py -index 4a7fcdad21..3feddb292f 100644 ---- a/tools/patman/tools.py -+++ b/tools/patman/tools.py -@@ -186,7 +186,7 @@ def PathHasFile(path_spec, fname): - return True - return False - --def Run(name, *args): -+def Run(name, *args, **kwargs): - """Run a tool with some arguments - - This runs a 'tool', which is a program used by binman to process files and -@@ -201,13 +201,14 @@ def Run(name, *args): - CommandResult object - """ - try: -+ binary = kwargs.get('binary') - env = None - if tool_search_paths: - env = dict(os.environ) - env['PATH'] = ':'.join(tool_search_paths) + ':' + env['PATH'] - all_args = (name,) + args - result = command.RunPipe([all_args], capture=True, capture_stderr=True, -- env=env, raise_on_error=False) -+ env=env, raise_on_error=False, binary=binary) - if result.return_code: - raise Exception("Error %d running '%s': %s" % - (result.return_code,' '.join(all_args), -@@ -375,7 +376,7 @@ def ToBytes(string): - """Convert a str type into a bytes type - - Args: -- string: string to convert value -+ string: string to convert - - Returns: - Python 3: A bytes type -@@ -385,6 +386,18 @@ def ToBytes(string): - return string.encode('utf-8') - return string - -+def ToString(bval): -+ """Convert a bytes type into a str type -+ -+ Args: -+ bval: bytes value to convert -+ -+ Returns: -+ Python 3: A bytes type -+ Python 2: A string type -+ """ -+ return bval.decode('utf-8') -+ - def Compress(indata, algo, with_header=True): - """Compress some data using a given algorithm - -@@ -406,14 +419,14 @@ def Compress(indata, algo, with_header=True): - fname = GetOutputFilename('%s.comp.tmp' % algo) - WriteFile(fname, indata) - if algo == 'lz4': -- data = Run('lz4', '--no-frame-crc', '-c', fname) -+ data = Run('lz4', '--no-frame-crc', '-c', fname, binary=True) - # cbfstool uses a very old version of lzma - elif algo == 'lzma': - outfname = GetOutputFilename('%s.comp.otmp' % algo) - Run('lzma_alone', 'e', fname, outfname, '-lc1', '-lp0', '-pb0', '-d8') - data = ReadFile(outfname) - elif algo == 'gzip': -- data = Run('gzip', '-c', fname) -+ data = Run('gzip', '-c', fname, binary=True) - else: - raise ValueError("Unknown algorithm '%s'" % algo) - if with_header: -@@ -446,13 +459,13 @@ def Decompress(indata, algo, with_header=True): - with open(fname, 'wb') as fd: - fd.write(indata) - if algo == 'lz4': -- data = Run('lz4', '-dc', fname) -+ data = Run('lz4', '-dc', fname, binary=True) - elif algo == 'lzma': - outfname = GetOutputFilename('%s.decomp.otmp' % algo) - Run('lzma_alone', 'd', fname, outfname) -- data = ReadFile(outfname) -+ data = ReadFile(outfname, binary=True) - elif algo == 'gzip': -- data = Run('gzip', '-cd', fname) -+ data = Run('gzip', '-cd', fname, binary=True) - else: - raise ValueError("Unknown algorithm '%s'" % algo) - return data --- -2.24.0 - diff --git a/recipes-bsp/u-boot/u-boot-qoriq/0001-patman-Drop-binary-parameter.patch b/recipes-bsp/u-boot/u-boot-qoriq/0001-patman-Drop-binary-parameter.patch deleted file mode 100644 index cee88472..00000000 --- a/recipes-bsp/u-boot/u-boot-qoriq/0001-patman-Drop-binary-parameter.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 3b1c0b09c99bfd30355a6ba87a15e9d408a51109 Mon Sep 17 00:00:00 2001 -From: Simon Glass <sjg@chromium.org> -Date: Sat, 24 Aug 2019 07:22:41 -0600 -Subject: [PATCH] patman: Drop binary parameter - -Since cros_subprocess use bytestrings now, this feature not needed. Drop -it. - -Upstream-Status: Backport - -Signed-off-by: Simon Glass <sjg@chromium.org> ---- - tools/patman/cros_subprocess.py | 3 +-- - tools/patman/tools.py | 15 +++++++-------- - 2 files changed, 8 insertions(+), 10 deletions(-) - -diff --git a/tools/patman/cros_subprocess.py b/tools/patman/cros_subprocess.py -index 06be64cc2c..0f0d60dfb7 100644 ---- a/tools/patman/cros_subprocess.py -+++ b/tools/patman/cros_subprocess.py -@@ -54,7 +54,7 @@ class Popen(subprocess.Popen): - """ - - def __init__(self, args, stdin=None, stdout=PIPE_PTY, stderr=PIPE_PTY, -- shell=False, cwd=None, env=None, binary=False, **kwargs): -+ shell=False, cwd=None, env=None, **kwargs): - """Cut-down constructor - - Args: -@@ -72,7 +72,6 @@ class Popen(subprocess.Popen): - """ - stdout_pty = None - stderr_pty = None -- self.binary = binary - - if stdout == PIPE_PTY: - stdout_pty = pty.openpty() -diff --git a/tools/patman/tools.py b/tools/patman/tools.py -index 0d4705db76..97441ca796 100644 ---- a/tools/patman/tools.py -+++ b/tools/patman/tools.py -@@ -186,7 +186,7 @@ def PathHasFile(path_spec, fname): - return True - return False - --def Run(name, *args, **kwargs): -+def Run(name, *args): - """Run a tool with some arguments - - This runs a 'tool', which is a program used by binman to process files and -@@ -196,7 +196,6 @@ def Run(name, *args, **kwargs): - Args: - name: Command name to run - args: Arguments to the tool -- kwargs: Options to pass to command.run() - - Returns: - CommandResult object -@@ -206,8 +205,8 @@ def Run(name, *args, **kwargs): - if tool_search_paths: - env = dict(os.environ) - env['PATH'] = ':'.join(tool_search_paths) + ':' + env['PATH'] -- return command.Run(name, *args, capture=True, -- capture_stderr=True, env=env, **kwargs) -+ return command.Run(name, *args, capture=True, capture_stderr=True, -+ env=env) - except: - if env and not PathHasFile(env['PATH'], name): - msg = "Please install tool '%s'" % name -@@ -401,14 +400,14 @@ def Compress(indata, algo, with_header=True): - fname = GetOutputFilename('%s.comp.tmp' % algo) - WriteFile(fname, indata) - if algo == 'lz4': -- data = Run('lz4', '--no-frame-crc', '-c', fname, binary=True) -+ data = Run('lz4', '--no-frame-crc', '-c', fname) - # cbfstool uses a very old version of lzma - elif algo == 'lzma': - outfname = GetOutputFilename('%s.comp.otmp' % algo) - Run('lzma_alone', 'e', fname, outfname, '-lc1', '-lp0', '-pb0', '-d8') - data = ReadFile(outfname) - elif algo == 'gzip': -- data = Run('gzip', '-c', fname, binary=True) -+ data = Run('gzip', '-c', fname) - else: - raise ValueError("Unknown algorithm '%s'" % algo) - if with_header: -@@ -441,13 +440,13 @@ def Decompress(indata, algo, with_header=True): - with open(fname, 'wb') as fd: - fd.write(indata) - if algo == 'lz4': -- data = Run('lz4', '-dc', fname, binary=True) -+ data = Run('lz4', '-dc', fname) - elif algo == 'lzma': - outfname = GetOutputFilename('%s.decomp.otmp' % algo) - Run('lzma_alone', 'd', fname, outfname) - data = ReadFile(outfname) - elif algo == 'gzip': -- data = Run('gzip', '-cd', fname, binary=True) -+ data = Run('gzip', '-cd', fname) - else: - raise ValueError("Unknown algorithm '%s'" % algo) - return data --- -2.24.0 - diff --git a/recipes-bsp/u-boot/u-boot-qoriq/0001-patman-Update-command.Run-to-handle-failure-better.patch b/recipes-bsp/u-boot/u-boot-qoriq/0001-patman-Update-command.Run-to-handle-failure-better.patch deleted file mode 100644 index bd23c458..00000000 --- a/recipes-bsp/u-boot/u-boot-qoriq/0001-patman-Update-command.Run-to-handle-failure-better.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6eace398072a62e74f10f412ffadfe51b7402395 Mon Sep 17 00:00:00 2001 -From: Simon Glass <sjg@chromium.org> -Date: Sat, 24 Aug 2019 07:22:42 -0600 -Subject: [PATCH] patman: Update command.Run() to handle failure better - -At present tools are not expected to fail. If they do an exception is -raised but there is no detail about what went wrong. This makes it hard -to debug if something does actually go wrong. - -Fix this by outputting both stderr and stdout on failure. - -Upstream-Status: Backport - -Signed-off-by: Simon Glass <sjg@chromium.org> ---- - tools/patman/tools.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/tools/patman/tools.py b/tools/patman/tools.py -index 97441ca796..0952681579 100644 ---- a/tools/patman/tools.py -+++ b/tools/patman/tools.py -@@ -205,8 +205,14 @@ def Run(name, *args): - if tool_search_paths: - env = dict(os.environ) - env['PATH'] = ':'.join(tool_search_paths) + ':' + env['PATH'] -- return command.Run(name, *args, capture=True, capture_stderr=True, -- env=env) -+ all_args = (name,) + args -+ result = command.RunPipe([all_args], capture=True, capture_stderr=True, -+ env=env, raise_on_error=False) -+ if result.return_code: -+ raise Exception("Error %d running '%s': %s" % -+ (result.return_code,' '.join(all_args), -+ result.stderr)) -+ return result.stdout - except: - if env and not PathHasFile(env['PATH'], name): - msg = "Please install tool '%s'" % name --- -2.24.0 - diff --git a/recipes-bsp/u-boot/u-boot-qoriq/0001-pylibfdt-Convert-to-Python-3.patch b/recipes-bsp/u-boot/u-boot-qoriq/0001-pylibfdt-Convert-to-Python-3.patch deleted file mode 100644 index e74609de..00000000 --- a/recipes-bsp/u-boot/u-boot-qoriq/0001-pylibfdt-Convert-to-Python-3.patch +++ /dev/null @@ -1,117 +0,0 @@ -From b4cf5f1df741e8781bed6149291823cd1a4b8baa Mon Sep 17 00:00:00 2001 -From: Simon Glass <sjg@chromium.org> -Date: Thu, 31 Oct 2019 07:42:59 -0600 -Subject: [PATCH] pylibfdt: Convert to Python 3 - -Build this swig module with Python 3. - -Upstream-Status: Backport - -Signed-off-by: Simon Glass <sjg@chromium.org> ---- - scripts/dtc/pylibfdt/Makefile | 2 +- - scripts/dtc/pylibfdt/libfdt.i_shipped | 2 +- - scripts/dtc/pylibfdt/setup.py | 2 +- - tools/binman/entry.py | 16 ++-------------- - tools/binman/entry_test.py | 15 --------------- - 5 files changed, 5 insertions(+), 32 deletions(-) - -diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile -index 15e66ad44d..42342c75bb 100644 ---- a/scripts/dtc/pylibfdt/Makefile -+++ b/scripts/dtc/pylibfdt/Makefile -@@ -21,7 +21,7 @@ quiet_cmd_pymod = PYMOD $@ - CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \ - SOURCES="$(PYLIBFDT_srcs)" \ - SWIG_OPTS="-I$(LIBFDT_srcdir) -I$(LIBFDT_srcdir)/.." \ -- $(PYTHON2) $< --quiet build_ext --inplace -+ $(PYTHON3) $< --quiet build_ext --inplace - - $(obj)/_libfdt.so: $(src)/setup.py $(PYLIBFDT_srcs) FORCE - $(call if_changed,pymod) -diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped -index 76e61e98bd..53b70f8f5e 100644 ---- a/scripts/dtc/pylibfdt/libfdt.i_shipped -+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped -@@ -624,7 +624,7 @@ class Fdt(FdtRo): - Raises: - FdtException if no parent found or other error occurs - """ -- val = val.encode('utf-8') + '\0' -+ val = val.encode('utf-8') + b'\0' - return check_err(fdt_setprop(self._fdt, nodeoffset, prop_name, - val, len(val)), quiet) - -diff --git a/scripts/dtc/pylibfdt/setup.py b/scripts/dtc/pylibfdt/setup.py -index 4f7cf042bf..992cdec30f 100755 ---- a/scripts/dtc/pylibfdt/setup.py -+++ b/scripts/dtc/pylibfdt/setup.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python3 - - """ - setup.py file for SWIG libfdt -diff --git a/tools/binman/entry.py b/tools/binman/entry.py -index 409c0dca93..5bf5be4794 100644 ---- a/tools/binman/entry.py -+++ b/tools/binman/entry.py -@@ -7,16 +7,7 @@ - from __future__ import print_function - - from collections import namedtuple -- --# importlib was introduced in Python 2.7 but there was a report of it not --# working in 2.7.12, so we work around this: --# http://lists.denx.de/pipermail/u-boot/2016-October/269729.html --try: -- import importlib -- have_importlib = True --except: -- have_importlib = False -- -+import importlib - import os - import sys - -@@ -119,10 +110,7 @@ class Entry(object): - old_path = sys.path - sys.path.insert(0, os.path.join(our_path, 'etype')) - try: -- if have_importlib: -- module = importlib.import_module(module_name) -- else: -- module = __import__(module_name) -+ module = importlib.import_module(module_name) - except ImportError as e: - raise ValueError("Unknown entry type '%s' in node '%s' (expected etype/%s.py, error '%s'" % - (etype, node_path, module_name, e)) -diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py -index 13f5864516..277e10b585 100644 ---- a/tools/binman/entry_test.py -+++ b/tools/binman/entry_test.py -@@ -39,21 +39,6 @@ class TestEntry(unittest.TestCase): - else: - import entry - -- def test1EntryNoImportLib(self): -- """Test that we can import Entry subclassess successfully""" -- sys.modules['importlib'] = None -- global entry -- self._ReloadEntry() -- entry.Entry.Create(None, self.GetNode(), 'u-boot') -- self.assertFalse(entry.have_importlib) -- -- def test2EntryImportLib(self): -- del sys.modules['importlib'] -- global entry -- self._ReloadEntry() -- entry.Entry.Create(None, self.GetNode(), 'u-boot-spl') -- self.assertTrue(entry.have_importlib) -- - def testEntryContents(self): - """Test the Entry bass class""" - import entry --- -2.24.0 - diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb b/recipes-bsp/u-boot/u-boot-qoriq_2020.04.bb index 571fadb7..57f27803 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2020.04.bb @@ -14,17 +14,8 @@ LIC_FILES_CHKSUM = " \ file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ " -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/u-boot;nobranch=1 \ - file://0001-patman-Drop-binary-parameter.patch \ - file://0001-patman-Update-command.Run-to-handle-failure-better.patch \ - file://0001-patman-Adjust-command-to-return-strings-instead-of-b.patch \ - file://0001-pylibfdt-Convert-to-Python-3.patch \ - file://0001-binman-Convert-a-few-tests-to-Python-3.patch \ - file://0001-binman-Move-to-use-Python-3.patch \ - file://0001-buildman-Convert-to-Python-3.patch \ - file://0001-Remove-redundant-YYLOC-global-declaration.patch \ -" -SRCREV= "1e55b2f9e7f56b76569089b9e950f49c1579580e" +SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/u-boot;nobranch=1" +SRCREV= "f46a944f715f284aff1d42c009680ffe0be4058f" S = "${WORKDIR}/git" B = "${WORKDIR}/build" diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb index f94a67e2..780208d9 100644 --- a/recipes-bsp/uefi/uefi_git.bb +++ b/recipes-bsp/uefi/uefi_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=343ec8f06efc37467a6de53686fa6315" inherit deploy SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1" -SRCREV= "e95ed52322f15437f98dee2b27de45a7495d648c" +SRCREV= "83a97bf09bb8880933416bc358112503c64ddae4" S = "${WORKDIR}/git" diff --git a/recipes-devtools/cst/cst_git.bb b/recipes-devtools/cst/cst_git.bb index fef0fbcf..9091350b 100644 --- a/recipes-devtools/cst/cst_git.bb +++ b/recipes-devtools/cst/cst_git.bb @@ -19,7 +19,7 @@ inherit kernel-arch SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cst;nobranch=1 \ file://0001-tools-Mark-struct-input_field-file_field-extern.patch \ " -SRCREV = "9aafbdf2441858ceca2779279b6876c6bdc2d3ed" +SRCREV = "dfe30d3f05cfe281896482839e57ed49c52f2088" S = "${WORKDIR}/git" diff --git a/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb b/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb index a281170c..2c5a5fd4 100644 --- a/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb +++ b/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb @@ -16,7 +16,7 @@ SRC_URI = "gitsm://source.codeaurora.org/external/qoriq/qoriq-components/qemu;no file://0001-linux-user-remove-host-stime-syscall.patch \ " -SRCREV = "521a0dcf59f1ca11e7d9e2f4e1ef3d2dfaebc0e4" +SRCREV = "0b88a503e43ca629d6e8165638ac6b312e5c66bd" S = "${WORKDIR}/git" @@ -40,8 +40,20 @@ do_install_append_class-nativesdk() { ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} } +do_install_ptest() { + cp -rL ${B}/tests ${D}${PTEST_PATH} + find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcod]" | xargs -i rm -rf {} + + cp ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests + # Don't check the file genreated by configure + sed -i -e '/wildcard config-host.mak/d' \ + -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include + sed -i -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ + ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env +} + PACKAGECONFIG ??= " \ - fdt sdl kvm aio libusb \ + fdt sdl kvm aio libusb vhost \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ " PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm" diff --git a/recipes-dpaa2/dce/dce_git.bb b/recipes-dpaa2/dce/dce_git.bb index 0e31a3c4..9984f080 100644 --- a/recipes-dpaa2/dce/dce_git.bb +++ b/recipes-dpaa2/dce/dce_git.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=956df5ea6cfe0a1dcf2dee7ca37c0cdf" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dce;nobranch=1 \ git://source.codeaurora.org/external/qoriq/qoriq-components/qbman_userspace;nobranch=1;name=qbman;destsuffix=git/lib/qbman_userspace \ " -SRCREV = "0ec35ad12ad04b5dadfa9f8c8a718c715bde41db" -SRCREV_qbman = "a1af1e1528fe2e1ce0df1e6d9170b6c239c8ab4f" +SRCREV = "9db9c08379aa89f45f514f4f3f0a8e8212198758" +SRCREV_qbman = "2f92993a9f34e5221d6b36c63b9e30ef703e9ac3" S = "${WORKDIR}/git" diff --git a/recipes-dpaa2/gpp-aioptool/gpp-aioptool/0001-add-fcommon-to-fix-gcc-10-build-issue.patch b/recipes-dpaa2/gpp-aioptool/gpp-aioptool/0001-add-fcommon-to-fix-gcc-10-build-issue.patch new file mode 100644 index 00000000..6b69e7fd --- /dev/null +++ b/recipes-dpaa2/gpp-aioptool/gpp-aioptool/0001-add-fcommon-to-fix-gcc-10-build-issue.patch @@ -0,0 +1,36 @@ +From e506c4ea7e576e713fa64569b6784bdc22b3205f Mon Sep 17 00:00:00 2001 +From: Ting Liu <ting.liu@nxp.com> +Date: Fri, 9 Oct 2020 13:13:13 +0530 +Subject: [PATCH] add -fcommon to fix gcc 10 build issue + +Fix: +| ...ld: src/aiop_logger.o:(.bss+0x0): multiple definition of `_debug_flag'; src/aiop_tool.o:(.bss+0x0): first defined here +| ...ld: src/aiop_logger.o:(.bss+0x2): multiple definition of `_verbose_flag'; src/aiop_tool.o:(.bss+0x2): first defined here + +Reference: https://gcc.gnu.org/gcc-10/porting_to.html +As a workaround, legacy C code where all tentative definitions should be +placed into a common block can be compiled with -fcommon. + +Upstream-Status: Pending + +Signed-off-by: Ting Liu <ting.liu@nxp.com> +--- + Makefile | 2 +- + 1 files changed, 1 insertion(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index f10dda2..f568788 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,7 +23,7 @@ BINDIR = bin + + + # FLAGS +-CFLAGS = -Wall ++CFLAGS = -Wall -fcommon + #CFLAGS += -g -O0 # Enable for Debugging + CFLAGS += -I$(top_builddir)/include + CFLAGS += -I$(top_builddir)/src +-- +2.17.1 + diff --git a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb index a9c3180f..a96913e8 100644 --- a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb +++ b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=386a6287daa6504b7e7e5014ddfb3987" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/gpp-aioptool;nobranch=1 \ file://0001-remove-libio.h.patch \ + file://0001-add-fcommon-to-fix-gcc-10-build-issue.patch \ " SRCREV = "6ead470dde043f3ca67f1ba19b313dd64ec199e1" @@ -21,6 +22,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir" do_install () { oe_runmake install DESTDIR=${D} + chown -R root:root ${D}${bindir}/aiop_tool } COMPATIBLE_MACHINE = "(ls2088a|ls1088a)" diff --git a/recipes-dpaa2/management-complex/management-complex_10.24.0.bb b/recipes-dpaa2/management-complex/management-complex_10.24.0.bb new file mode 100644 index 00000000..17049a15 --- /dev/null +++ b/recipes-dpaa2/management-complex/management-complex_10.24.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "DPAA2 Management Complex Firmware" +LICENSE = "NXP-Binary-EULA" +LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=481d6288552113961a835bbabceb0c33" + +inherit deploy + +INHIBIT_DEFAULT_DEPS = "1" + +SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1" +SRCREV = "324817697a4c89a9a940fb7dba1b18909913ee20" + +S = "${WORKDIR}/git" + +REGLEX_ls2088a = "ls2088a" +REGLEX_ls2080a = "ls2080a" +REGLEX_ls1088a = "ls1088a" +REGLEX_lx2160a = "lx216xa" +REGLEX_lx2162a = "lx216xa" + +do_install () { + install -d ${D}/boot + install -m 755 ${S}/${REGLEX}/*.itb ${D}/boot +} + +do_deploy () { + install -d ${DEPLOYDIR}/mc_app + install -m 755 ${S}/${REGLEX}/*.itb ${DEPLOYDIR}/mc_app + # make a symlink to the latest binary + for mc_binary in `find ${DEPLOYDIR}/mc_app -type f -printf "%f\n" |sort`;do + ln -sfT ${mc_binary} ${DEPLOYDIR}/mc_app/mc.itb + done +} +addtask deploy before do_build after do_install + +PACKAGES += "${PN}-image" +FILES_${PN}-image += "/boot" + +INHIBIT_PACKAGE_STRIP = "1" + +COMPATIBLE_MACHINE = "(qoriq-arm64)" +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-dpaa2/restool/restool/0001-restool-fix-build-error-with-gcc7.patch b/recipes-dpaa2/restool/restool/0001-restool-fix-build-error-with-gcc7.patch deleted file mode 100644 index 82ade02b..00000000 --- a/recipes-dpaa2/restool/restool/0001-restool-fix-build-error-with-gcc7.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 895db76654c796a0edc6b2d329addde108b1755c Mon Sep 17 00:00:00 2001 -From: Chunrong Guo <chunrong.guo@nxp.com> -Date: Wed, 19 Jul 2017 14:31:23 +0800 -Subject: [PATCH] restool: fix build error with gcc7 - ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 3976b66..df1e791 100644 ---- a/Makefile -+++ b/Makefile -@@ -64,7 +64,6 @@ CFLAGS = ${EXTRA_CFLAGS} \ - -Wmissing-prototypes \ - -Wpointer-arith \ - -Winline \ -- -Werror \ - -Wundef \ - -Icommon/ - --- -2.7.4 - diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb index 0211c779..66cea7ef 100644 --- a/recipes-dpaa2/restool/restool_git.bb +++ b/recipes-dpaa2/restool/restool_git.bb @@ -4,14 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ec8d84e9cd4de287e290275d09db27f0" RDEPENDS_${PN} += "bash dtc" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/restool;nobranch=1 \ - file://0001-restool-fix-build-error-with-gcc7.patch" - -SRCREV = "f0cec094e4c6d1c975b377203a3bf994ba9325a9" +SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/restool;nobranch=1" +SRCREV = "8ddbe4c9559ffad5d7e5dd3cd5f00ceeff7f05d4" S = "${WORKDIR}/git" -EXTRA_OEMAKE = 'CC="${CC}" EXTRA_CFLAGS="-Wno-missing-field-initializers -Wno-missing-braces"' +EXTRA_OEMAKE = 'CC="${CC}" EXTRA_CFLAGS="-O2 -Wno-missing-field-initializers -Wno-missing-braces"' do_install () { oe_runmake install DESTDIR=${D} diff --git a/recipes-extended/crconf/crconf_git.bb b/recipes-extended/crconf/crconf_git.bb index 7dc92776..f8f88d20 100644 --- a/recipes-extended/crconf/crconf_git.bb +++ b/recipes-extended/crconf/crconf_git.bb @@ -3,11 +3,10 @@ SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=5;md5=0f77fc44eb5911007ae4ac9f6736e111" -SRC_URI = "git://github.com/Thermi/crconf.git;protocol=https;nobranch=1" - EXTRA_OEMAKE = "'CC=${CC}' 'HOSTCC=${CC}'" -SRCREV = "7b5819e7638e471d41dd2dca71f012d5a022f014" +SRC_URI = "git://git.code.sf.net/p/crconf/code;protocol=https;nobranch=1" +SRCREV = "c2b9595d739a9515a86ff3b1980b5cfdfcc42d68" S = "${WORKDIR}/git" diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index f5793a19..61c02ae7 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Data Plane Development Kit" HOMEPAGE = "http://dpdk.org" -LICENSE = "BSD-3-Clause & LGPLv2 & GPLv2" +RDEPENDS_${PN} += "python3-core" DEPENDS = "virtual/kernel openssl" DEPENDS_append_x86-64 = " numactl" do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/recipes-extended/dpdk/dpdk/0001-examples-ipsec-gw-fix-gcc-10-maybe-uninitialized-war.patch b/recipes-extended/dpdk/dpdk/0001-examples-ipsec-gw-fix-gcc-10-maybe-uninitialized-war.patch deleted file mode 100644 index 3b5a2b3a..00000000 --- a/recipes-extended/dpdk/dpdk/0001-examples-ipsec-gw-fix-gcc-10-maybe-uninitialized-war.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 6fe3e96ab6e92f8faca9784a46bc33d92790c2b8 Mon Sep 17 00:00:00 2001 -From: Kevin Traynor <ktraynor@redhat.com> -Date: Wed, 11 Mar 2020 11:33:00 +0000 -Subject: [PATCH] examples/ipsec-gw: fix gcc 10 maybe-uninitialized warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -gcc 10.0.1 reports: - -../examples/ipsec-secgw/ipsec_process.c: In function ‘ipsec_process’: -../examples/ipsec-secgw/ipsec_process.c:132:34: -error: ‘grp.m’ may be used uninitialized in this function - [-Werror=maybe-uninitialized] - 132 | grp[n].cnt = pkts + i - grp[n].m; - | ~~~~~~^~ - -This is a correct warning for the initial execution of the statement. -However, it is the design of the loop that grp[0].cnt will later be -written with the correct value using an initialized grp[0].m before it -is used. - -In order to remove the warning, initialize grp[0].m for the initial and -unused calculation of grp[0].cnt. - -Fixes: 3e5f4625dc17 ("examples/ipsec-secgw: make data-path to use IPsec library") -Cc: stable@dpdk.org - -Upstream-Status: Backport - -Suggested-by: Konstantin Ananyev <konstantin.ananyev@intel.com> -Signed-off-by: Kevin Traynor <ktraynor@redhat.com> -Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com> -Signed-off-by: Jens Rehsack <jens.rehsack.ext@safrangroup.com> ---- - examples/ipsec-secgw/ipsec_process.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/examples/ipsec-secgw/ipsec_process.c b/examples/ipsec-secgw/ipsec_process.c -index 2eb5c8b34..37f406d46 100644 ---- a/examples/ipsec-secgw/ipsec_process.c -+++ b/examples/ipsec-secgw/ipsec_process.c -@@ -125,6 +125,7 @@ sa_group(void *sa_ptr[], struct rte_mbuf *pkts[], - void * const nosa = &spi; - - sa = nosa; -+ grp[0].m = pkts; - for (i = 0, n = 0; i != num; i++) { - - if (sa != sa_ptr[i]) { --- -2.17.1 - diff --git a/recipes-extended/dpdk/dpdk/0004-update-WERROR_FLAGS.patch b/recipes-extended/dpdk/dpdk/0004-update-WERROR_FLAGS.patch deleted file mode 100644 index 61467377..00000000 --- a/recipes-extended/dpdk/dpdk/0004-update-WERROR_FLAGS.patch +++ /dev/null @@ -1,39 +0,0 @@ -From aa97b9162b68780ca912a226b5045a3ddab41d3c Mon Sep 17 00:00:00 2001 -From: Chunrong Guo <chunrong.guo@nxp.com> -Date: Thu, 4 Jul 2019 08:03:56 +0200 -Subject: [PATCH] update WERROR_FLAGS - -Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com> ---- - kernel/linux/kni/Makefile | 2 +- - mk/toolchain/gcc/rte.vars.mk | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile -index 595bac261..a17939996 100644 ---- a/kernel/linux/kni/Makefile -+++ b/kernel/linux/kni/Makefile -@@ -14,7 +14,7 @@ MODULE = rte_kni - MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=50 - MODULE_CFLAGS += -I$(RTE_OUTPUT)/include - MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h --MODULE_CFLAGS += -Wall -Werror -+MODULE_CFLAGS += -Wall -Werror -Wno-missing-attributes - - -include /etc/lsb-release - -diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk -index de5e0d24d..ca2cb5fcd 100644 ---- a/mk/toolchain/gcc/rte.vars.mk -+++ b/mk/toolchain/gcc/rte.vars.mk -@@ -49,6 +49,7 @@ WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual - WERROR_FLAGS += -Wformat-nonliteral -Wformat-security - WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated - WERROR_FLAGS += -Wno-error=pedantic -+WERROR_FLAGS += -Wno-address-of-packed-member - - ifeq ($(RTE_DEVEL_BUILD),y) - WERROR_FLAGS += -Werror --- -2.17.1 - diff --git a/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch b/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch new file mode 100644 index 00000000..81ca1244 --- /dev/null +++ b/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch @@ -0,0 +1,100 @@ +diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py +index 0194be046..86fe3a89d 100755 +--- a/app/test-bbdev/test-bbdev.py ++++ b/app/test-bbdev/test-bbdev.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2017 Intel Corporation +diff --git a/app/test-cmdline/cmdline_test.py b/app/test-cmdline/cmdline_test.py +index 3a8fac426..231fe6032 100755 +--- a/app/test-cmdline/cmdline_test.py ++++ b/app/test-cmdline/cmdline_test.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2010-2014 Intel Corporation + +diff --git a/app/test/autotest.py b/app/test/autotest.py +index b42f48879..30541d102 100644 +--- a/app/test/autotest.py ++++ b/app/test/autotest.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2010-2014 Intel Corporation + +diff --git a/buildtools/map_to_def.py b/buildtools/map_to_def.py +index 6775b54a9..ff67f0a35 100644 +--- a/buildtools/map_to_def.py ++++ b/buildtools/map_to_def.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2019 Intel Corporation + +diff --git a/config/arm/armv8_machine.py b/config/arm/armv8_machine.py +index 404866d2f..1f689d9a8 100755 +--- a/config/arm/armv8_machine.py ++++ b/config/arm/armv8_machine.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2017 Cavium, Inc + +diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py +index 616412a1c..3244b0984 100755 +--- a/devtools/update_version_map_abi.py ++++ b/devtools/update_version_map_abi.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2019 Intel Corporation + +diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py +index 6f129b1db..e86bf6b92 100755 +--- a/usertools/cpu_layout.py ++++ b/usertools/cpu_layout.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2010-2014 Intel Corporation + # Copyright(c) 2017 Cavium, Inc. All rights reserved. +diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py +index b1d149876..3f8175338 100755 +--- a/usertools/dpdk-devbind.py ++++ b/usertools/dpdk-devbind.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2010-2014 Intel Corporation + # +diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py +index 069a3bf12..1d5c99c2a 100755 +--- a/usertools/dpdk-pmdinfo.py ++++ b/usertools/dpdk-pmdinfo.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com> + +diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py +index 290345dcc..279067450 100755 +--- a/usertools/dpdk-telemetry-client.py ++++ b/usertools/dpdk-telemetry-client.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2018 Intel Corporation + diff --git a/recipes-extended/dpdk/dpdk_19.11-20.04.bb b/recipes-extended/dpdk/dpdk_19.11-20.04.bb deleted file mode 100644 index 398d2ec4..00000000 --- a/recipes-extended/dpdk/dpdk_19.11-20.04.bb +++ /dev/null @@ -1,19 +0,0 @@ -LIC_FILES_CHKSUM = "file://license/README;md5=3383def2d4c82237df281174e981a492" - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1 \ - file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ - file://0001-add-Wno-cast-function-type.patch \ - file://0001-Add-RTE_KERNELDIR_OUT.patch \ - file://0004-update-WERROR_FLAGS.patch \ - file://0001-examples-ipsec-gw-fix-gcc-10-maybe-uninitialized-war.patch \ -" -SRCREV = "4110a5fed09fa034963cfc246a6285911ecbd540" - -include dpdk.inc - - -do_install_append () { - # Remove the unneeded dir - rm -rf ${D}/${datadir}/${RTE_TARGET}/app -} - diff --git a/recipes-extended/dpdk/dpdk_19.11-20.12.bb b/recipes-extended/dpdk/dpdk_19.11-20.12.bb new file mode 100644 index 00000000..426713c2 --- /dev/null +++ b/recipes-extended/dpdk/dpdk_19.11-20.12.bb @@ -0,0 +1,20 @@ +LICENSE = "BSD-3-Clause & LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" + +SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1 \ + file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ + file://0001-add-Wno-cast-function-type.patch \ + file://0001-Add-RTE_KERNELDIR_OUT.patch \ + file://0005-use-python3-instead-of-python.patch \ +" +SRCREV = "7071c27f6f5aefb57de1cffab3484707b1e82e2b" + +include dpdk.inc + +do_install_append () { + # Remove the unneeded dir + rm -rf ${D}/${datadir}/${RTE_TARGET}/app +} + diff --git a/recipes-extended/libpkcs11/libpkcs11/0001-fix-multiple-definition-error.patch b/recipes-extended/libpkcs11/libpkcs11/0001-fix-multiple-definition-error.patch new file mode 100644 index 00000000..a1680a8b --- /dev/null +++ b/recipes-extended/libpkcs11/libpkcs11/0001-fix-multiple-definition-error.patch @@ -0,0 +1,90 @@ +From e8e566a4b4d589cbdf2613c78cac75ecbea86d3b Mon Sep 17 00:00:00 2001 +From: Ting Liu <ting.liu@nxp.com> +Date: Wed, 30 Sep 2020 10:24:14 +0530 +Subject: [PATCH] fix multiple definition error + +gcc10 default to -fno-common, which results in error: +| ../aarch64-fsl-linux/10.2.0/ld: /tmp/ccaL5AXA.o:.../libpkcs11/git-r0/git/app/pkcs11_app.c:23: multiple definition of `funcs'; /tmp/ccvGV0xB.o:.../app/utils.c:18: first defined here +| collect2: error: ld returned 1 exit status +| Makefile:66: recipe for target 'app' failed +| make: *** [app] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Ting Liu <ting.liu@nxp.com> +--- + app/gen_test.c | 2 +- + app/pkcs11_app.c | 2 +- + app/sign_digest_update_final.c | 2 +- + app/thread_test.c | 2 +- + app/utils.c | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/app/gen_test.c b/app/gen_test.c +index fbd3429..2476e18 100644 +--- a/app/gen_test.c ++++ b/app/gen_test.c +@@ -17,7 +17,7 @@ + #include <openssl/pem.h> + #include <openssl/md5.h> + +-CK_FUNCTION_LIST *funcs; ++static CK_FUNCTION_LIST *funcs; + + #define err2str(X) case X: return #X + +diff --git a/app/pkcs11_app.c b/app/pkcs11_app.c +index 2b4a70d..3883dab 100644 +--- a/app/pkcs11_app.c ++++ b/app/pkcs11_app.c +@@ -20,7 +20,7 @@ + #include <openssl/pem.h> + #include "utils.h" + +-CK_FUNCTION_LIST *funcs; ++static CK_FUNCTION_LIST *funcs; + + struct getOptValue_t { + uint32_t main_option; +diff --git a/app/sign_digest_update_final.c b/app/sign_digest_update_final.c +index b3367ed..49fee20 100644 +--- a/app/sign_digest_update_final.c ++++ b/app/sign_digest_update_final.c +@@ -20,7 +20,7 @@ + #include <openssl/pem.h> + #include "utils.h" + +-CK_FUNCTION_LIST *funcs; ++static CK_FUNCTION_LIST *funcs; + + struct getOptValue_t { + uint32_t main_option; +diff --git a/app/thread_test.c b/app/thread_test.c +index 19d03ee..a574074 100644 +--- a/app/thread_test.c ++++ b/app/thread_test.c +@@ -20,7 +20,7 @@ + #include <sched.h> + #include <pthread.h> + +-CK_FUNCTION_LIST *funcs; ++static CK_FUNCTION_LIST *funcs; + + #define err2str(X) case X: return #X + #define MAX_THREADS 10 +diff --git a/app/utils.c b/app/utils.c +index 7afad95..9f9e143 100644 +--- a/app/utils.c ++++ b/app/utils.c +@@ -15,7 +15,7 @@ + #include <tee_slot.h> + #include "utils.h" + +-CK_FUNCTION_LIST *funcs; ++static CK_FUNCTION_LIST *funcs; + + #define err2str(X) case X: return #X + +-- +2.17.1 + diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb index 33c27ecd..30f33a20 100644 --- a/recipes-extended/libpkcs11/libpkcs11_git.bb +++ b/recipes-extended/libpkcs11/libpkcs11_git.bb @@ -2,7 +2,9 @@ DESCRIPTION = "PKCS library" LICENSE = "GPLv2 & BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=803852533e29eb1d6d5e55ad3078b625" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/libpkcs11;nobranch=1" +SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/libpkcs11;nobranch=1 \ + file://0001-fix-multiple-definition-error.patch \ +" SRCREV = "a243fb21772f1bd434d8bc1ac45feb36571afadb" DEPENDS = "openssl secure-obj" diff --git a/recipes-extended/ovs-dpdk/files/0001-netdev-dpdk-have-env-based-configurable-number-of-pa.patch b/recipes-extended/ovs-dpdk/files/0001-netdev-dpdk-have-env-based-configurable-number-of-pa.patch deleted file mode 100644 index 71b2b58c..00000000 --- a/recipes-extended/ovs-dpdk/files/0001-netdev-dpdk-have-env-based-configurable-number-of-pa.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 95c5c42b9581f595881df11ca8393dc6925f7d7d Mon Sep 17 00:00:00 2001 -From: Nipun Gupta <nipun.gupta@nxp.com> -Date: Thu, 14 Feb 2019 17:57:14 +0530 -Subject: [PATCH] netdev-dpdk: have env based configurable number of packet - buffers - -use $export DPDK_NUM_MBUF=number - -Upstream-Status: Pending - -Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com> ---- - lib/netdev-dpdk.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c -index 6187129c0..1f456a63f 100644 ---- a/lib/netdev-dpdk.c -+++ b/lib/netdev-dpdk.c -@@ -656,6 +656,11 @@ dpdk_calculate_mbufs(struct netdev_dpdk *dev, int mtu, bool per_port_mp) - { - uint32_t n_mbufs; - -+ if (getenv("DPDK_NUM_MBUF")) { -+ n_mbufs = atoi(getenv("DPDK_NUM_MBUF")); -+ return n_mbufs; -+ } -+ - if (!per_port_mp) { - /* Shared memory are being used. - * XXX: this is a really rough method of provisioning memory. --- -2.17.1 - diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb index 9b5d2516..9e817579 100644 --- a/recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb +++ b/recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb @@ -7,10 +7,8 @@ RDEPENDS_${PN} = "bash libcrypto libssl python3" inherit python3native -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ovs-dpdk;nobranch=1 \ - file://0001-netdev-dpdk-have-env-based-configurable-number-of-pa.patch \ -" -SRCREV = "71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3" +SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ovs-dpdk;nobranch=1" +SRCREV = "072130412196029bcc284e353023d81019a8daa7" S = "${WORKDIR}/git" diff --git a/recipes-extended/secure-obj/secure-obj.inc b/recipes-extended/secure-obj/secure-obj.inc index 617601ac..8a62d9cb 100644 --- a/recipes-extended/secure-obj/secure-obj.inc +++ b/recipes-extended/secure-obj/secure-obj.inc @@ -4,7 +4,7 @@ LICENSE = "BSD" DEPENDS = "openssl optee-os-qoriq optee-client-qoriq" RDEPENDS_${PN} = "bash libcrypto libssl" -DEPENDS += "python3-pycrypto-native" +DEPENDS += "python3-pycryptodomex-native" inherit python3native @@ -12,7 +12,7 @@ LDFLAGS += "${TOOLCHAIN_OPTIONS}" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/secure_obj;nobranch=1 \ " -SRCREV = "fb179a861e8e9bfed85ac5ef8387bdd30de48db9" +SRCREV = "71a6eb33b58a8578a60995da3896f8f2d638c916" WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}" export SECURE_STORAGE_PATH = "${S}/secure_storage_ta/ta/" diff --git a/recipes-extended/tsntool/tsntool_git.bb b/recipes-extended/tsntool/tsntool_git.bb index 5694e91c..94091db8 100644 --- a/recipes-extended/tsntool/tsntool_git.bb +++ b/recipes-extended/tsntool/tsntool_git.bb @@ -8,7 +8,7 @@ DEPENDS = "cjson libnl readline" inherit pkgconfig SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/tsntool;protocol=https;nobranch=1" -SRCREV = "ca2d8fb348bb54960d706177108c43ae213e0063" +SRCREV = "1d1686e83c8f83472055189c278b837434990dcc" S = "${WORKDIR}/git" diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb new file mode 100644 index 00000000..4ad257ee --- /dev/null +++ b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Add packages for ISP build" + +inherit packagegroup + +ISP_PKGS ?= "" +ISP_PKGS_mx8mp = " \ + isp-imx \ + basler-camera \ + basler-camera-dev \ + kernel-module-isp-vvcam \ +" +RDEPENDS_${PN} = " \ + ${ISP_PKGS} \ +" diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb b/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb new file mode 100644 index 00000000..8eb5b89a --- /dev/null +++ b/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Add packages for opencv i.MX build" + +inherit packagegroup + +OPENCV_PKGS = " \ + opencv-apps \ + opencv-samples \ + python3-opencv \ +" +RDEPENDS_${PN} = " \ + ${OPENCV_PKGS} \ +" diff --git a/recipes-graphics/drm/libdrm/musl-ioctl.patch b/recipes-graphics/drm/libdrm/musl-ioctl.patch deleted file mode 100644 index e3d6c5b8..00000000 --- a/recipes-graphics/drm/libdrm/musl-ioctl.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status: Submitted -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 46c0fd6c827a8cb4d04e067bf04fab579ac4712e Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Mon, 18 Jun 2018 15:07:03 +0100 -Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature - -POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to -use (int, unsigned long int, ...) instead. - -Use a #ifdef to adapt the replacement function as appropriate. ---- - tests/nouveau/threaded.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c -index 3669bcd3..e1c27c01 100644 ---- a/tests/nouveau/threaded.c -+++ b/tests/nouveau/threaded.c -@@ -36,7 +36,11 @@ static int failed; - - static int import_fd; - -+#ifdef __GLIBC__ - int ioctl(int fd, unsigned long request, ...) -+#else -+int ioctl(int fd, int request, ...) -+#endif - { - va_list va; - int ret; --- -2.11.0 - diff --git a/recipes-graphics/drm/libdrm_2.4.99.imx.bb b/recipes-graphics/drm/libdrm_2.4.102.imx.bb index dc2aa8a9..b8c38554 100644 --- a/recipes-graphics/drm/libdrm_2.4.99.imx.bb +++ b/recipes-graphics/drm/libdrm_2.4.102.imx.bb @@ -11,14 +11,14 @@ PROVIDES = "drm" DEPENDS = "libpthread-stubs" IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https;nobranch=1" -IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.99" +IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.102" SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \ - file://musl-ioctl.patch \ file://0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch " -SRCREV = "f421c9c8c4b8fe48d9e6ef43910e98569c94a4b2" +SRCREV = "f525ae649cd6e81e5d4e459799b0f7a120c4e174" S = "${WORKDIR}/git" DEFAULT_PREFERENCE = "-1" +COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" inherit meson pkgconfig manpages diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.7.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.12.bb index ae6da7b6..c407fb4a 100644 --- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.7.bb +++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.12.bb @@ -4,12 +4,12 @@ DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and DPU" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" PROVIDES += "virtual/libg2d" SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "2b8fea58c87a724c1d5c023ee8bd551b" -SRC_URI[sha256sum] = "7533e34f447e8b076fa6461ac83806efdd677310094741eef2a67858034730fe" +SRC_URI[md5sum] = "18a4119f1f7b83a09f60381e5403bbab" +SRC_URI[sha256sum] = "ba7e219b3cee32e0ac305685de21c67f30e0e5a1a89b5ec441ae6b8484b3f964" inherit fsl-eula-unpack diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb index 2f8029a4..65ce9cd5 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb @@ -5,19 +5,28 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50" DEPENDS = "imx-gpu-viv zlib libpng procps" SRC_URI = "git://source.codeaurora.org/external/imx/apitrace-imx.git;protocol=https;branch=imx_9.0" -SRCREV = "fed74f6f84cb4f48ddace4306c9bf90bf7a9a967" +SRCREV = "c50e6a954e44998f2e3793a8de863e961f8008c6" S = "${WORKDIR}/git" inherit cmake pkgconfig perlnative python3native -PACKAGECONFIG ??= "egl" -PACKAGECONFIG_append = \ - "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', ' x11', \ - '', d), d)}" -PACKAGECONFIG_append_mx8 = " waffle" -PACKAGECONFIG_append_imxgpu2d = " vivante" +PACKAGECONFIG_BACKEND_mx6 = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ + '', d), d)} \ +" +PACKAGECONFIG_BACKEND_mx7 = "${PACKAGECONFIG_BACKEND_mx6}" +PACKAGECONFIG_BACKEND_mx8 = "waffle" + +PACKAGECONFIG_GPU2D = "" +PACKAGECONFIG_GPU2D_imxgpu2d = "vivante" + +PACKAGECONFIG ??= " \ + egl \ + ${PACKAGECONFIG_BACKEND} \ + ${PACKAGECONFIG_GPU2D} \ +" PACKAGECONFIG[egl] = "-DENABLE_EGL=ON,-DENABLE_EGL=OFF,virtual/egl" PACKAGECONFIG[gui] = "-DENABLE_GUI=ON,-DENABLE_GUI=OFF" diff --git a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.0.p2.4.bb b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p1.0.bb index ea760954..ed11a54b 100644 --- a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.0.p2.4.bb +++ b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p1.0.bb @@ -5,7 +5,7 @@ DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and no DPU" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" DEPENDS += "libgal-imx" PROVIDES += "virtual/libg2d" @@ -13,10 +13,10 @@ PROVIDES += "virtual/libg2d" FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" -SRC_URI[aarch64.md5sum] = "88f98e03f3f85c9a768ea5e4ff7475fa" -SRC_URI[aarch64.sha256sum] = "553bbe9ee1caa222fd14b835deb2afedf9ed936b7a13424328df75892286f666" -SRC_URI[arm.md5sum] = "3b12892309d166554c697a87e8084b16" -SRC_URI[arm.sha256sum] = "010bab5780476f26406e16b058514453dc235a0e7f4b995fa03c976d06e5cb96" +SRC_URI[aarch64.md5sum] = "2c17220ff2c28701b5feca45b341961f" +SRC_URI[aarch64.sha256sum] = "47a39b171d83bced378b1b4f408be6304850fe2f25bf4577dd1ea78e22473f3d" +SRC_URI[arm.md5sum] = "968a7d324016376930579a0f904d6e69" +SRC_URI[arm.sha256sum] = "8d3b024151d4bdcc4f68cdbba9c4e5d126d55c9258de5821c43b393ae3f840b4" S = "${WORKDIR}/${FSLBIN_NAME}" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index efafe78d..5acf6352 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -6,7 +6,7 @@ DESCRIPTION = "GPU driver and apps for i.MX" SECTION = "libs" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ @@ -43,9 +43,10 @@ PROVIDES += " \ imx-gpu-viv \ libgal-imx \ opencl-headers \ + opencl-clhpp \ + opencl-icd-loader \ virtual/egl \ virtual/libopenvg \ - virtual/opencl-headers \ virtual/opencl-icd \ ${PROVIDES_OPENVX} \ ${EXTRA_PROVIDES} \ @@ -121,7 +122,7 @@ python __anonymous() { # they don't get Debian-renamed (which would remove the -imx suffix). for p in (("libegl", "libegl1"), ("libgl", "libgl1"), ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), - ("libgles3",) , ("libvulkan",), ("libgbm",)): + ("libgles3",), ("libgbm",)): fullp = p[0] + "-imx" pkgs = "".join(' %s' % i for i in p) d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") @@ -176,7 +177,7 @@ do_install () { # The preference order, based in DISTRO_FEATURES, is Wayland (with or without X11), X11 and fb if [ "${USE_WL}" = "yes" ]; then - backend=wl + backend=wayland install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc @@ -217,40 +218,18 @@ do_install () { install -d ${D}${sysconfdir}/OpenCL/vendors/ install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd - # We'll only have one backend here so we rename it to generic name - # and avoid rework in other packages, when possible - if [ "${USE_WL}" = "yes" -o "${USE_X11}" = "yes" ]; then - cp ${S}/gpu-core/usr/lib/libGL-${backend}.so ${D}${libdir}/libGL.so.1.2.0 - ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so.1.2 - ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so - fi - mv ${D}${libdir}/libEGL-${backend}.so ${D}${libdir}/libEGL.so.1.0 - ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so.1 - ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so - mv ${D}${libdir}/libGAL-${backend}.so ${D}${libdir}/libGAL.so + # Handle backend specific drivers + cp -r ${S}/gpu-core/usr/lib/${backend}/* ${D}${libdir} if [ "${USE_WL}" = "yes" ]; then # Special case for libVDK on Wayland backend, deliver fb library as well. - # Need to rename the libraries to avoid the code below that will remove - # *-fb.so and *-wl.so - mv ${D}${libdir}/libVDK-fb.so ${D}${libdir}/libVDK-framebuffer.so - mv ${D}${libdir}/libVDK-wl.so ${D}${libdir}/libVDK-wayland.so - ln -sf libVDK-wayland.so ${D}${libdir}/libVDK.so - else - mv ${D}${libdir}/libVDK-${backend}.so ${D}${libdir}/libVDK.so + cp ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 ${D}${libdir}/libVDK-fb.so.1.2.0 fi - - # update libglesv2 as backend dependent - rm -rf ${D}${libdir}/libGLESv2* - cp ${S}/gpu-core/usr/lib/libGLESv2-${backend}.so ${D}${libdir}/libGLESv2.so.2.0.0 - ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2 - ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so - if [ "${IS_MX8}" = "1" ]; then # Rename the vulkan implementation library which is wrapped by the vulkan-loader # library of the same name MAJOR=1 - FULL=$MAJOR.1.3 - mv ${D}${libdir}/libvulkan-${backend}.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$FULL + FULL=$MAJOR.1.6 + mv ${D}${libdir}/libvulkan.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$FULL patchelf --set-soname libvulkan_VSI.so.$MAJOR ${D}${libdir}/libvulkan_VSI.so.$FULL rm ${D}${libdir}/libvulkan.so.$MAJOR ${D}${libdir}/libvulkan.so ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$MAJOR @@ -267,11 +246,6 @@ do_install () { find ${D}${libdir} -name "libwayland-viv.*" -exec rm '{}' ';' fi - for i in wl x11 fb dri; do - find ${D}${libdir} -name "*-$i.so*" -exec rm '{}' ';' - find ${D}${libdir} -name "*.$i.so*" -exec rm '{}' ';' - done - # FIXME: MX6SL does not have 3D support; hack it for now if [ "${IS_MX6SL}" = "1" ]; then rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \ @@ -317,20 +291,22 @@ INSANE_SKIP_libgal-imx += "build-deps" FILES_libvsc-imx = "${libdir}/libVSC${SOLIBS}" -FILES_libgbm-imx_mx8 = "${libdir}/libgbm*${SOLIBS}" -FILES_libgbm-imx-dev_mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${libdir}/libgbm${SOLIBSDEV}" +FILES_libgbm-imx_mx8 = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}" +FILES_libgbm-imx-dev_mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" RDEPENDS_libgbm-imx_append_mx8 = " libdrm" +INSANE_SKIP_libgbm-imx += "dev-so" FILES_libvulkan-imx = "${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" FILES_libopenvx-imx = " \ - ${libdir}/libOpenVX*${REALSOLIBS} \ - ${libdir}/libOpenVXU${SOLIBS} \ - ${libdir}/libOvx*${SOLIBS} \ - ${libdir}/libovx*${SOLIBS} \ - " -FILES_libopenvx-imx-dev = "${includedir}/VX ${includedir}/OVXLIB" + ${libdir}/libOpenVX${REALSOLIBS} \ + ${libdir}/libOpenVXC${SOLIBS} \ + ${libdir}/libOpenVXU${SOLIBS} \ + ${libdir}/libOvx*${SOLIBS} \ + ${libdir}/libArchModelSw${SOLIBS} \ +" +FILES_libopenvx-imx-dev = "${includedir}/VX ${libdir}/libOpenVX${SOLIBSDEV}" RDEPENDS_libopenvx-imx = "libnn-imx" FILES_libgl-imx = "${libdir}/libGL${REALSOLIBS}" @@ -364,13 +340,11 @@ FILES_libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \ FILES_libopencl-imx-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}" RDEPENDS_libopencl-imx= "libclc-imx" -INSANE_SKIP_libopenvg-imx += "dev-so" -FILES_libopenvg-imx = "${libdir}/libOpenVG*${SOLIBS}" +FILES_libopenvg-imx = "${libdir}/libOpenVG*${REALSOLIBS}" FILES_libopenvg-imx-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc" -FILES_libvdk-imx = "${libdir}/libVDK*${SOLIBS}" +FILES_libvdk-imx = "${libdir}/libVDK*${REALSOLIBS}" FILES_libvdk-imx-dev = "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}" -INSANE_SKIP_libvdk-imx += "dev-so" FILES_libvivante-dri-imx = "${libdir}/dri/vivante_dri.so" RDEPENDS_libvivante-dri-imx = "libdrm" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch64.bb deleted file mode 100644 index 241752d8..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch64.bb +++ /dev/null @@ -1,6 +0,0 @@ -require imx-gpu-viv-6.inc - -SRC_URI[md5sum] = "633029434f0ccc0e8a6b01d92cae95b2" -SRC_URI[sha256sum] = "a295f41a6346c507fc8a677c26ecf9b2f416735e32e6d0734516ef5363027720" - -COMPATIBLE_MACHINE = "(mx8)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.0-aarch32.bb index 66e4d90a..39eb1a1d 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch32.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.0-aarch32.bb @@ -2,9 +2,9 @@ # Copyright 2017-2020 NXP # Released under the MIT license (see COPYING.MIT for the terms) -require recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +require imx-gpu-viv-6.inc -SRC_URI[md5sum] = "cd5e9ba9247aa0da5d97b0f030e2ede1" -SRC_URI[sha256sum] = "9cc4c6594083f5970bc394a698a0a8ed0c7f2a1a753dfbf25cb0be5ab8bdcbd5" +SRC_URI[md5sum] = "3ab06c5aa485c79c14e6c856ccfd8d82" +SRC_URI[sha256sum] = "9960fadbc1ea919f8b1b5c1e2e38a52b7293b70c906518d7fff2ada4140c59ea" COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.0-aarch64.bb new file mode 100644 index 00000000..4db54790 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.0-aarch64.bb @@ -0,0 +1,6 @@ +require imx-gpu-viv-6.inc + +SRC_URI[md5sum] = "72a212a1bd8102718f8b03d935f1dcbc" +SRC_URI[sha256sum] = "0505620c3851a980d2e08fee4b4fcd06eff92efac02d1646924bea86e4384ad4" + +COMPATIBLE_MACHINE = "(mx8)" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 8d429abf..fce3802e 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -17,17 +17,26 @@ python () { # Enable Etnaviv and Freedreno support PACKAGECONFIG_append_use-mainline-bsp = " gallium etnaviv kmsro freedreno" -USE_OSMESA_ONLY ?= "no" - -# Etnaviv support state for i.MX8 is unknown, therefore only enable OSMesa and -# disable Gallium for now. If you still want to enable Etnaviv, just set -# USE_OSMESA_ONLY_mx8 = "no" in your bbappend. -USE_OSMESA_ONLY_mx8 ?= "yes" - -# Enable OSMesa which also requires dri (classic) swrast -PACKAGECONFIG_append = " ${@oe.utils.conditional('USE_OSMESA_ONLY', 'yes', ' osmesa', '', d)}" -PACKAGECONFIG_remove = " ${@oe.utils.conditional('USE_OSMESA_ONLY', 'yes', 'gallium', '', d)}" -DRIDRIVERS_append = "${@oe.utils.conditional('USE_OSMESA_ONLY', 'yes', 'swrast', '', d)}" +# For NXP BSP, choose between gallium and osmesa, and between enabling +# dri and swrast or not. gallium and dri are default. +# +# For parts with no GPU, use gallium and dri +PACKAGECONFIG_REMOVE_NXPBSP = "" +PACKAGECONFIG_APPEND_NXPBSP = "" +DRIDRIVERS_NXPBSP = "" +# +# For parts with GPU but no DRM, use gallium +PACKAGECONFIG_REMOVE_NXPBSP_imxgpu = "dri" +DRIDRIVERS_NXPBSP_imxgpu = "" +# +# For parts with GPU and DRM, use osmesa, dri, and swrast +PACKAGECONFIG_REMOVE_NXPBSP_imxgpu_imxdrm = "gallium" +PACKAGECONFIG_APPEND_NXPBSP_imxgpu_imxdrm = "osmesa" +DRIDRIVERS_NXPBSP_imxgpu_imxdrm = "swrast" +# +PACKAGECONFIG_remove_use-nxp-bsp = "${PACKAGECONFIG_REMOVE_NXPBSP}" +PACKAGECONFIG_append_use-nxp-bsp = " ${PACKAGECONFIG_APPEND_NXPBSP}" +DRIDRIVERS_use-nxp-bsp = "${DRIDRIVERS_NXPBSP}" BACKEND = \ "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ diff --git a/recipes-graphics/vulkan/vulkan-loader_%.bbappend b/recipes-graphics/vulkan/vulkan-loader_%.bbappend new file mode 100644 index 00000000..28e1dc32 --- /dev/null +++ b/recipes-graphics/vulkan/vulkan-loader_%.bbappend @@ -0,0 +1,3 @@ +# The i.MX implementation is dynamically loaded, so it requires an +# explicit runtime dependency. +RRECOMMENDS_${PN}_append_imxgpu = " libvulkan-imx" diff --git a/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb index 7f15bdb3..852b3160 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb +++ b/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb @@ -9,8 +9,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" -SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.18" -SRCREV = "ee18c1f66877f7fb652467c349108395c20d4f9a" +SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.20" +SRCREV = "9cacf108d0ee5863c7a656da5d2271bc2396e43d" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index e5bbca66..8e590965 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -15,9 +15,18 @@ SRC_URI_append_mx6sl = " file://weston.config" INI_UNCOMMENT_ASSIGNMENTS_append_imx = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland=true', '', d)} \ " +INI_UNCOMMENT_ASSIGNMENTS_append_mx6dl = " \ + use-g2d=1 \ +" +INI_UNCOMMENT_ASSIGNMENTS_append_mx6q = " \ + use-g2d=1 \ +" INI_UNCOMMENT_ASSIGNMENTS_append_mx7ulp = " \ use-g2d=1 \ " +INI_UNCOMMENT_ASSIGNMENTS_append_mx8 = " \ + repaint-window=16 \ +" INI_UNCOMMENT_ASSIGNMENTS_append_mx8mm = " \ use-g2d=1 \ " diff --git a/recipes-graphics/wayland/weston-init/imx/weston.ini b/recipes-graphics/wayland/weston-init/imx/weston.ini index d9094b1f..916e621a 100644 --- a/recipes-graphics/wayland/weston-init/imx/weston.ini +++ b/recipes-graphics/wayland/weston-init/imx/weston.ini @@ -3,14 +3,19 @@ idle-time=0 #use-g2d=1 #xwayland=true +#repaint-window=16 +#enable-overlay-view=1 #[shell] #size=1920x1080 +[libinput] +touchscreen_calibrator=true + #[output] #name=HDMI-A-1 #mode=1920x1080@60 -#transform=90 +#transform=rotate-90 #[output] #name=HDMI-A-2 @@ -19,7 +24,7 @@ idle-time=0 # off Disables the output # preferred Uses the preferred mode # current Uses the current crt controller mode -#transform=90 +#transform=rotate-90 [screen-share] command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize diff --git a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch index 62b864c1..3279a728 100644 --- a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch +++ b/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch @@ -1,7 +1,8 @@ -From 5f2d71998eb77068cbaee2d468cbb296a42d5739 Mon Sep 17 00:00:00 2001 +From a1548c742bf2dedbb47282d8a00407b60bbab669 Mon Sep 17 00:00:00 2001 From: Tom Hochstein <tom.hochstein@nxp.com> Date: Wed, 22 Feb 2017 15:53:30 +0200 Subject: [PATCH] weston-launch: Provide a default version that doesn't require + PAM weston-launch requires PAM for starting weston as a non-root user. @@ -57,7 +58,7 @@ index 08d23ec..cb9fd3f 100644 install: true ) diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c -index 8a711b4..54c567a 100644 +index 521cb2c..2d42d33 100644 --- a/libweston/weston-launch.c +++ b/libweston/weston-launch.c @@ -51,7 +51,9 @@ @@ -97,7 +98,7 @@ index 8a711b4..54c567a 100644 static int setup_launcher_socket(struct weston_launch *wl) -@@ -431,6 +437,7 @@ quit(struct weston_launch *wl, int status) +@@ -466,6 +472,7 @@ quit(struct weston_launch *wl, int status) close(wl->signalfd); close(wl->sock[0]); @@ -105,15 +106,15 @@ index 8a711b4..54c567a 100644 if (wl->new_user) { err = pam_close_session(wl->ph, 0); if (err) -@@ -438,6 +445,7 @@ quit(struct weston_launch *wl, int status) +@@ -473,6 +480,7 @@ quit(struct weston_launch *wl, int status) err, pam_strerror(wl->ph, err)); pam_end(wl->ph, err); } +#endif - if (ioctl(wl->tty, KDSKBMUTE, 0) && - ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) -@@ -666,6 +674,7 @@ setup_session(struct weston_launch *wl, char **child_argv) + /* + * Get a fresh handle to the tty as the previous one is in +@@ -710,6 +718,7 @@ setup_session(struct weston_launch *wl, char **child_argv) setenv("HOME", wl->pw->pw_dir, 1); setenv("SHELL", wl->pw->pw_shell, 1); @@ -121,7 +122,7 @@ index 8a711b4..54c567a 100644 env = pam_getenvlist(wl->ph); if (env) { for (i = 0; env[i]; ++i) { -@@ -674,6 +683,7 @@ setup_session(struct weston_launch *wl, char **child_argv) +@@ -718,6 +727,7 @@ setup_session(struct weston_launch *wl, char **child_argv) } free(env); } @@ -129,7 +130,7 @@ index 8a711b4..54c567a 100644 /* * We open a new session, so it makes sense -@@ -745,8 +755,10 @@ static void +@@ -789,8 +799,10 @@ static void help(const char *name) { fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); @@ -140,7 +141,7 @@ index 8a711b4..54c567a 100644 fprintf(stderr, " -t, --tty Start session on alternative tty,\n" " e.g. -t /dev/tty4, requires -u option.\n"); fprintf(stderr, " -v, --verbose Be verbose\n"); -@@ -760,7 +772,9 @@ main(int argc, char *argv[]) +@@ -804,7 +816,9 @@ main(int argc, char *argv[]) int i, c; char *tty = NULL; struct option opts[] = { @@ -150,7 +151,7 @@ index 8a711b4..54c567a 100644 { "tty", required_argument, NULL, 't' }, { "verbose", no_argument, NULL, 'v' }, { "help", no_argument, NULL, 'h' }, -@@ -772,11 +786,16 @@ main(int argc, char *argv[]) +@@ -816,11 +830,16 @@ main(int argc, char *argv[]) while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) { switch (c) { case 'u': @@ -167,7 +168,7 @@ index 8a711b4..54c567a 100644 break; case 't': tty = optarg; -@@ -828,8 +847,10 @@ main(int argc, char *argv[]) +@@ -872,8 +891,10 @@ main(int argc, char *argv[]) if (setup_tty(&wl, tty) < 0) exit(EXIT_FAILURE); @@ -179,7 +180,7 @@ index 8a711b4..54c567a 100644 if (setup_launcher_socket(&wl) < 0) exit(EXIT_FAILURE); diff --git a/meson_options.txt b/meson_options.txt -index c862ecc..73ef2c3 100644 +index 239bd2d..99e4ec3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -73,6 +73,13 @@ option( diff --git a/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch b/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch new file mode 100644 index 00000000..a4444e5d --- /dev/null +++ b/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch @@ -0,0 +1,23 @@ +Fix atomic modesetting with musl + +atomic modesetting seems to fail with drm weston backend and this patch fixes +it, below errors are seen before weston exits + +atomic: couldn't commit new state: Invalid argument + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/libweston/backend-drm/kms.c ++++ b/libweston/backend-drm/kms.c +@@ -1168,8 +1168,8 @@ drm_pending_state_apply_atomic(struct dr + wl_list_for_each(plane, &b->plane_list, link) { + drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n", + (unsigned long) plane->plane_id); +- plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); +- plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); ++ //plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); ++ //plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); + } + + flags |= DRM_MODE_ATOMIC_ALLOW_MODESET; diff --git a/recipes-graphics/wayland/weston_8.0.0.imx.bb b/recipes-graphics/wayland/weston_9.0.0.imx.bb index 24a21db5..825a1b1c 100644 --- a/recipes-graphics/wayland/weston_8.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_9.0.0.imx.bb @@ -3,7 +3,7 @@ # recipe. The second section customizes the recipe for i.MX. ########### OE-core copy ################## -# Upstream hash: 9b1d30810eeecb46b977c8eed68be69aef891312 +# Upstream hash: 0a882490fe75915c7a119f3498df6750be25f8e0 SUMMARY = "Weston, a Wayland compositor" DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" @@ -17,19 +17,25 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.desktop \ file://xwayland.weston-start \ file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ + file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \ " -SRC_URI[md5sum] = "53e4810d852df0601d01fd986a5b22b3" -SRC_URI[sha256sum] = "7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848" + +SRC_URI_append_libc-musl = " file://dont-use-plane-add-prop.patch " + +SRC_URI[sha256sum] = "5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" inherit meson pkgconfig useradd features_check # depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" +# weston-init requires pam enabled if started via systemd +REQUIRED_DISTRO_FEATURES = "opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" -DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" +DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0" DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" +LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}" + WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false" @@ -38,7 +44,13 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - launch" + launch \ + image-jpeg \ + screenshare \ + shell-desktop \ + shell-fullscreen \ + shell-ivi" + # # Compositor choices # @@ -65,15 +77,25 @@ PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" # Weston with systemd-login support PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" # Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor" +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false" # colord CMS support PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord" # Clients support PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" # Virtual remote output with GStreamer on DRM backend -PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer-1.0" +PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0" # Weston with PAM support PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam" +# Weston with screen-share support +PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false" +# Traditional desktop shell +PACKAGECONFIG[shell-desktop] = "-Dshell-desktop=true,-Dshell-desktop=false" +# Fullscreen shell +PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=false" +# In-Vehicle Infotainment (IVI) shell +PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" +# JPEG image loading support +PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them @@ -126,14 +148,14 @@ SUMMARY = "Weston, a Wayland compositor, i.MX fork" DEFAULT_PREFERENCE = "-1" -SRCBRANCH = "weston-imx-8.0" +SRCBRANCH = "weston-imx-9.0" SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \ file://weston.png \ file://weston.desktop \ file://xwayland.weston-start \ file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ " -SRCREV = "f6a7d35650121fbe7c20d4cbe0eaac730fab3b2a" +SRCREV = "a1823f20a1d6e24d2f56e98c5576eda34a94f567" S = "${WORKDIR}/git" # Disable OpenGL for parts with GPU support for 2D but not 3D @@ -155,6 +177,7 @@ PACKAGECONFIG_append_imxgpu2d = " imxg2d" # Clients support SIMPLE_CLIENTS = "all" SIMPLE_CLIENTS_imxfbdev = "damage,im,egl,shm,touch,dmabuf-v4l" +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor" PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLE_CLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" # Weston with i.MX GPU support PACKAGECONFIG[imxgpu] = "-Dimxgpu=true,-Dimxgpu=false,virtual/egl" diff --git a/recipes-graphics/xorg-driver/xf86-video-armada_git.bb b/recipes-graphics/xorg-driver/xf86-video-armada_git.bb index 0aba8e5a..cc68a518 100644 --- a/recipes-graphics/xorg-driver/xf86-video-armada_git.bb +++ b/recipes-graphics/xorg-driver/xf86-video-armada_git.bb @@ -28,7 +28,7 @@ SRCREV_FORMAT = "armada_etna" PV = "0.1+git${SRCPV}" SRC_URI = " \ - git://git.arm.linux.org.uk/cgit/xf86-video-armada.git;branch=unstable-devel;protocol=http;name=armada \ + git://git.armlinux.org.uk/cgit/xf86-video-armada.git;branch=unstable-devel;protocol=http;name=armada \ git://github.com/etnaviv/etna_viv.git;protocol=https;name=etna;destsuffix=etna_viv \ " diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-1.11.inc b/recipes-kernel/cryptodev/cryptodev-qoriq-1.11.inc deleted file mode 100644 index e734cc4e..00000000 --- a/recipes-kernel/cryptodev/cryptodev-qoriq-1.11.inc +++ /dev/null @@ -1,21 +0,0 @@ -HOMEPAGE = "http://cryptodev-linux.org/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -python() { - d.appendVar('PROVIDES', ' ' + d.getVar('BPN').replace('-qoriq', '')) - pkgs = d.getVar('PACKAGES').split() - for p in pkgs: - if '-qoriq' in p: - d.appendVar("RPROVIDES_" + p, ' ' + p.replace('-qoriq', '')) - d.appendVar("RCONFLICTS_" + p, ' ' + p.replace('-qoriq', '')) - d.appendVar("RREPLACES_" + p, ' ' + p.replace('-qoriq', '')) -} - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cryptodev-linux;protocol=https;nobranch=1" -SRCREV = "2299d39475e91392abd050ea09f2d20feecb4adf" - -S = "${WORKDIR}/git" - -CLEANBROKEN = "1" diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.11.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.11.bb deleted file mode 100644 index c2cbc71b..00000000 --- a/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.11.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-kernel/cryptodev/cryptodev-linux_${PV}.bb -require cryptodev-qoriq-${PV}.inc - -BBCLASSEXTEND = "" -COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.11.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.11.bb deleted file mode 100644 index 86078c57..00000000 --- a/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.11.bb +++ /dev/null @@ -1,10 +0,0 @@ -require recipes-kernel/cryptodev/cryptodev-module_${PV}.bb -require cryptodev-qoriq-${PV}.inc - -inherit qoriq_build_64bit_kernel - -SRC_URI += " \ -file://0001-Disable-installing-header-file-provided-by-another-p.patch \ -" - -COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.11.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.11.bb deleted file mode 100644 index 784c38b7..00000000 --- a/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.11.bb +++ /dev/null @@ -1,8 +0,0 @@ -require recipes-kernel/cryptodev/cryptodev-tests_${PV}.bb -require cryptodev-qoriq-${PV}.inc - -SRC_URI += " \ -file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \ -" - -COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch b/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch deleted file mode 100644 index 84fd27e6..00000000 --- a/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 1980a8f4779a955e73285e7a0d86549b69bea5c8 Mon Sep 17 00:00:00 2001 -From: Yu Zongchun <b40527@freescale.com> -Date: Sun, 28 Apr 2013 14:39:22 +0800 -Subject: [PATCH] Add the compile and install rules for cryptodev tests folder - -This is required to install the cryptodev tests folder to rootfs - -Signed-off-by: Yu Zongchun <b40527@freescale.com> - -Upstream-Status: Pending - ---- - Makefile | 6 ++++++ - tests/Makefile | 8 ++++++++ - 2 files changed, 14 insertions(+), 0 deletions(-) - -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -35,6 +35,9 @@ modules_install: - $(MAKE) $(KERNEL_MAKE_OPTS) modules_install - install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h - -+install_tests: -+ make -C tests install DESTDIR=$(PREFIX) -+ - clean: - $(MAKE) $(KERNEL_MAKE_OPTS) clean - rm -f $(hostprogs) *~ -@@ -43,6 +46,9 @@ clean: - check: - CFLAGS=$(CRYPTODEV_CFLAGS) KERNEL_DIR=$(KERNEL_DIR) $(MAKE) -C tests check - -+testprogs: -+ KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs -+ - CPOPTS = - ifneq ($(SHOW_TYPES),) - CPOPTS += --show-types -Index: git/tests/Makefile -=================================================================== ---- git.orig/tests/Makefile -+++ git/tests/Makefile -@@ -23,6 +23,12 @@ bindir = $(execprefix)/bin - - all: $(hostprogs) - -+install: -+ install -d $(DESTDIR)/usr/bin/tests_cryptodev -+ for bin in $(hostprogs); do \ -+ install -m 755 $${bin} $(DESTDIR)/usr/bin/tests_cryptodev/; \ -+ done -+ - check: $(hostprogs) - ./cipher - ./hmac -@@ -38,6 +44,8 @@ install: - install -m 755 $$prog $(DESTDIR)/$(bindir); \ - done - -+testprogs: $(hostprogs) -+ - clean: - rm -f *.o *~ $(hostprogs) - diff --git a/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch b/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch deleted file mode 100644 index 885b5823..00000000 --- a/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8a884f55bd1527baa82fab68c186ba546273860c Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <denys@ti.com> -Date: Sun, 6 Apr 2014 19:51:39 -0400 -Subject: [PATCH] Disable installing header file provided by another package - -Signed-off-by: Denys Dmytriyenko <denys@ti.com> - -Upstream-Status: Inappropriate [ OE specific ] ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 5a080e0..bf02396 100644 ---- a/Makefile -+++ b/Makefile -@@ -33,7 +33,6 @@ install: modules_install - - modules_install: - $(MAKE) $(KERNEL_MAKE_OPTS) modules_install -- install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h - - clean: - $(MAKE) $(KERNEL_MAKE_OPTS) clean diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p1.0.bb index 7d8d0386..556ec12d 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p1.0.bb @@ -5,16 +5,16 @@ SUMMARY = "Kernel loadable module for Vivante GPU" DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \ allowing flexibility to use a newer graphics release with an older kernel." LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" -SRCBRANCH = "imx_5.4.24_2.1.0" +SRCBRANCH = "imx_5.4.70_2.3.0" LOCALVERSION = "-${SRCBRANCH}" KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https" SRC_URI = " \ ${KERNEL_SRC};branch=${SRCBRANCH};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ file://Add-makefile.patch \ " -SRCREV = "2f6f3e92a82e51fe39b53ee758273bef26964836" +SRCREV = "13b3c469663da0c79d385ce15887f6b5805f060d" S = "${WORKDIR}/git" diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.6.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.6.0.bb new file mode 100644 index 00000000..5cb7f764 --- /dev/null +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.6.0.bb @@ -0,0 +1,19 @@ +# Copyright 2020 NXP + +DESCRIPTION = "Kernel loadable module for ISP" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/vvcam/LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" + +SRCBRANCH = "imx_5.4.70_2.3.0" +ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https" + +SRC_URI = " \ + ${ISP_KERNEL_SRC};branch=${SRCBRANCH} \ +" +SRCREV = "9824e601d336bcef2dc6284ff3605e0b1d32d63d" + +S = "${WORKDIR}/git/vvcam/v4l2" + +inherit module + +COMPATIBLE_MACHINE = "(imx|use-nxp-bsp)" diff --git a/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig b/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig index 4e7d4a9f..dbe4597f 100644 --- a/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig @@ -188,6 +188,7 @@ CONFIG_PCIE_LAYERSCAPE_GEN4=y CONFIG_PCI_ENDPOINT=y CONFIG_PCI_ENDPOINT_CONFIGFS=y CONFIG_PCI_EPF_TEST=y +CONFIG_IMX_MIC_EPF=m CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_FW_LOADER_USER_HELPER=y @@ -227,6 +228,13 @@ CONFIG_SRAM=y CONFIG_PCI_ENDPOINT_TEST=y CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT25=m +CONFIG_SCIF_BUS=m +CONFIG_VOP_BUS=m +CONFIG_IMX_MIC_HOST=m +CONFIG_IMX_MIC_CARD=m +CONFIG_SCIF=m +CONFIG_MIC_COSM=m +CONFIG_VOP=m # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y CONFIG_SCSI_SAS_ATA=y @@ -267,7 +275,6 @@ CONFIG_FSL_SDK_DPAA_ETH=y CONFIG_FSL_DPAA2_ETH=y CONFIG_FSL_ENETC=y CONFIG_FSL_ENETC_VF=y -CONFIG_FSL_ENETC_MDIO=y CONFIG_HIX5HD2_GMAC=y CONFIG_HNS_DSAF=y CONFIG_HNS_ENET=y @@ -328,6 +335,7 @@ CONFIG_KEYBOARD_IMX_SC_PWRKEY=y CONFIG_KEYBOARD_CROS_EC=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C=m CONFIG_INPUT_MISC=y CONFIG_INPUT_MPL3115=y @@ -501,8 +509,9 @@ CONFIG_DRM_RCAR_LVDS=m CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_RAYDIUM_RM67191=y CONFIG_DRM_PANEL_SEIKO_43WVF1G=y -CONFIG_DRM_NXP_SEIKO_43WVFIG=y +CONFIG_DRM_PANEL_WKS_101WX001=y CONFIG_DRM_FSL_IMX_LVDS_BRIDGE=y +CONFIG_DRM_NXP_SEIKO_43WVFIG=y CONFIG_DRM_SII902X=m CONFIG_DRM_I2C_ADV7511=y CONFIG_DRM_NWL_MIPI_DSI=y @@ -521,8 +530,8 @@ CONFIG_DRM_IMX8QXP_LDB=y CONFIG_DRM_IMX8MP_LDB=y CONFIG_DRM_IMX_HDMI=y CONFIG_DRM_IMX_SEC_DSIM=y -CONFIG_DRM_IMX_CDNS_MHDP=y CONFIG_DRM_IMX_DCSS=y +CONFIG_DRM_IMX_CDNS_MHDP=y CONFIG_DRM_ETNAVIV=m CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_HISI_KIRIN=m @@ -543,7 +552,6 @@ CONFIG_SND=y CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=y -CONFIG_SND_SOC_FSL_DAI=m CONFIG_SND_SOC_FSL_EASRC=y CONFIG_SND_IMX_SOC=y CONFIG_SND_SOC_IMX_AK4458=y @@ -561,6 +569,7 @@ CONFIG_SND_SOC_IMX_PDM_MIC=y CONFIG_SND_SOC_IMX_DSP=y CONFIG_SND_SOC_IMX_CDNHDMI=y CONFIG_SND_SOC_IMX_XCVR=y +CONFIG_SND_SOC_IMX_PCM512X=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SOF_OF=m CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y @@ -711,6 +720,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=y CONFIG_STAGING=y CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_IMX_CAPTURE=y +CONFIG_IMX8_MEDIA_DEVICE=m CONFIG_ION=y CONFIG_ION_SYSTEM_HEAP=y CONFIG_ION_CMA_HEAP=y @@ -818,12 +828,14 @@ CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_TLS=m -CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_OFB=m +CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m CONFIG_CRYPTO_RMD128=m @@ -831,33 +843,28 @@ CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SM4=m +CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y CONFIG_CRYPTO_DEV_FSL_CAAM=y CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m -CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m -CONFIG_CRYPTO_SM3=m -CONFIG_CRYPTO_STREEBOG=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_TEA=m CONFIG_INDIRECT_PIO=y CONFIG_CMA_SIZE_MBYTES=320 CONFIG_PRINTK_TIME=y @@ -872,12 +879,3 @@ CONFIG_MEMTEST=y CONFIG_CORESIGHT=y CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y CONFIG_CORESIGHT_SOURCE_ETM4X=y -CONFIG_IMX8_MEDIA_DEVICE=m -CONFIG_IMX8_ISI_HW=y -CONFIG_IMX8_ISI_CORE=y -CONFIG_IMX8_ISI_CAPTURE=y -CONFIG_IMX8_ISI_M2M=y -CONFIG_IMX8_MIPI_CSI2=y -CONFIG_IMX8_MIPI_CSI2_SAM=y -CONFIG_IMX8_PARALLEL_CSI=y -CONFIG_GMSL_MAX9286=y diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb index 526ad92c..beeeeadc 100644 --- a/recipes-kernel/linux/linux-fslc-imx_5.4.bb +++ b/recipes-kernel/linux/linux-fslc-imx_5.4.bb @@ -13,7 +13,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community." # This recipe (and corresponding kernel repository and branch) receives updates # from 3 different sources: # 1. Stable [linux-5.4.y] branch updates of korg; -# 2. NXP-specific updates via branch [5.4-2.1.x-imx] shared via CodeAurora forum; +# 2. NXP-specific updates via branch [5.4-2.2.x-imx] shared via CodeAurora forum; # 3. Critical patches, which are not (yet) integrated into either of 2 above # sources, but are required to be applied to the kernel tree. # @@ -28,44 +28,36 @@ Latest stable Kernel patchlevel is applied and maintained by Community." # ------------------------------------------------------------------------------ # 1. Stable (tag or SHA(s)) # ------------------------------------------------------------------------------ -# tag: v5.4.78 +# tag: v5.4.110 # # ------------------------------------------------------------------------------ # 2. NXP-specific (tag or SHA(s)) # ------------------------------------------------------------------------------ -# tag: rel_imx_5.4.47_2.2.0 -# -# 5ec03d06f54e MLK-24836 ARM: imx: Refresh wdog should consider the CMD mode on i.MX7ULP -# bba6ff64f0df MLK-24824-3 ARM: imx: Refresh wdog1 to make sure it is NOT timeout before disabled -# bad81140da7c MLK-24828 ARM: imx: Add revision support for i.MX7ULP rev 2.2 -# 99fb4d4619ff MLK-24824-2 watchdog: imx7ulp: Move suspend/resume to noirq phase -# 8c8859e1c5b5 MLK-24824-1 watchdog: imx7ulp: Strictly follow the sequence for wdog operations +# tag: rel_imx_5.4.70_2.3.0 # # ------------------------------------------------------------------------------ # 3. Critical patches (SHA(s)) # ------------------------------------------------------------------------------ -# 7642303e41c1 irq-imx-irqsteer: fix compile error if CONFIG_PM_SLEEP is not set -# b3d088d2f8fa fbdev: fix fbinfo flag dropped upstream -# c874333fa0be arm64: dts: imx8mp: Add fallback compatible to ocotp node -# 55abb34c9faf arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs -# df1f59fb613e arm64: dts: imx8mn: Use "fsl,imx8mm-ocotp" as ocotp's fallback compatible -# 7ad2a7f3fd6f arm64: dts: imx8mm: Remove incorrect fallback compatible for ocotp -# 129a6fad43b8 arm: imx: include i.MX6SX DDR freq implementation for i.MX6UL -# e85ce3157725 arm: imx: do not include smp_wfe_imx6.S for i.MX6SX -# 4f49200132e6 arm: imx: enable HAVE_IMX_BUSFREQ for i.MX6 -# 5d229c51b5a5 arm: imx: do not build busfreq without HAVE_IMX_BUSFREQ -# 285869ec9087 ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation -# f03791085754 ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes -# 67e44952c670 ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path' -# d4b105f930e2 ARM: dts: Add support for two more Kontron evalkit boards 'N6311 S' and 'N6411 S' -# e778467f65d0 ARM: dts: imx6ul-kontron-n6310-s: Move common nodes to a separate file -# 8b39f5e53831 ARM: dts: Add support for two more Kontron SoMs N6311 and N6411 -# 3bee262233eb ARM: dts: imx6ul-kontron-n6310: Move common SoM nodes to a separate file -# 40a6a98b3f38 ARM: imx: Fix boot crash if ocotp is not found -# 8aad5031be00 ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs -# 564409aa3b33 soc: imx-scu: Using existing serial_number instead of UID -# 0ee8e005bbfc soc: imx8: Using existing serial_number instead of UID -# 134cbb845fc7 ARM: imx: Add serial number support for i.MX6/7 SoCs +# b598b85172f7 irq-imx-irqsteer: fix compile error if CONFIG_PM_SLEEP is not set +# 845099bfd0b8 fbdev: fix fbinfo flag dropped upstream +# 847bfb09bb3b arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs +# d7ca6973c6d4 arm64: dts: imx8mm: Remove incorrect fallback compatible for ocotp +# 539d19f12066 arm: imx: include i.MX6SX DDR freq implementation for i.MX6UL +# 169b71ce3f8a arm: imx: do not include smp_wfe_imx6.S for i.MX6SX +# 60be4c625594 arm: imx: enable HAVE_IMX_BUSFREQ for i.MX6 +# f393781fa575 arm: imx: do not build busfreq without HAVE_IMX_BUSFREQ +# e0e74faf6af4 ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation +# ad24781aecc3 ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes +# d56aa09ed0e0 ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path' +# 923bc9e57b24 ARM: dts: Add support for two more Kontron evalkit boards 'N6311 S' and 'N6411 S' +# f952a6404d10 ARM: dts: imx6ul-kontron-n6310-s: Move common nodes to a separate file +# 1fdb6565a632 ARM: dts: Add support for two more Kontron SoMs N6311 and N6411 +# 4fb833f01c30 ARM: dts: imx6ul-kontron-n6310: Move common SoM nodes to a separate file +# 54c975dabcde ARM: imx: Fix boot crash if ocotp is not found +# 1041cd02b33c ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs +# 974b100d789c soc: imx-scu: Using existing serial_number instead of UID +# 6fbfed9afe99 soc: imx8: Using existing serial_number instead of UID +# 64d8ea803af5 ARM: imx: Add serial number support for i.MX6/7 SoCs # # NOTE to upgraders: # This recipe should NOT collect individual patches, they should be applied to @@ -78,18 +70,18 @@ include linux-fslc.inc LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -SRCBRANCH = "5.4-2.2.x-imx" -SRCREV = "fc26781f713f2fe79a50a5bb44ecb4b3d70af907" +KBRANCH = "5.4-2.3.x-imx" +SRCREV = "0b75fb32ce4bed3f44bd0e2e78c4f08521fac3c8" # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition # required by kernel-yocto.bbclass. # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "5.4.78" +LINUX_VERSION = "5.4.110" # Local version indicates the branch name in the NXP kernel tree where patches are collected from. -LOCALVERSION = "-imx-5.4.47-2.2.0" +LOCALVERSION = "-imx-5.4.70-2.3.0" DEFAULT_PREFERENCE = "1" diff --git a/recipes-kernel/linux/linux-fslc-lts-4.19.bb b/recipes-kernel/linux/linux-fslc-lts-4.19.bb index 41b09347..b38e8216 100644 --- a/recipes-kernel/linux/linux-fslc-lts-4.19.bb +++ b/recipes-kernel/linux/linux-fslc-lts-4.19.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" PV = "4.19.125+git${SRCPV}" -SRCBRANCH = "4.19.x+fslc" +KBRANCH = "4.19.x+fslc" SRCREV = "d839dc0169b3c568813f2ee2abc30720f5244b89" COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" diff --git a/recipes-kernel/linux/linux-fslc-mfgtool_5.10.bb b/recipes-kernel/linux/linux-fslc-mfgtool_5.10.bb new file mode 100644 index 00000000..c155ebb9 --- /dev/null +++ b/recipes-kernel/linux/linux-fslc-mfgtool_5.10.bb @@ -0,0 +1,15 @@ +# Copyright (C) 2014-2018 O.S. Systems Software LTDA. +# Copyright (C) 2014-2016 Freescale Semiconductor + +SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" +DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \ +that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \ +environment" + +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-fslc:" +require linux-fslc_${PV}.bb +require linux-mfgtool.inc + +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +do_package[vardepsexclude] = "DATETIME" diff --git a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb index eb8cf0c4..db972ba7 100644 --- a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb +++ b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb @@ -10,8 +10,8 @@ require recipes-kernel/linux/linux-qoriq.inc LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION = "5.4.64" +LINUX_VERSION = "5.4.92" SRCBRANCH = "5.4.y+qoriq+fslc" -SRCREV = "4c04c442c0e91e7cf01f830aca524f09b5613f29" +SRCREV = "11d4722c637a77c6e1c9a8eeec091f1588f6b3f3" SRC_URI := "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH}" diff --git a/recipes-kernel/linux/linux-fslc.inc b/recipes-kernel/linux/linux-fslc.inc index f6d04d59..566dd194 100644 --- a/recipes-kernel/linux/linux-fslc.inc +++ b/recipes-kernel/linux/linux-fslc.inc @@ -5,6 +5,6 @@ require recipes-kernel/linux/linux-imx.inc DEPENDS += "lzop-native bc-native" -SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH} \ file://defconfig" LOCALVERSION = "-fslc" diff --git a/recipes-kernel/linux/linux-fslc/armv8a/defconfig b/recipes-kernel/linux/linux-fslc/armv8a/defconfig new file mode 100644 index 00000000..df595480 --- /dev/null +++ b/recipes-kernel/linux/linux-fslc/armv8a/defconfig @@ -0,0 +1,1097 @@ +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_AUDIT=y +CONFIG_NO_HZ_IDLE=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_NUMA_BALANCING=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_BLK_CGROUP=y +CONFIG_CGROUP_PIDS=y +CONFIG_CGROUP_HUGETLB=y +CONFIG_CPUSETS=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_PERF=y +CONFIG_USER_NS=y +CONFIG_SCHED_AUTOGROUP=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_KALLSYMS_ALL=y +# CONFIG_COMPAT_BRK is not set +CONFIG_PROFILING=y +CONFIG_ARCH_ACTIONS=y +CONFIG_ARCH_AGILEX=y +CONFIG_ARCH_SUNXI=y +CONFIG_ARCH_ALPINE=y +CONFIG_ARCH_BCM2835=y +CONFIG_ARCH_BCM_IPROC=y +CONFIG_ARCH_BERLIN=y +CONFIG_ARCH_BRCMSTB=y +CONFIG_ARCH_EXYNOS=y +CONFIG_ARCH_K3=y +CONFIG_ARCH_LAYERSCAPE=y +CONFIG_ARCH_LG1K=y +CONFIG_ARCH_HISI=y +CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_MESON=y +CONFIG_ARCH_MVEBU=y +CONFIG_ARCH_MXC=y +CONFIG_ARCH_QCOM=y +CONFIG_ARCH_RENESAS=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_ARCH_S32=y +CONFIG_ARCH_SEATTLE=y +CONFIG_ARCH_STRATIX10=y +CONFIG_ARCH_SYNQUACER=y +CONFIG_ARCH_TEGRA=y +CONFIG_ARCH_SPRD=y +CONFIG_ARCH_THUNDER=y +CONFIG_ARCH_THUNDER2=y +CONFIG_ARCH_UNIPHIER=y +CONFIG_ARCH_VEXPRESS=y +CONFIG_ARCH_VISCONTI=y +CONFIG_ARCH_XGENE=y +CONFIG_ARCH_ZX=y +CONFIG_ARCH_ZYNQMP=y +CONFIG_ARM64_VA_BITS_48=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_SMT=y +CONFIG_NUMA=y +CONFIG_SECCOMP=y +CONFIG_KEXEC=y +CONFIG_KEXEC_FILE=y +CONFIG_CRASH_DUMP=y +CONFIG_XEN=y +CONFIG_COMPAT=y +CONFIG_RANDOMIZE_BASE=y +CONFIG_HIBERNATION=y +CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y +CONFIG_ENERGY_MODEL=y +CONFIG_ARM_CPUIDLE=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +CONFIG_CPUFREQ_DT=y +CONFIG_ACPI_CPPC_CPUFREQ=m +CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m +CONFIG_ARM_ARMADA_37XX_CPUFREQ=y +CONFIG_ARM_SCPI_CPUFREQ=y +CONFIG_ARM_IMX_CPUFREQ_DT=m +CONFIG_ARM_QCOM_CPUFREQ_NVMEM=y +CONFIG_ARM_QCOM_CPUFREQ_HW=y +CONFIG_ARM_RASPBERRYPI_CPUFREQ=m +CONFIG_ARM_TEGRA186_CPUFREQ=y +CONFIG_QORIQ_CPUFREQ=y +CONFIG_ARM_SCPI_PROTOCOL=y +CONFIG_RASPBERRYPI_FIRMWARE=y +CONFIG_INTEL_STRATIX10_SERVICE=y +CONFIG_INTEL_STRATIX10_RSU=m +CONFIG_EFI_CAPSULE_LOADER=y +CONFIG_IMX_SCU=y +CONFIG_IMX_SCU_PD=y +CONFIG_ACPI=y +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y +CONFIG_ACPI_APEI_EINJ=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=y +CONFIG_ARM64_CRYPTO=y +CONFIG_CRYPTO_SHA1_ARM64_CE=y +CONFIG_CRYPTO_SHA2_ARM64_CE=y +CONFIG_CRYPTO_SHA512_ARM64_CE=m +CONFIG_CRYPTO_SHA3_ARM64=m +CONFIG_CRYPTO_SM3_ARM64_CE=m +CONFIG_CRYPTO_GHASH_ARM64_CE=y +CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m +CONFIG_CRYPTO_AES_ARM64_CE_CCM=y +CONFIG_CRYPTO_AES_ARM64_CE_BLK=y +CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_CRYPTO_AES_ARM64_BS=m +CONFIG_JUMP_LABEL=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_KSM=y +CONFIG_MEMORY_FAILURE=y +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IPV6=m +CONFIG_NETFILTER=y +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_NET_DSA=m +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +CONFIG_VLAN_8021Q_MVRP=y +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_CBS=m +CONFIG_NET_SCH_ETF=m +CONFIG_NET_SCH_TAPRIO=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_FLOWER=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_GACT=m +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_GATE=m +CONFIG_QRTR=m +CONFIG_QRTR_SMD=m +CONFIG_QRTR_TUN=m +CONFIG_BPF_JIT=y +CONFIG_CAN=m +CONFIG_CAN_RCAR=m +CONFIG_CAN_RCAR_CANFD=m +CONFIG_CAN_FLEXCAN=m +CONFIG_BT=m +CONFIG_BT_HIDP=m +# CONFIG_BT_HS is not set +# CONFIG_BT_LE is not set +CONFIG_BT_LEDS=y +# CONFIG_BT_DEBUGFS is not set +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_BCM=y +CONFIG_BT_HCIUART_QCA=y +CONFIG_CFG80211=m +CONFIG_MAC80211=m +CONFIG_MAC80211_LEDS=y +CONFIG_RFKILL=m +CONFIG_NET_9P=y +CONFIG_NET_9P_VIRTIO=y +CONFIG_NFC=m +CONFIG_NFC_NCI=m +CONFIG_NFC_S3FWRN5_I2C=m +CONFIG_PCI=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PASID=y +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_ACPI=y +CONFIG_PCI_AARDVARK=y +CONFIG_PCI_TEGRA=y +CONFIG_PCIE_RCAR_HOST=y +CONFIG_PCIE_RCAR_EP=y +CONFIG_PCI_HOST_GENERIC=y +CONFIG_PCI_XGENE=y +CONFIG_PCIE_ALTERA=y +CONFIG_PCIE_ALTERA_MSI=y +CONFIG_PCI_HOST_THUNDER_PEM=y +CONFIG_PCI_HOST_THUNDER_ECAM=y +CONFIG_PCIE_ROCKCHIP_HOST=m +CONFIG_PCIE_BRCMSTB=m +CONFIG_PCI_LAYERSCAPE=y +CONFIG_PCIE_LAYERSCAPE_GEN4=y +CONFIG_PCI_HISI=y +CONFIG_PCIE_QCOM=y +CONFIG_PCIE_ARMADA_8K=y +CONFIG_PCIE_KIRIN=y +CONFIG_PCIE_HISI_STB=y +CONFIG_PCIE_TEGRA194_HOST=m +CONFIG_PCI_ENDPOINT=y +CONFIG_PCI_ENDPOINT_CONFIGFS=y +CONFIG_PCI_EPF_TEST=m +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_HISILICON_LPC=y +CONFIG_SIMPLE_PM_BUS=y +CONFIG_FSL_MC_BUS=y +CONFIG_TEGRA_ACONNECT=m +CONFIG_MTD=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_DATAFLASH=y +CONFIG_MTD_SST25L=y +CONFIG_MTD_RAW_NAND=y +CONFIG_MTD_NAND_DENALI_DT=y +CONFIG_MTD_NAND_MARVELL=y +CONFIG_MTD_NAND_FSL_IFC=y +CONFIG_MTD_NAND_QCOM=y +CONFIG_MTD_SPI_NOR=y +CONFIG_SPI_CADENCE_QUADSPI=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_NBD=m +CONFIG_VIRTIO_BLK=y +CONFIG_BLK_DEV_NVME=m +CONFIG_SRAM=y +CONFIG_PCI_ENDPOINT_TEST=m +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +CONFIG_UACCE=m +# CONFIG_SCSI_PROC_FS is not set +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_HISI_SAS=y +CONFIG_SCSI_HISI_SAS_PCI=y +CONFIG_MEGARAID_SAS=y +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_UFSHCD=y +CONFIG_SCSI_UFSHCD_PLATFORM=y +CONFIG_SCSI_UFS_QCOM=m +CONFIG_SCSI_UFS_HISI=y +CONFIG_ATA=y +CONFIG_SATA_AHCI=y +CONFIG_SATA_AHCI_PLATFORM=y +CONFIG_AHCI_CEVA=y +CONFIG_AHCI_MVEBU=y +CONFIG_AHCI_XGENE=y +CONFIG_AHCI_QORIQ=y +CONFIG_SATA_SIL24=y +CONFIG_SATA_RCAR=y +CONFIG_PATA_PLATFORM=y +CONFIG_PATA_OF_PLATFORM=y +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_BLK_DEV_DM=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m +CONFIG_NETDEVICES=y +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_TUN=y +CONFIG_VETH=m +CONFIG_VIRTIO_NET=y +CONFIG_NET_DSA_MSCC_FELIX=m +CONFIG_AMD_XGBE=y +CONFIG_NET_XGENE=y +CONFIG_ATL1C=m +CONFIG_BCMGENET=m +CONFIG_BNX2X=m +CONFIG_MACB=y +CONFIG_THUNDER_NIC_PF=y +CONFIG_FEC=y +CONFIG_FSL_FMAN=y +CONFIG_FSL_DPAA_ETH=y +CONFIG_FSL_DPAA2_ETH=y +CONFIG_FSL_ENETC=y +CONFIG_FSL_ENETC_VF=y +CONFIG_FSL_ENETC_QOS=y +CONFIG_HIX5HD2_GMAC=y +CONFIG_HNS_DSAF=y +CONFIG_HNS_ENET=y +CONFIG_HNS3=y +CONFIG_HNS3_HCLGE=y +CONFIG_HNS3_ENET=y +CONFIG_E1000=y +CONFIG_E1000E=y +CONFIG_IGB=y +CONFIG_IGBVF=y +CONFIG_MVNETA=y +CONFIG_MVPP2=y +CONFIG_SKY2=y +CONFIG_MLX4_EN=m +CONFIG_MLX5_CORE=m +CONFIG_MLX5_CORE_EN=y +CONFIG_QCOM_EMAC=m +CONFIG_RMNET=m +CONFIG_SH_ETH=y +CONFIG_RAVB=y +CONFIG_SMC91X=y +CONFIG_SMSC911X=y +CONFIG_SNI_AVE=y +CONFIG_SNI_NETSEC=y +CONFIG_STMMAC_ETH=m +CONFIG_TI_K3_AM65_CPSW_NUSS=y +CONFIG_QCOM_IPA=m +CONFIG_MDIO_BUS_MUX_MMIOREG=y +CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y +CONFIG_AQUANTIA_PHY=y +CONFIG_MARVELL_PHY=m +CONFIG_MARVELL_10G_PHY=m +CONFIG_MESON_GXL_PHY=m +CONFIG_MICREL_PHY=y +CONFIG_MICROSEMI_PHY=y +CONFIG_AT803X_PHY=y +CONFIG_REALTEK_PHY=m +CONFIG_ROCKCHIP_PHY=y +CONFIG_VITESSE_PHY=y +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m +CONFIG_USB_LAN78XX=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SR9800=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_ATH10K=m +CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_SNOC=m +CONFIG_BRCMFMAC=m +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_WL18XX=m +CONFIG_WLCORE_SDIO=m +CONFIG_INPUT_EVDEV=y +CONFIG_KEYBOARD_ADC=m +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_SNVS_PWRKEY=m +CONFIG_KEYBOARD_IMX_SC_KEY=m +CONFIG_KEYBOARD_CROS_EC=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PM8941_PWRKEY=y +CONFIG_INPUT_PM8XXX_VIBRATOR=m +CONFIG_INPUT_HISI_POWERKEY=y +# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_AMBAKMI=y +CONFIG_LEGACY_PTY_COUNT=16 +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_BCM2835AUX=y +CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_8250_OMAP=y +CONFIG_SERIAL_8250_MT6577=y +CONFIG_SERIAL_8250_UNIPHIER=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_MESON=y +CONFIG_SERIAL_MESON_CONSOLE=y +CONFIG_SERIAL_SAMSUNG=y +CONFIG_SERIAL_SAMSUNG_CONSOLE=y +CONFIG_SERIAL_TEGRA=y +CONFIG_SERIAL_TEGRA_TCU=y +CONFIG_SERIAL_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_SH_SCI=y +CONFIG_SERIAL_MSM=y +CONFIG_SERIAL_MSM_CONSOLE=y +CONFIG_SERIAL_QCOM_GENI=y +CONFIG_SERIAL_QCOM_GENI_CONSOLE=y +CONFIG_SERIAL_XILINX_PS_UART=y +CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y +CONFIG_SERIAL_FSL_LPUART=y +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +CONFIG_SERIAL_FSL_LINFLEXUART=y +CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y +CONFIG_SERIAL_MVEBU_UART=y +CONFIG_SERIAL_OWL=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS_I2C_INFINEON=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y +CONFIG_I2C_BCM2835=m +CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_I2C_GPIO=m +CONFIG_I2C_IMX=y +CONFIG_I2C_IMX_LPI2C=y +CONFIG_I2C_MESON=y +CONFIG_I2C_MV64XXX=y +CONFIG_I2C_OWL=y +CONFIG_I2C_PXA=y +CONFIG_I2C_QCOM_CCI=m +CONFIG_I2C_QCOM_GENI=m +CONFIG_I2C_QUP=y +CONFIG_I2C_RK3X=y +CONFIG_I2C_SH_MOBILE=y +CONFIG_I2C_TEGRA=y +CONFIG_I2C_UNIPHIER_F=y +CONFIG_I2C_RCAR=y +CONFIG_I2C_CROS_EC_TUNNEL=y +CONFIG_SPI=y +CONFIG_SPI_ARMADA_3700=y +CONFIG_SPI_BCM2835=m +CONFIG_SPI_BCM2835AUX=m +CONFIG_SPI_FSL_LPSPI=y +CONFIG_SPI_FSL_QUADSPI=y +CONFIG_SPI_NXP_FLEXSPI=y +CONFIG_SPI_IMX=m +CONFIG_SPI_FSL_DSPI=y +CONFIG_SPI_MESON_SPICC=m +CONFIG_SPI_MESON_SPIFC=m +CONFIG_SPI_ORION=y +CONFIG_SPI_PL022=y +CONFIG_SPI_ROCKCHIP=y +CONFIG_SPI_RPCIF=m +CONFIG_SPI_QCOM_QSPI=m +CONFIG_SPI_QUP=y +CONFIG_SPI_QCOM_GENI=m +CONFIG_SPI_S3C64XX=y +CONFIG_SPI_SH_MSIOF=m +CONFIG_SPI_SUN6I=y +CONFIG_SPI_SPIDEV=m +CONFIG_SPMI=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_PINCTRL_MAX77620=y +CONFIG_PINCTRL_OWL=y +CONFIG_PINCTRL_S700=y +CONFIG_PINCTRL_S900=y +CONFIG_PINCTRL_IMX8MM=y +CONFIG_PINCTRL_IMX8MN=y +CONFIG_PINCTRL_IMX8MP=y +CONFIG_PINCTRL_IMX8MQ=y +CONFIG_PINCTRL_IMX8QXP=y +CONFIG_PINCTRL_IMX8DXL=y +CONFIG_PINCTRL_IPQ8074=y +CONFIG_PINCTRL_IPQ6018=y +CONFIG_PINCTRL_MSM8916=y +CONFIG_PINCTRL_MSM8994=y +CONFIG_PINCTRL_MSM8996=y +CONFIG_PINCTRL_MSM8998=y +CONFIG_PINCTRL_QCS404=y +CONFIG_PINCTRL_QDF2XXX=y +CONFIG_PINCTRL_QCOM_SPMI_PMIC=y +CONFIG_PINCTRL_SC7180=y +CONFIG_PINCTRL_SDM845=y +CONFIG_PINCTRL_SM8150=y +CONFIG_PINCTRL_SM8250=y +CONFIG_GPIO_ALTERA=m +CONFIG_GPIO_DWAPB=y +CONFIG_GPIO_MB86S7X=y +CONFIG_GPIO_MPC8XXX=y +CONFIG_GPIO_MXC=y +CONFIG_GPIO_PL061=y +CONFIG_GPIO_RCAR=y +CONFIG_GPIO_UNIPHIER=y +CONFIG_GPIO_WCD934X=m +CONFIG_GPIO_XGENE=y +CONFIG_GPIO_XGENE_SB=y +CONFIG_GPIO_MAX732X=y +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y +CONFIG_GPIO_BD9571MWV=m +CONFIG_GPIO_MAX77620=y +CONFIG_GPIO_SL28CPLD=m +CONFIG_QCOM_CPR=y +CONFIG_ROCKCHIP_IODOMAIN=y +CONFIG_POWER_RESET_MSM=y +CONFIG_POWER_RESET_XGENE=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_SYSCON_REBOOT_MODE=y +CONFIG_BATTERY_SBS=m +CONFIG_BATTERY_BQ27XXX=y +CONFIG_SENSORS_ARM_SCPI=y +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_PWM_FAN=m +CONFIG_SENSORS_RASPBERRYPI_HWMON=m +CONFIG_SENSORS_SL28CPLD=m +CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_INA3221=m +CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y +CONFIG_CPU_THERMAL=y +CONFIG_THERMAL_EMULATION=y +CONFIG_QORIQ_THERMAL=m +CONFIG_SUN8I_THERMAL=y +CONFIG_IMX_SC_THERMAL=m +CONFIG_IMX8MM_THERMAL=m +CONFIG_ROCKCHIP_THERMAL=m +CONFIG_RCAR_THERMAL=y +CONFIG_RCAR_GEN3_THERMAL=y +CONFIG_ARMADA_THERMAL=y +CONFIG_BCM2711_THERMAL=m +CONFIG_BCM2835_THERMAL=m +CONFIG_BRCMSTB_THERMAL=m +CONFIG_EXYNOS_THERMAL=y +CONFIG_TEGRA_BPMP_THERMAL=m +CONFIG_QCOM_TSENS=y +CONFIG_QCOM_SPMI_TEMP_ALARM=m +CONFIG_UNIPHIER_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_SL28CPLD_WATCHDOG=m +CONFIG_ARM_SP805_WATCHDOG=y +CONFIG_ARM_SBSA_WATCHDOG=y +CONFIG_ARM_SMC_WATCHDOG=y +CONFIG_S3C2410_WATCHDOG=y +CONFIG_DW_WATCHDOG=y +CONFIG_SUNXI_WATCHDOG=m +CONFIG_IMX2_WDT=y +CONFIG_IMX_SC_WDT=m +CONFIG_QCOM_WDT=m +CONFIG_MESON_GXBB_WATCHDOG=m +CONFIG_MESON_WATCHDOG=m +CONFIG_RENESAS_WDT=y +CONFIG_UNIPHIER_WATCHDOG=y +CONFIG_BCM2835_WDT=y +CONFIG_MFD_ALTERA_SYSMGR=y +CONFIG_MFD_BD9571MWV=y +CONFIG_MFD_AXP20X_I2C=y +CONFIG_MFD_AXP20X_RSB=y +CONFIG_MFD_EXYNOS_LPASS=m +CONFIG_MFD_HI6421_PMIC=y +CONFIG_MFD_HI655X_PMIC=y +CONFIG_MFD_MAX77620=y +CONFIG_MFD_SPMI_PMIC=y +CONFIG_MFD_RK808=y +CONFIG_MFD_SEC_CORE=y +CONFIG_MFD_SL28CPLD=y +CONFIG_MFD_ROHM_BD718XX=y +CONFIG_MFD_WCD934X=m +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_AXP20X=y +CONFIG_REGULATOR_BD718XX=y +CONFIG_REGULATOR_BD9571MWV=y +CONFIG_REGULATOR_FAN53555=y +CONFIG_REGULATOR_GPIO=y +CONFIG_REGULATOR_HI6421V530=y +CONFIG_REGULATOR_HI655X=y +CONFIG_REGULATOR_MAX77620=y +CONFIG_REGULATOR_MAX8973=y +CONFIG_REGULATOR_PCA9450=y +CONFIG_REGULATOR_PFUZE100=y +CONFIG_REGULATOR_PWM=y +CONFIG_REGULATOR_QCOM_RPMH=y +CONFIG_REGULATOR_QCOM_SMD_RPM=y +CONFIG_REGULATOR_QCOM_SPMI=y +CONFIG_REGULATOR_RK808=y +CONFIG_REGULATOR_S2MPS11=y +CONFIG_REGULATOR_VCTRL=m +CONFIG_RC_CORE=m +CONFIG_RC_DECODERS=y +CONFIG_RC_DEVICES=y +CONFIG_IR_MESON=m +CONFIG_IR_SUNXI=m +CONFIG_MEDIA_SUPPORT=m +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_SDR_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y +# CONFIG_DVB_NET is not set +CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_RCAR_CSI2=m +CONFIG_VIDEO_RCAR_VIN=m +CONFIG_VIDEO_SUN6I_CSI=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m +CONFIG_VIDEO_SAMSUNG_S5P_MFC=m +CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m +CONFIG_VIDEO_RENESAS_FDP1=m +CONFIG_VIDEO_RENESAS_FCP=m +CONFIG_VIDEO_RENESAS_VSP1=m +CONFIG_SDR_PLATFORM_DRIVERS=y +CONFIG_VIDEO_RCAR_DRIF=m +CONFIG_VIDEO_IMX219=m +CONFIG_VIDEO_OV5645=m +CONFIG_VIDEO_QCOM_CAMSS=m +CONFIG_DRM=m +CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_MALI_DISPLAY=m +CONFIG_DRM_NOUVEAU=m +CONFIG_DRM_EXYNOS=m +CONFIG_DRM_EXYNOS5433_DECON=y +CONFIG_DRM_EXYNOS7_DECON=y +CONFIG_DRM_EXYNOS_DSI=y +# CONFIG_DRM_EXYNOS_DP is not set +CONFIG_DRM_EXYNOS_HDMI=y +CONFIG_DRM_EXYNOS_MIC=y +CONFIG_DRM_ROCKCHIP=m +CONFIG_ROCKCHIP_ANALOGIX_DP=y +CONFIG_ROCKCHIP_CDN_DP=y +CONFIG_ROCKCHIP_DW_HDMI=y +CONFIG_ROCKCHIP_DW_MIPI_DSI=y +CONFIG_ROCKCHIP_INNO_HDMI=y +CONFIG_DRM_RCAR_DU=m +CONFIG_DRM_RCAR_DW_HDMI=m +CONFIG_DRM_SUN4I=m +CONFIG_DRM_SUN6I_DSI=m +CONFIG_DRM_SUN8I_DW_HDMI=m +CONFIG_DRM_SUN8I_MIXER=m +CONFIG_DRM_MSM=m +CONFIG_DRM_TEGRA=m +CONFIG_DRM_PANEL_LVDS=m +CONFIG_DRM_PANEL_SIMPLE=m +CONFIG_DRM_PANEL_RAYDIUM_RM67191=m +CONFIG_DRM_PANEL_SITRONIX_ST7703=m +CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m +CONFIG_DRM_DISPLAY_CONNECTOR=m +CONFIG_DRM_NWL_MIPI_DSI=m +CONFIG_DRM_LONTIUM_LT9611=m +CONFIG_DRM_SII902X=m +CONFIG_DRM_SIMPLE_BRIDGE=m +CONFIG_DRM_THINE_THC63LVD1024=m +CONFIG_DRM_TI_SN65DSI86=m +CONFIG_DRM_I2C_ADV7511=m +CONFIG_DRM_I2C_ADV7511_AUDIO=y +CONFIG_DRM_DW_HDMI_AHB_AUDIO=m +CONFIG_DRM_DW_HDMI_CEC=m +CONFIG_DRM_VC4=m +CONFIG_DRM_ETNAVIV=m +CONFIG_DRM_HISI_HIBMC=m +CONFIG_DRM_HISI_KIRIN=m +CONFIG_DRM_MXSFB=m +CONFIG_DRM_MESON=m +CONFIG_DRM_PL111=m +CONFIG_DRM_LIMA=m +CONFIG_DRM_PANFROST=m +CONFIG_FB=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_EFI=y +CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_LP855X=m +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_HDA_TEGRA=m +CONFIG_SND_HDA_CODEC_HDMI=m +CONFIG_SND_SOC=y +CONFIG_SND_BCM2835_SOC_I2S=m +CONFIG_SND_SOC_FSL_SAI=m +CONFIG_SND_MESON_AXG_SOUND_CARD=m +CONFIG_SND_MESON_GX_SOUND_CARD=m +CONFIG_SND_SOC_QCOM=m +CONFIG_SND_SOC_APQ8016_SBC=m +CONFIG_SND_SOC_MSM8996=m +CONFIG_SND_SOC_SDM845=m +CONFIG_SND_SOC_ROCKCHIP=m +CONFIG_SND_SOC_ROCKCHIP_SPDIF=m +CONFIG_SND_SOC_ROCKCHIP_RT5645=m +CONFIG_SND_SOC_RK3399_GRU_SOUND=m +CONFIG_SND_SOC_SAMSUNG=y +CONFIG_SND_SOC_RCAR=m +CONFIG_SND_SUN4I_SPDIF=m +CONFIG_SND_SOC_TEGRA=m +CONFIG_SND_SOC_TEGRA210_AHUB=m +CONFIG_SND_SOC_TEGRA210_DMIC=m +CONFIG_SND_SOC_TEGRA210_I2S=m +CONFIG_SND_SOC_TEGRA186_DSPK=m +CONFIG_SND_SOC_TEGRA210_ADMAIF=m +CONFIG_SND_SOC_AK4613=m +CONFIG_SND_SOC_ES7134=m +CONFIG_SND_SOC_ES7241=m +CONFIG_SND_SOC_PCM3168A_I2C=m +CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m +CONFIG_SND_SOC_TAS571X=m +CONFIG_SND_SOC_WCD934X=m +CONFIG_SND_SOC_WM8904=m +CONFIG_SND_SOC_WSA881X=m +CONFIG_SND_SIMPLE_CARD=m +CONFIG_SND_AUDIO_GRAPH_CARD=m +CONFIG_I2C_HID=m +CONFIG_USB_CONN_GPIO=y +CONFIG_USB=y +CONFIG_USB_OTG=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_TEGRA=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_EXYNOS=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_EXYNOS=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_RENESAS_USBHS_HCD=m +CONFIG_USB_RENESAS_USBHS=m +CONFIG_USB_ACM=m +CONFIG_USB_STORAGE=y +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_SUNXI=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC2=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_ISP1760=y +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_HSIC_USB3503=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_GADGET=y +CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_RENESAS_USB3=m +CONFIG_USB_TEGRA_XUDC=m +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_SERIAL=y +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_OBEX=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_TYPEC=m +CONFIG_TYPEC_TCPM=m +CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC_HD3SS3220=m +CONFIG_MMC=y +CONFIG_MMC_BLOCK_MINORS=32 +CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ACPI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF_ARASAN=y +CONFIG_MMC_SDHCI_OF_ESDHC=y +CONFIG_MMC_SDHCI_CADENCE=y +CONFIG_MMC_SDHCI_ESDHC_IMX=y +CONFIG_MMC_SDHCI_TEGRA=y +CONFIG_MMC_SDHCI_F_SDH30=y +CONFIG_MMC_MESON_GX=y +CONFIG_MMC_SDHCI_MSM=y +CONFIG_MMC_SPI=y +CONFIG_MMC_SDHI=y +CONFIG_MMC_UNIPHIER=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_EXYNOS=y +CONFIG_MMC_DW_HI3798CV200=y +CONFIG_MMC_DW_K3=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_MMC_SUNXI=y +CONFIG_MMC_BCM2835=y +CONFIG_MMC_SDHCI_XENON=y +CONFIG_MMC_SDHCI_AM654=y +CONFIG_MMC_OWL=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_PWM=y +CONFIG_LEDS_SYSCON=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_DISK=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_LEDS_TRIGGER_PANIC=y +CONFIG_EDAC=y +CONFIG_EDAC_GHES=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_MAX77686=y +CONFIG_RTC_DRV_RK808=m +CONFIG_RTC_DRV_PCF85363=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RV8803=m +CONFIG_RTC_DRV_S5M=y +CONFIG_RTC_DRV_DS3232=y +CONFIG_RTC_DRV_PCF2127=m +CONFIG_RTC_DRV_EFI=y +CONFIG_RTC_DRV_CROS_EC=y +CONFIG_RTC_DRV_S3C=y +CONFIG_RTC_DRV_PL031=y +CONFIG_RTC_DRV_SUN6I=y +CONFIG_RTC_DRV_ARMADA38X=y +CONFIG_RTC_DRV_PM8XXX=m +CONFIG_RTC_DRV_TEGRA=y +CONFIG_RTC_DRV_SNVS=m +CONFIG_RTC_DRV_IMX_SC=m +CONFIG_RTC_DRV_XGENE=y +CONFIG_DMADEVICES=y +CONFIG_DMA_BCM2835=y +CONFIG_DMA_SUN6I=m +CONFIG_FSL_EDMA=y +CONFIG_IMX_SDMA=y +CONFIG_K3_DMA=y +CONFIG_MV_XOR=y +CONFIG_MV_XOR_V2=y +CONFIG_OWL_DMA=y +CONFIG_PL330_DMA=y +CONFIG_TEGRA20_APB_DMA=y +CONFIG_TEGRA210_ADMA=m +CONFIG_QCOM_BAM_DMA=y +CONFIG_QCOM_HIDMA_MGMT=y +CONFIG_QCOM_HIDMA=y +CONFIG_RCAR_DMAC=y +CONFIG_RENESAS_USB_DMAC=m +CONFIG_TI_K3_UDMA=y +CONFIG_TI_K3_UDMA_GLUE_LAYER=y +CONFIG_VFIO=y +CONFIG_VFIO_PCI=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_MMIO=y +CONFIG_XEN_GNTDEV=y +CONFIG_XEN_GRANT_DEV_ALLOC=y +CONFIG_MFD_CROS_EC_DEV=y +CONFIG_CHROME_PLATFORMS=y +CONFIG_CROS_EC=y +CONFIG_CROS_EC_I2C=y +CONFIG_CROS_EC_SPI=y +CONFIG_CROS_EC_CHARDEV=m +CONFIG_COMMON_CLK_RK808=y +CONFIG_COMMON_CLK_SCPI=y +CONFIG_COMMON_CLK_CS2000_CP=y +CONFIG_COMMON_CLK_FSL_SAI=y +CONFIG_COMMON_CLK_S2MPS11=y +CONFIG_COMMON_CLK_PWM=y +CONFIG_COMMON_CLK_VC5=y +CONFIG_COMMON_CLK_BD718XX=m +CONFIG_CLK_RASPBERRYPI=m +CONFIG_CLK_IMX8MM=y +CONFIG_CLK_IMX8MN=y +CONFIG_CLK_IMX8MP=y +CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y +CONFIG_TI_SCI_CLK=y +CONFIG_COMMON_CLK_QCOM=y +CONFIG_QCOM_A53PLL=y +CONFIG_QCOM_CLK_APCS_MSM8916=y +CONFIG_QCOM_CLK_SMD_RPM=y +CONFIG_QCOM_CLK_RPMH=y +CONFIG_IPQ_GCC_8074=y +CONFIG_IPQ_GCC_6018=y +CONFIG_MSM_GCC_8916=y +CONFIG_MSM_GCC_8994=y +CONFIG_MSM_MMCC_8996=y +CONFIG_MSM_GCC_8998=y +CONFIG_QCS_GCC_404=y +CONFIG_SC_GCC_7180=y +CONFIG_SDM_CAMCC_845=m +CONFIG_SDM_GCC_845=y +CONFIG_SDM_GPUCC_845=y +CONFIG_SDM_VIDEOCC_845=y +CONFIG_SDM_DISPCC_845=y +CONFIG_SM_GCC_8150=y +CONFIG_SM_GCC_8250=y +CONFIG_SM_GPUCC_8150=y +CONFIG_SM_GPUCC_8250=y +CONFIG_QCOM_HFPLL=y +CONFIG_HWSPINLOCK=y +CONFIG_HWSPINLOCK_QCOM=y +CONFIG_ARM_MHU=y +CONFIG_IMX_MBOX=y +CONFIG_PLATFORM_MHU=y +CONFIG_BCM2835_MBOX=y +CONFIG_QCOM_APCS_IPC=y +CONFIG_QCOM_IPCC=y +CONFIG_ROCKCHIP_IOMMU=y +CONFIG_TEGRA_IOMMU_SMMU=y +CONFIG_ARM_SMMU=y +CONFIG_ARM_SMMU_V3=y +CONFIG_QCOM_IOMMU=y +CONFIG_REMOTEPROC=y +CONFIG_QCOM_Q6V5_MSS=m +CONFIG_QCOM_Q6V5_PAS=m +CONFIG_QCOM_SYSMON=m +CONFIG_RPMSG_QCOM_GLINK_RPM=y +CONFIG_RPMSG_QCOM_GLINK_SMEM=m +CONFIG_RPMSG_QCOM_SMD=y +CONFIG_SOUNDWIRE=m +CONFIG_SOUNDWIRE_QCOM=m +CONFIG_OWL_PM_DOMAINS=y +CONFIG_RASPBERRYPI_POWER=y +CONFIG_FSL_DPAA=y +CONFIG_FSL_MC_DPIO=y +CONFIG_QCOM_AOSS_QMP=y +CONFIG_QCOM_GENI_SE=y +CONFIG_QCOM_RMTFS_MEM=m +CONFIG_QCOM_RPMH=y +CONFIG_QCOM_RPMHPD=y +CONFIG_QCOM_RPMPD=y +CONFIG_QCOM_SMEM=y +CONFIG_QCOM_SMD_RPM=y +CONFIG_QCOM_SMP2P=y +CONFIG_QCOM_SMSM=y +CONFIG_QCOM_SOCINFO=m +CONFIG_QCOM_APR=m +CONFIG_ARCH_R8A774A1=y +CONFIG_ARCH_R8A774B1=y +CONFIG_ARCH_R8A774C0=y +CONFIG_ARCH_R8A774E1=y +CONFIG_ARCH_R8A77950=y +CONFIG_ARCH_R8A77951=y +CONFIG_ARCH_R8A77960=y +CONFIG_ARCH_R8A77961=y +CONFIG_ARCH_R8A77965=y +CONFIG_ARCH_R8A77970=y +CONFIG_ARCH_R8A77980=y +CONFIG_ARCH_R8A77990=y +CONFIG_ARCH_R8A77995=y +CONFIG_ROCKCHIP_PM_DOMAINS=y +CONFIG_ARCH_TEGRA_132_SOC=y +CONFIG_ARCH_TEGRA_210_SOC=y +CONFIG_ARCH_TEGRA_186_SOC=y +CONFIG_ARCH_TEGRA_194_SOC=y +CONFIG_ARCH_K3_AM6_SOC=y +CONFIG_ARCH_K3_J721E_SOC=y +CONFIG_TI_SCI_PM_DOMAINS=y +CONFIG_EXTCON_PTN5150=m +CONFIG_EXTCON_USB_GPIO=y +CONFIG_EXTCON_USBC_CROS_EC=y +CONFIG_RENESAS_RPCIF=m +CONFIG_IIO=y +CONFIG_EXYNOS_ADC=y +CONFIG_MAX9611=m +CONFIG_QCOM_SPMI_ADC5=m +CONFIG_ROCKCHIP_SARADC=m +CONFIG_IIO_CROS_EC_SENSORS_CORE=m +CONFIG_IIO_CROS_EC_SENSORS=m +CONFIG_IIO_CROS_EC_LIGHT_PROX=m +CONFIG_SENSORS_ISL29018=m +CONFIG_IIO_CROS_EC_BARO=m +CONFIG_MPL3115=m +CONFIG_PWM=y +CONFIG_PWM_BCM2835=m +CONFIG_PWM_CROS_EC=m +CONFIG_PWM_MESON=m +CONFIG_PWM_RCAR=m +CONFIG_PWM_ROCKCHIP=y +CONFIG_PWM_SAMSUNG=y +CONFIG_PWM_SL28CPLD=m +CONFIG_PWM_SUN4I=m +CONFIG_PWM_TEGRA=m +CONFIG_SL28CPLD_INTC=y +CONFIG_QCOM_PDC=y +CONFIG_RESET_IMX7=y +CONFIG_RESET_QCOM_AOSS=y +CONFIG_RESET_QCOM_PDC=m +CONFIG_RESET_TI_SCI=y +CONFIG_PHY_XGENE=y +CONFIG_PHY_SUN4I_USB=y +CONFIG_PHY_MIXEL_MIPI_DPHY=m +CONFIG_PHY_HI6220_USB=y +CONFIG_PHY_HISTB_COMBPHY=y +CONFIG_PHY_HISI_INNO_USB2=y +CONFIG_PHY_MVEBU_CP110_COMPHY=y +CONFIG_PHY_QCOM_QMP=m +CONFIG_PHY_QCOM_QUSB2=m +CONFIG_PHY_QCOM_USB_HS=y +CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=y +CONFIG_PHY_RCAR_GEN3_PCIE=y +CONFIG_PHY_RCAR_GEN3_USB2=y +CONFIG_PHY_RCAR_GEN3_USB3=m +CONFIG_PHY_ROCKCHIP_EMMC=y +CONFIG_PHY_ROCKCHIP_INNO_HDMI=m +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PHY_ROCKCHIP_PCIE=m +CONFIG_PHY_ROCKCHIP_TYPEC=y +CONFIG_PHY_UNIPHIER_USB2=y +CONFIG_PHY_UNIPHIER_USB3=y +CONFIG_PHY_TEGRA_XUSB=y +CONFIG_ARM_SMMU_V3_PMU=m +CONFIG_FSL_IMX8_DDR_PMU=m +CONFIG_HISI_PMU=y +CONFIG_QCOM_L2_PMU=y +CONFIG_QCOM_L3_PMU=y +CONFIG_NVMEM_IMX_OCOTP=y +CONFIG_NVMEM_IMX_OCOTP_SCU=y +CONFIG_QCOM_QFPROM=y +CONFIG_ROCKCHIP_EFUSE=y +CONFIG_NVMEM_SUNXI_SID=y +CONFIG_UNIPHIER_EFUSE=y +CONFIG_MESON_EFUSE=m +CONFIG_FPGA=y +CONFIG_FPGA_MGR_STRATIX10_SOC=m +CONFIG_FPGA_BRIDGE=m +CONFIG_ALTERA_FREEZE_BRIDGE=m +CONFIG_FPGA_REGION=m +CONFIG_OF_FPGA_REGION=m +CONFIG_TEE=y +CONFIG_OPTEE=y +CONFIG_SLIMBUS=m +CONFIG_SLIM_QCOM_CTRL=m +CONFIG_SLIM_QCOM_NGD_CTRL=m +CONFIG_MUX_MMIO=y +CONFIG_INTERCONNECT=y +CONFIG_INTERCONNECT_QCOM=y +CONFIG_INTERCONNECT_QCOM_MSM8916=m +CONFIG_INTERCONNECT_QCOM_SDM845=m +CONFIG_INTERCONNECT_QCOM_SM8150=m +CONFIG_INTERCONNECT_QCOM_SM8250=m +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_QUOTA=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_OVERLAY_FS=m +CONFIG_VFAT_FS=y +CONFIG_HUGETLBFS=y +CONFIG_CONFIGFS_FS=y +CONFIG_EFIVAR_FS=y +CONFIG_SQUASHFS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V4=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_ROOT_NFS=y +CONFIG_9P_FS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_SECURITY=y +CONFIG_CRYPTO_ECHAINIV=y +CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_USER_API_RNG=m +CONFIG_CRYPTO_DEV_SUN8I_CE=m +CONFIG_CRYPTO_DEV_FSL_CAAM=m +CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m +CONFIG_CRYPTO_DEV_QCOM_RNG=m +CONFIG_CRYPTO_DEV_CCREE=m +CONFIG_CRYPTO_DEV_HISI_SEC2=m +CONFIG_CRYPTO_DEV_HISI_ZIP=m +CONFIG_CRYPTO_DEV_HISI_HPRE=m +CONFIG_CMA_SIZE_MBYTES=32 +CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_INFO=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_KERNEL=y +# CONFIG_SCHED_DEBUG is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_FTRACE is not set +CONFIG_MEMTEST=y +CONFIG_KPROBES=y +CONFIG_KRETPROBES=y +CONFIG_FUNCTION_ERROR_INJECTION=y +# CONFIG_KPROBES_SANITY_TEST is not set + diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index dbb2387c..127e38f2 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig @@ -15,20 +15,8 @@ CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set CONFIG_ARCH_MULTI_V6=y CONFIG_ARCH_MXC=y -CONFIG_MACH_MX31LILLY=y -CONFIG_MACH_MX31LITE=y -CONFIG_MACH_PCM037=y -CONFIG_MACH_PCM037_EET=y -CONFIG_MACH_MX31_3DS=y -CONFIG_MACH_MX31MOBOARD=y -CONFIG_MACH_QONG=y -CONFIG_MACH_ARMADILLO5X0=y -CONFIG_MACH_KZM_ARM11_01=y -CONFIG_MACH_IMX31_DT=y -CONFIG_MACH_IMX35_DT=y -CONFIG_MACH_PCM043=y -CONFIG_MACH_MX35_3DS=y -CONFIG_MACH_VPR200=y +CONFIG_SOC_IMX31=y +CONFIG_SOC_IMX35=y CONFIG_SOC_IMX50=y CONFIG_SOC_IMX51=y CONFIG_SOC_IMX53=y @@ -178,8 +166,13 @@ CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=y +CONFIG_TOUCHSCREEN_AD7879=y +CONFIG_TOUCHSCREEN_AD7879_I2C=y +CONFIG_TOUCHSCREEN_ATMEL_MXT=y +CONFIG_TOUCHSCREEN_DA9052=y CONFIG_TOUCHSCREEN_EGALAX=y CONFIG_TOUCHSCREEN_GOODIX=y +CONFIG_TOUCHSCREEN_ILI210X=y CONFIG_TOUCHSCREEN_MAX11801=y CONFIG_TOUCHSCREEN_IMX6UL_TSC=y CONFIG_TOUCHSCREEN_EDT_FT5X06=y @@ -211,6 +204,10 @@ CONFIG_SPI=y CONFIG_SPI_GPIO=y CONFIG_SPI_IMX=y CONFIG_SPI_FSL_DSPI=y +CONFIG_PINCTRL_IMX8MM=y +CONFIG_PINCTRL_IMX8MN=y +CONFIG_PINCTRL_IMX8MP=y +CONFIG_PINCTRL_IMX8MQ=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SIOX=m CONFIG_GPIO_MAX732X=y @@ -219,6 +216,7 @@ CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCF857X=y CONFIG_GPIO_STMPE=y CONFIG_GPIO_74X164=y +CONFIG_GPIO_MXC=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_SYSCON=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y @@ -235,6 +233,7 @@ CONFIG_DA9062_WATCHDOG=y CONFIG_DA9063_WATCHDOG=m CONFIG_RN5T618_WATCHDOG=y CONFIG_IMX2_WDT=y +CONFIG_IMX7ULP_WDT=y CONFIG_MFD_DA9052_I2C=y CONFIG_MFD_DA9062=y CONFIG_MFD_DA9063=y @@ -264,7 +263,6 @@ CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_MUX=y -CONFIG_SOC_CAMERA=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_CODA=m CONFIG_VIDEO_IMX_PXP=y @@ -279,6 +277,7 @@ CONFIG_DRM_MSM=y CONFIG_DRM_PANEL_LVDS=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_SEIKO_43WVF1G=y +CONFIG_DRM_TI_TFP410=y CONFIG_DRM_DW_HDMI_AHB_AUDIO=m CONFIG_DRM_DW_HDMI_CEC=y CONFIG_DRM_IMX=y @@ -320,6 +319,7 @@ CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_MXC=y +CONFIG_USB_ACM=m CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y @@ -334,7 +334,7 @@ CONFIG_NOP_USB_XCEIV=y CONFIG_USB_MXS_PHY=y CONFIG_USB_GADGET=y CONFIG_USB_FSL_USB2=y -CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_SERIAL=y CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_OBEX=y @@ -386,6 +386,7 @@ CONFIG_RTC_DRV_DA9063=y CONFIG_RTC_DRV_MC13XXX=y CONFIG_RTC_DRV_MXC=y CONFIG_RTC_DRV_MXC_V2=y +CONFIG_RTC_DRV_RC5T619=y CONFIG_RTC_DRV_SNVS=y CONFIG_DMADEVICES=y CONFIG_FSL_EDMA=y @@ -396,9 +397,15 @@ CONFIG_STAGING=y CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_IMX_MEDIA=y CONFIG_COMMON_CLK_PWM=y +CONFIG_CLK_IMX8MM=y +CONFIG_CLK_IMX8MN=y +CONFIG_CLK_IMX8MP=y +CONFIG_CLK_IMX8MQ=y +CONFIG_SOC_IMX8M=y CONFIG_IIO=y CONFIG_MMA8452=y CONFIG_IMX7D_ADC=y +CONFIG_RN5T618_ADC=y CONFIG_VF610_ADC=y CONFIG_SENSORS_ISL29018=y CONFIG_MAG3110=y @@ -439,6 +446,8 @@ CONFIG_UBIFS_FS=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y CONFIG_ROOT_NFS=y CONFIG_NLS_DEFAULT="cp437" CONFIG_NLS_CODEPAGE_437=y @@ -464,6 +473,9 @@ CONFIG_DEBUG_FS=y CONFIG_PROVE_LOCKING=y # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_FTRACE is not set -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_FQ_CODEL=y -CONFIG_NET_SCH_FIFO=y +CONFIG_KPROBES=y +CONFIG_OPTPROBES=y +CONFIG_KRETPROBES=y +# CONFIG_ARM_KPROBES_TEST is not set +# CONFIG_KPROBES_SANITY_TEST is not set + diff --git a/recipes-kernel/linux/linux-fslc/mx25/defconfig b/recipes-kernel/linux/linux-fslc/mx25/defconfig index 2b2d617e..21672504 100644 --- a/recipes-kernel/linux/linux-fslc/mx25/defconfig +++ b/recipes-kernel/linux/linux-fslc/mx25/defconfig @@ -20,9 +20,9 @@ CONFIG_MACH_MX27ADS=y CONFIG_MACH_MX27_3DS=y CONFIG_MACH_IMX27_VISSTRIM_M10=y CONFIG_MACH_PCA100=y -CONFIG_MACH_IMX27_DT=y CONFIG_SOC_IMX1=y CONFIG_SOC_IMX25=y +CONFIG_SOC_IMX27=y CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 @@ -32,8 +32,6 @@ CONFIG_KPROBES=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -95,6 +93,7 @@ CONFIG_SPI=y CONFIG_SPI_IMX=y CONFIG_SPI_SPIDEV=y CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_MXC=y CONFIG_W1=y CONFIG_W1_MASTER_MXC=y CONFIG_W1_SLAVE_THERM=y @@ -112,7 +111,6 @@ CONFIG_REGULATOR_MC13892=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_SOC_CAMERA=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_CODA=y CONFIG_FB=y @@ -187,3 +185,9 @@ CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_15=m CONFIG_FONTS=y CONFIG_FONT_8x8=y +CONFIG_KPROBES=y +CONFIG_OPTPROBES=y +CONFIG_KRETPROBES=y +# CONFIG_ARM_KPROBES_TEST is not set +# CONFIG_KPROBES_SANITY_TEST is not set + diff --git a/recipes-kernel/linux/linux-fslc/mxs/defconfig b/recipes-kernel/linux/linux-fslc/mxs/defconfig index 2773899c..a913c0dd 100644 --- a/recipes-kernel/linux/linux-fslc/mxs/defconfig +++ b/recipes-kernel/linux/linux-fslc/mxs/defconfig @@ -25,8 +25,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_BLK_DEV_INTEGRITY=y -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -174,3 +172,9 @@ CONFIG_PROVE_LOCKING=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_STRICT_DEVMEM=y CONFIG_DEBUG_USER=y +CONFIG_KPROBES=y +CONFIG_OPTPROBES=y +CONFIG_KRETPROBES=y +# CONFIG_ARM_KPROBES_TEST is not set +# CONFIG_KPROBES_SANITY_TEST is not set + diff --git a/recipes-kernel/linux/linux-fslc_5.4.bb b/recipes-kernel/linux/linux-fslc_5.10.bb index 52db13df..c3874feb 100644 --- a/recipes-kernel/linux/linux-fslc_5.4.bb +++ b/recipes-kernel/linux/linux-fslc_5.10.bb @@ -12,16 +12,16 @@ upstreaming." include linux-fslc.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition # required by kernel-yocto.bbclass. # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "5.4.73" +LINUX_VERSION = "5.10.28" -SRCBRANCH = "5.4.x+fslc" -SRCREV = "499c199e629db5fdb0661435f40b3d80d3a7b85c" +KBRANCH = "5.10.x+fslc" +SRCREV = "5261f1216599f5fe8d8d464b4be2bd832f8eca16" COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" diff --git a/recipes-kernel/linux/linux-imx-headers_5.4.bb b/recipes-kernel/linux/linux-imx-headers_5.4.bb index ac460c0d..4644295d 100644 --- a/recipes-kernel/linux/linux-imx-headers_5.4.bb +++ b/recipes-kernel/linux/linux-imx-headers_5.4.bb @@ -7,8 +7,8 @@ New headers are installed in ${includedir}/imx." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -SRCBRANCH = "imx_5.4.47_2.2.0" -LOCALVERSION = "-2.2.0" +SRCBRANCH = "imx_5.4.70_2.3.0" +LOCALVERSION = "-2.3.0" SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "dea2fede7e024ee7029b13e8d82a00ec14427777" diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc index d508a727..96d4df90 100644 --- a/recipes-kernel/linux/linux-imx.inc +++ b/recipes-kernel/linux/linux-imx.inc @@ -15,7 +15,7 @@ SRCBRANCH ?= "" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx;protocol=https;branch=${SRCBRANCH} \ - file://defconfig \ + file://defconfig \ " S = "${WORKDIR}/git" diff --git a/recipes-kernel/linux/linux-imx/imx/defconfig b/recipes-kernel/linux/linux-imx/imx/defconfig index 18761bae..c6d83c3b 100644 --- a/recipes-kernel/linux/linux-imx/imx/defconfig +++ b/recipes-kernel/linux/linux-imx/imx/defconfig @@ -570,6 +570,8 @@ CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_ANSI_CPRNG=m +# meta-freescale change: Set CRYPTO_SHA1 to y to prevent kernel_configcheck warning +#CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA1=y CONFIG_CRC_CCITT=m CONFIG_CRC_T10DIF=y diff --git a/recipes-kernel/linux/linux-imx/mx8/defconfig b/recipes-kernel/linux/linux-imx/mx8/defconfig index 98099fe5..1de0c724 100644 --- a/recipes-kernel/linux/linux-imx/mx8/defconfig +++ b/recipes-kernel/linux/linux-imx/mx8/defconfig @@ -188,6 +188,7 @@ CONFIG_PCIE_LAYERSCAPE_GEN4=y CONFIG_PCI_ENDPOINT=y CONFIG_PCI_ENDPOINT_CONFIGFS=y CONFIG_PCI_EPF_TEST=y +CONFIG_IMX_MIC_EPF=m CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_FW_LOADER_USER_HELPER=y @@ -227,6 +228,13 @@ CONFIG_SRAM=y CONFIG_PCI_ENDPOINT_TEST=y CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT25=m +CONFIG_SCIF_BUS=m +CONFIG_VOP_BUS=m +CONFIG_IMX_MIC_HOST=m +CONFIG_IMX_MIC_CARD=m +CONFIG_SCIF=m +CONFIG_MIC_COSM=m +CONFIG_VOP=m # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y CONFIG_SCSI_SAS_ATA=y @@ -267,7 +275,6 @@ CONFIG_FSL_SDK_DPAA_ETH=y CONFIG_FSL_DPAA2_ETH=y CONFIG_FSL_ENETC=y CONFIG_FSL_ENETC_VF=y -CONFIG_FSL_ENETC_MDIO=y CONFIG_HIX5HD2_GMAC=y CONFIG_HNS_DSAF=y CONFIG_HNS_ENET=y @@ -328,6 +335,7 @@ CONFIG_KEYBOARD_IMX_SC_PWRKEY=y CONFIG_KEYBOARD_CROS_EC=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C=m CONFIG_INPUT_MISC=y CONFIG_INPUT_MPL3115=y @@ -501,8 +509,9 @@ CONFIG_DRM_RCAR_LVDS=m CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_RAYDIUM_RM67191=y CONFIG_DRM_PANEL_SEIKO_43WVF1G=y -CONFIG_DRM_NXP_SEIKO_43WVFIG=y +CONFIG_DRM_PANEL_WKS_101WX001=y CONFIG_DRM_FSL_IMX_LVDS_BRIDGE=y +CONFIG_DRM_NXP_SEIKO_43WVFIG=y CONFIG_DRM_SII902X=m CONFIG_DRM_I2C_ADV7511=y CONFIG_DRM_NWL_MIPI_DSI=y @@ -521,8 +530,8 @@ CONFIG_DRM_IMX8QXP_LDB=y CONFIG_DRM_IMX8MP_LDB=y CONFIG_DRM_IMX_HDMI=y CONFIG_DRM_IMX_SEC_DSIM=y -CONFIG_DRM_IMX_CDNS_MHDP=y CONFIG_DRM_IMX_DCSS=y +CONFIG_DRM_IMX_CDNS_MHDP=y CONFIG_DRM_ETNAVIV=m CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_HISI_KIRIN=m @@ -543,7 +552,6 @@ CONFIG_SND=y CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=y -CONFIG_SND_SOC_FSL_DAI=m CONFIG_SND_SOC_FSL_EASRC=y CONFIG_SND_IMX_SOC=y CONFIG_SND_SOC_IMX_AK4458=y @@ -561,6 +569,7 @@ CONFIG_SND_SOC_IMX_PDM_MIC=y CONFIG_SND_SOC_IMX_DSP=y CONFIG_SND_SOC_IMX_CDNHDMI=y CONFIG_SND_SOC_IMX_XCVR=y +CONFIG_SND_SOC_IMX_PCM512X=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SOF_OF=m CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y @@ -711,6 +720,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=y CONFIG_STAGING=y CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_IMX_CAPTURE=y +CONFIG_IMX8_MEDIA_DEVICE=m CONFIG_ION=y CONFIG_ION_SYSTEM_HEAP=y CONFIG_ION_CMA_HEAP=y @@ -818,12 +828,14 @@ CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_TLS=m -CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_OFB=m +CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m CONFIG_CRYPTO_RMD128=m @@ -831,33 +843,28 @@ CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SM4=m +CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y CONFIG_CRYPTO_DEV_FSL_CAAM=y CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m -CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m -CONFIG_CRYPTO_SM3=m -CONFIG_CRYPTO_STREEBOG=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_TEA=m CONFIG_INDIRECT_PIO=y CONFIG_CMA_SIZE_MBYTES=320 CONFIG_PRINTK_TIME=y @@ -872,12 +879,3 @@ CONFIG_MEMTEST=y CONFIG_CORESIGHT=y CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y CONFIG_CORESIGHT_SOURCE_ETM4X=y -CONFIG_IMX8_MEDIA_DEVICE=m -CONFIG_IMX8_ISI_HW=y -CONFIG_IMX8_ISI_CORE=y -CONFIG_IMX8_ISI_CAPTURE=y -CONFIG_IMX8_ISI_M2M=y -CONFIG_IMX8_MIPI_CSI2=y -CONFIG_IMX8_MIPI_CSI2_SAM=y -CONFIG_IMX8_PARALLEL_CSI=y -CONFIG_GMSL_MAX9286=y diff --git a/recipes-kernel/linux/linux-imx_5.4.bb b/recipes-kernel/linux/linux-imx_5.4.bb index 4a04d396..1997388c 100644 --- a/recipes-kernel/linux/linux-imx_5.4.bb +++ b/recipes-kernel/linux/linux-imx_5.4.bb @@ -17,16 +17,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "lzop-native bc-native" -SRCBRANCH = "imx_5.4.47_2.2.0" -LOCALVERSION = "-2.2.0" -SRCREV = "5ec03d06f54e6728c973efccb7edf20d071e2096" +SRCBRANCH = "imx_5.4.70_2.3.0" +LOCALVERSION = "-2.3.0" +SRCREV = "4f2631b022d843c1f2a5d34eae2fd98927a1a6c7" # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition # required by kernel-yocto.bbclass. # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "5.4.47" +LINUX_VERSION = "5.4.70" DEFAULT_PREFERENCE = "1" diff --git a/recipes-kernel/linux/linux-qoriq/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch b/recipes-kernel/linux/linux-qoriq/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch deleted file mode 100644 index e3df8084..00000000 --- a/recipes-kernel/linux/linux-qoriq/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 Mon Sep 17 00:00:00 2001 -From: Changbin Du <changbin.du@gmail.com> -Date: Tue, 28 Jan 2020 23:29:38 +0800 -Subject: [PATCH] perf: Make perf able to build with latest libbfd - -libbfd has changed the bfd_section_* macros to inline functions -bfd_section_<field> since 2019-09-18. See below two commits: - o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html - o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html - -This fix make perf able to build with both old and new libbfd. - -Upstream-Status: Submitted [commit 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 upstream] - -Signed-off-by: Changbin Du <changbin.du@gmail.com> -Acked-by: Jiri Olsa <jolsa@redhat.com> -Cc: Peter Zijlstra <peterz@infradead.org> -Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com -Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> -Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> ---- - tools/perf/util/srcline.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c -index 6ccf6f6d09df..5b7d6c16d33f 100644 ---- a/tools/perf/util/srcline.c -+++ b/tools/perf/util/srcline.c -@@ -193,16 +193,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) - bfd_vma pc, vma; - bfd_size_type size; - struct a2l_data *a2l = data; -+ flagword flags; - - if (a2l->found) - return; - -- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) -+#ifdef bfd_get_section_flags -+ flags = bfd_get_section_flags(abfd, section); -+#else -+ flags = bfd_section_flags(section); -+#endif -+ if ((flags & SEC_ALLOC) == 0) - return; - - pc = a2l->addr; -+#ifdef bfd_get_section_vma - vma = bfd_get_section_vma(abfd, section); -+#else -+ vma = bfd_section_vma(section); -+#endif -+#ifdef bfd_get_section_size - size = bfd_get_section_size(section); -+#else -+ size = bfd_section_size(section); -+#endif - - if (pc < vma || pc >= vma + size) - return; --- -2.17.1 - diff --git a/recipes-kernel/linux/linux-qoriq_5.4.bb b/recipes-kernel/linux/linux-qoriq_5.4.bb index 6a2f9c1f..54fd700c 100644 --- a/recipes-kernel/linux/linux-qoriq_5.4.bb +++ b/recipes-kernel/linux/linux-qoriq_5.4.bb @@ -1,15 +1,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION = "5.4.3" +LINUX_VERSION = "5.4.47" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/linux;nobranch=1 \ file://0001-Makfefile-linux-5.4-add-warning-cflags-on-LSDK-20.04.patch \ - file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch \ file://0001-perf-tests-bp_account-Make-global-variable-static.patch \ file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \ file://0001-perf-bench-Share-some-global-variables-to-fix-build-.patch \ file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch \ " -SRCREV = "134788b16485dd9fa81988681d2365ee38633fa2" +SRCREV = "6bff40d413b394c2d742e7a42089bfc62aef0a9b" require recipes-kernel/linux/linux-qoriq.inc diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch new file mode 100644 index 00000000..5b8e0159 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch @@ -0,0 +1,51 @@ +From 54c700f9721ef218188803b48acae46e885626ee Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@ltnglobal.com> +Date: Sat, 9 May 2020 19:59:46 +0200 +Subject: [PATCH] vulkan: Drop use of VK_RESULT_BEGIN_RANGE + +This was removed in Vulkan 1.2.140. + +> Shortly after 2020-04-24, we will be removing the automatically +> generated `VK_*_BEGIN_RANGE`, `VK_*_END_RANGE`, and `VK_*_RANGE_SIZE` +> tokens from the Vulkan headers. These tokens are currently defined for +> some enumerated types, but are explicitly not part of the Vulkan API. +> They existed only to support some Vulkan implementation internals, +> which no longer require them. We will be accepting comments on this +> topic in [#1230], but we strongly suggest any external projects using +> these tokens immediately migrate away from them. + +[#1230]: https://github.com/KhronosGroup/Vulkan-Docs/issues/1230 + +Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1603> + +Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/17850d7e87af93c6bd181d7c25903478c2254fa6] +Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> +--- + ext/vulkan/vkerror.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/ext/vulkan/vkerror.c b/ext/vulkan/vkerror.c +index 3fec27e4d..c91589d9b 100644 +--- a/ext/vulkan/vkerror.c ++++ b/ext/vulkan/vkerror.c +@@ -27,7 +27,7 @@ + #include "vkerror.h" + + /* *INDENT-OFF* */ +-static const struct ++static const struct + { + VkResult result; + const char *str; +@@ -63,8 +63,6 @@ _vk_result_to_string (VkResult result) + + if (result >= 0) + return NULL; +- if (result < VK_RESULT_BEGIN_RANGE) +- return "Unknown Error"; + + for (i = 0; i < G_N_ELEMENTS (vk_result_string_map); i++) { + if (result == vk_result_string_map[i].result) +-- +2.17.1 + diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.3.imx.bb index 68689f90..6925611a 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.3.imx.bb @@ -11,7 +11,7 @@ PACKAGE_ARCH_imxpxp = "${MACHINE_SOCARCH}" PACKAGE_ARCH_mx8 = "${MACHINE_SOCARCH}" GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https" -SRCBRANCH = "MM_04.05.05_2005_L5.4.24" +SRCBRANCH = "MM_04.05.07_2011_L5.4.70" SRC_URI = " \ ${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} \ @@ -19,11 +19,12 @@ SRC_URI = " \ file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ file://0001-opencv-allow-compilation-against-4.4.x.patch \ + file://0001-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch \ file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ file://avoid-including-sys-poll.h-directly.patch \ file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ " -SRCREV = "2fdaef1839ebfef7ea3bc8c1c59463a9ef0ae19a" +SRCREV = "cf7f2d0125424ce0d63ddc7f1eadc9ef71d10db1" S = "${WORKDIR}/git" @@ -35,12 +36,15 @@ DEPENDS += "gstreamer1.0-plugins-base" inherit gobject-introspection +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" +PACKAGECONFIG_GL_imxpxp = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}" + PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)} \ + ${PACKAGECONFIG_GL} \ bz2 closedcaption curl dash dtls hls rsvg sbc smoothstreaming sndfile \ ttml uvch264 webp \ " @@ -62,6 +66,7 @@ PACKAGECONFIG[hls] = "-Dhls=enabled -Dhls-crypto=nettle,-Dhls=disabl # to -base yet. They depend on the gstgl library in -base, so we do # not add GL dependencies here, since these are taken care of in -base. PACKAGECONFIG[gl] = "-Dgl=enabled,-Dgl=disabled," +PACKAGECONFIG[gles2] = ",,virtual/libgles2" PACKAGECONFIG[kms] = "-Dkms=enabled,-Dkms=disabled,libdrm" PACKAGECONFIG[libde265] = "-Dlibde265=enabled,-Dlibde265=disabled,libde265" PACKAGECONFIG[libmms] = "-Dlibmms=enabled,-Dlibmms=disabled,libmms" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-viv-fb-code-must-link-against-libg2d.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-viv-fb-code-must-link-against-libg2d.patch new file mode 100644 index 00000000..c761619f --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-viv-fb-code-must-link-against-libg2d.patch @@ -0,0 +1,44 @@ +From 8153e86dac04076fb80fc272c8374d4ba019fa3c Mon Sep 17 00:00:00 2001 +From: Zan Dobersek <zdobersek@igalia.com> +Date: Wed, 4 Nov 2020 14:02:10 +0100 +Subject: [PATCH] meson: viv-fb code must link against libg2d + +Find the libg2d library and link against it, if necessary, avoiding +linking errors for couple of libg2d symbols. + +Upstream-Status: Pending + +Signed-off-by: Zan Dobersek <zdobersek@igalia.com> +--- + gst-libs/gst/gl/meson.build | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build +index 6f6c6866d..fb6a9aabf 100644 +--- a/gst-libs/gst/gl/meson.build ++++ b/gst-libs/gst/gl/meson.build +@@ -818,9 +818,11 @@ if need_win_gbm != 'no' + endif + + if need_platform_egl != 'no' and need_win_viv_fb != 'no' +- if egl_dep.found() and cc.has_function ('fbGetDisplay', dependencies : egl_dep) ++ g2d_dep = cc.find_library('g2d', required : false) ++ if egl_dep.found() and g2d_dep.found() and cc.has_function ('fbGetDisplay', dependencies : egl_dep) + if cc.has_function ('glTexDirectVIV', dependencies : gles2_dep) + enabled_gl_winsys += 'viv-fb' ++ gl_winsys_deps += [g2d_dep] + glconf.set10('GST_GL_HAVE_WINDOW_VIV_FB', 1) + glconf.set10('GST_GL_HAVE_VIV_DIRECTVIV', 1) + glconf.set10('GST_GL_HAVE_PHYMEM', 1) +@@ -834,6 +836,8 @@ if need_platform_egl != 'no' and need_win_viv_fb != 'no' + ] + gl_cpp_args += ['-DEGL_API_FB'] + endif ++ else ++ g2d_dep = unneeded_dep + endif + endif + +-- +2.28.0 + diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.imx.bb index 4b25f406..db0b740f 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.imx.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" -SRCBRANCH = "MM_04.05.05_2005_L5.4.24" -SRCREV = "cad00a3c4318c787c9661990e8f9328e4a69a329" +SRCBRANCH = "MM_04.05.06_2008_L5.4.47" +SRCREV = "3c4aa2a58576d68f6e684efa58609665679c9969" SRC_URI = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ file://0001-gstreamer-plugins-base-fix-meson-build-in-nxp-fork.patch \ @@ -14,6 +14,7 @@ SRC_URI = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ file://0005-viv-fb-Make-sure-config.h-is-included.patch \ file://0009-glimagesink-Downrank-to-marginal.patch \ file://0001-gst-libs-gst-gl-wayland-fix-meson-build.patch \ + file://0001-meson-viv-fb-code-must-link-against-libg2d.patch \ " S = "${WORKDIR}/git" @@ -41,7 +42,7 @@ PACKAGECONFIG ??= " \ OPENGL_APIS = 'opengl gles2' OPENGL_PLATFORMS = 'egl' -OPENGL_WINSYS = 'x11 wayland gbm' +OPENGL_WINSYS = 'x11 wayland gbm viv-fb' X11DEPENDS = "virtual/libx11 libsm libxrender libxv" X11ENABLEOPTS = "-Dx11=enabled -Dxvideo=enabled -Dxshm=enabled" @@ -70,6 +71,7 @@ PACKAGECONFIG[egl] = ",,virtual/egl" # OpenGL window systems (except for X11) PACKAGECONFIG[gbm] = ",,virtual/libgbm libgudev libdrm" PACKAGECONFIG[wayland] = ",,wayland-native wayland wayland-protocols libdrm" +PACKAGECONFIG[viv-fb] = ",,virtual/libgles2 virtual/libg2d" EXTRA_OEMESON += " \ -Dgl-graphene=disabled \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.3.imx.bb index b85b7842..8413bf10 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.3.imx.bb @@ -2,12 +2,12 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" -SRCBRANCH = "MM_04.05.05_2005_L5.4.24" +SRCBRANCH = "MM_04.05.07_2011_L5.4.70" SRC_URI = " \ ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \ " -SRCREV = "fc6d8ccf3bd775517fafb1ce1d9224312d2812d8" +SRCREV = "6005e8199ea19878f269b058ffbbbcaa314472d8" DEFAULT_PREFERENCE = "-1" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.imx.bb index 3dc60b66..8bbc16c8 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.imx.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ # Use i.MX fork of GST for customizations GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" -SRCBRANCH = "MM_04.05.05_2005_L5.4.24" +SRCBRANCH = "MM_04.05.06_2008_L5.4.47" SRC_URI = " \ ${GST1.0_SRC};branch=${SRCBRANCH} \ @@ -25,7 +25,7 @@ SRC_URI = " \ file://0004-meson-Add-option-for-installed-tests.patch \ file://capfix.patch \ " -SRCREV = "beca1b382febc2ba38a21fcb8f5092209773eb7f" +SRCREV = "8514bc61ccab208a65e387eab9347276a8e770e7" S = "${WORKDIR}/git" diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch deleted file mode 100644 index 9a0afea5..00000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch +++ /dev/null @@ -1,34 +0,0 @@ -From eb89cd344535706c6194359bd1f1fed50162a041 Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.z@gmail.com> -Date: Tue, 1 Sep 2020 08:24:52 +0000 -Subject: [PATCH] fsl_parser.h: fix compiler error with -fcommon - -When -fcommon is set in GCC10 configuration, following error is produced -during linking: -./git/ext-includes/fsl_parser.h:598: multiple definition of `TrackExtTagIndex'; -./git/ext-includes/fsl_parser.h:598: first defined here - -Remove unused enum name to resolve multiple definitions, it is not used -anywhere in the code base. - -Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> ---- - ext-includes/fsl_parser.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext-includes/fsl_parser.h b/ext-includes/fsl_parser.h -index d3aae20..c037c9a 100755 ---- a/ext-includes/fsl_parser.h -+++ b/ext-includes/fsl_parser.h -@@ -595,7 +595,7 @@ enum{ - FSL_PARSER_TRACKEXTTAG_CRYPTO_ENCRYPTED_BYTE_BLOCK, - FSL_PARSER_TRACKEXTTAG_CRYPTO_SKIP_BYTE_BLOCK, - FSL_PARSER_TRACKEXTTAG_CRYPTO_IV, --}TrackExtTagIndex; -+}; - - typedef struct _SeiPosition - { --- -2.17.1 - diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.5.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.7.bb index f2b33d96..c8bb6cd8 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.5.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.7.bb @@ -1,5 +1,5 @@ # Copyright (C) 2014,2016 Freescale Semiconductor -# Copyright 2017-2018 NXP +# Copyright 2017-2019 NXP # Copyright (C) 2012-2015 O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) @@ -20,13 +20,12 @@ RCONFLICTS_${PN} = "gst1.0-fsl-plugin" LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" -SRCBRANCH = "MM_04.05.05_2005_L5.4.24" +SRCBRANCH = "MM_04.05.07_2011_L5.4.70" SRC_URI = " \ git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch \ " -SRCREV = "4d2e5c1547c5f8a5e4e26a034ab87c809b34fb54" +SRCREV = "659ec4947d6b1903d26e4ec9e40ae251a659935d" S = "${WORKDIR}/git" diff --git a/recipes-multimedia/imx-codec/imx-codec_4.5.5.bb b/recipes-multimedia/imx-codec/imx-codec_4.5.7.bb index 8f5caff0..76a52f26 100644 --- a/recipes-multimedia/imx-codec/imx-codec_4.5.5.bb +++ b/recipes-multimedia/imx-codec/imx-codec_4.5.7.bb @@ -5,14 +5,14 @@ DESCRIPTION = "Freescale Multimedia codec libs" LICENSE = "Proprietary" SECTION = "multimedia" -LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" # Backward compatibility PROVIDES += "libfslcodec" SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "5472ae7b57a8390224761d151632a2a6" -SRC_URI[sha256sum] = "b0d5a6f847df99ee213cc79dae4f5e7194f567859c43d68d7c7c794a97f90294" +SRC_URI[md5sum] = "4d6ab45675c4010502a9bf2c16ee4705" +SRC_URI[sha256sum] = "637d6109e6d6105f36f0fbb4f1d2267d487e1326591f7a26cd078c35b8373e55" inherit fsl-eula-unpack autotools pkgconfig diff --git a/recipes-multimedia/imx-parser/imx-parser_4.5.5.bb b/recipes-multimedia/imx-parser/imx-parser_4.5.7.bb index 82041e08..0a3bb6a2 100644 --- a/recipes-multimedia/imx-parser/imx-parser_4.5.5.bb +++ b/recipes-multimedia/imx-parser/imx-parser_4.5.7.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Freescale Multimedia parser libs" LICENSE = "Proprietary" SECTION = "multimedia" -LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" # For backwards compatibility PROVIDES += "libfslparser" @@ -14,8 +14,8 @@ RPROVIDES_${PN} = "libfslparser" RCONFLICTS_${PN} = "libfslparser" SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "0845c64d2b64c2822328e8bc8442f5b8" -SRC_URI[sha256sum] = "33b8377a663b2ca749f40ef1164918335913e4de02a3857f2892707647d243de" +SRC_URI[md5sum] = "dd34e4e2d1384af27d370964ebbd05fd" +SRC_URI[sha256sum] = "033bdfdd4b611a4e9993519637c9b0f195daca9e12f614daff5d4dec90478fcf" inherit fsl-eula-unpack autotools pkgconfig diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.5.5.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.5.7.bb index 06f97b09..2b028235 100644 --- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.5.5.bb +++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_4.5.7.bb @@ -12,8 +12,8 @@ DEPENDS_append_mx8mp = " imx-vpu-hantro-vc" SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "MM_04.05.05_2005_L5.4.24" -SRCREV = "76225d8e15b2b72cd11ce073706473473e446294" +SRCBRANCH = "MM_04.05.07_2011_L5.4.70" +SRCREV = "ccaf10a0dae7c0d7d204bd64282598bc0e3bd661" S = "${WORKDIR}/git" diff --git a/recipes-multimedia/pulseaudio/pulseaudio/imx/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch b/recipes-multimedia/pulseaudio/pulseaudio/imx/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch index 019f9ba4..57c28741 100644 --- a/recipes-multimedia/pulseaudio/pulseaudio/imx/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch +++ b/recipes-multimedia/pulseaudio/pulseaudio/imx/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch @@ -1,4 +1,4 @@ -From 015e048d3662b9f82e9aa5cd04d7c9de4eadb68d Mon Sep 17 00:00:00 2001 +From 33022867d76c91fe4e60699c1b7ebbc8feb4ee93 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang <shengjiu.wang@freescale.com> Date: Mon, 30 Mar 2015 10:26:14 +0800 Subject: [PATCH] pulseaudio: remove the control for speaker/headphone widget @@ -12,15 +12,15 @@ Upstream-Status: Inappropriate [i.MX specific] Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> --- - .../alsa/mixer/paths/analog-output-headphones.conf | 8 ++++---- - .../alsa/mixer/paths/analog-output-speaker.conf | 8 ++++---- + .../alsa/mixer/paths/analog-output-headphones.conf | 8 ++++---- + src/modules/alsa/mixer/paths/analog-output-speaker.conf | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf -index b6ee70b..a617976 100644 +index 88907f0..7598d2f 100644 --- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf +++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf -@@ -81,8 +81,8 @@ override-map.2 = all-left,all-right +@@ -88,8 +88,8 @@ override-map.2 = all-left,all-right [Element Headphone] required-any = any @@ -31,7 +31,7 @@ index b6ee70b..a617976 100644 override-map.1 = all override-map.2 = all-left,all-right -@@ -105,8 +105,8 @@ switch = mute +@@ -119,8 +119,8 @@ switch = mute volume = zero [Element Speaker] @@ -43,10 +43,10 @@ index b6ee70b..a617976 100644 [Element Desktop Speaker] switch = off diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf -index 39193dd..34bbb85 100644 +index fcf2f5c..6f6f898 100644 --- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf +++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf -@@ -73,8 +73,8 @@ volume = off +@@ -91,8 +91,8 @@ volume = off ; This profile path is intended to control the speaker, let's mute headphones ; else there will be a spike when plugging in headphones [Element Headphone] @@ -55,9 +55,9 @@ index 39193dd..34bbb85 100644 +switch = on +volume = ignore - [Element Headphone2] + [Element Headphone,1] switch = off -@@ -93,8 +93,8 @@ override-map.2 = all-left,all-right +@@ -115,8 +115,8 @@ override-map.2 = all-left,all-right [Element Speaker] required-any = any @@ -69,5 +69,5 @@ index 39193dd..34bbb85 100644 override-map.2 = all-left,all-right -- -1.7.9.5 +2.20.1 diff --git a/recipes-security/optee-imx/optee-client/0001-flags-do-not-override-CFLAGS-from-host.patch b/recipes-security/optee-imx/optee-client/0001-flags-do-not-override-CFLAGS-from-host.patch deleted file mode 100644 index 9c6b1069..00000000 --- a/recipes-security/optee-imx/optee-client/0001-flags-do-not-override-CFLAGS-from-host.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 591461d6efe51989b4a7f4e875cdf37505eba360 Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.z@gmail.com> -Date: Thu, 4 Jun 2020 19:24:05 +0000 -Subject: [PATCH] flags: do not override CFLAGS from host - -Some build systems set CFLAGS in environment before the build, but they -got overridden by CFLAGS immediate assignment operator. - -Replace immediate assignment with append directive and use override -directive, so the former definition of CFLAGS gets passed either from -command line or via environment is completely expanded (see [1] for -detailed explanation of override directive and variable append). - -Link: [1] https://www.gnu.org/software/make/manual/html_node/Override-Directive.html - -Upstream-Status: Backport [https://github.com/OP-TEE/optee_client/pull/211] - -Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> -Reviewed-by: Jerome Forissier <jerome@forissier.org> -Reviewed-by: Joakim Bech <joakim.bech@linaro.org> ---- - flags.mk | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/flags.mk b/flags.mk -index c2f0e1c..65192bc 100644 ---- a/flags.mk -+++ b/flags.mk -@@ -6,7 +6,7 @@ CROSS_COMPILE ?= arm-linux-gnueabihf- - CC ?= $(CROSS_COMPILE)gcc - AR ?= $(CROSS_COMPILE)ar - --CFLAGS := -Wall -Wbad-function-cast -Wcast-align \ -+override CFLAGS += -Wall -Wbad-function-cast -Wcast-align \ - -Werror-implicit-function-declaration -Wextra \ - -Wfloat-equal -Wformat-nonliteral -Wformat-security \ - -Wformat=2 -Winit-self -Wmissing-declarations \ -@@ -16,13 +16,13 @@ CFLAGS := -Wall -Wbad-function-cast -Wcast-align \ - -Wswitch-default -Wunsafe-loop-optimizations \ - -Wwrite-strings -D_FILE_OFFSET_BITS=64 - ifeq ($(CFG_WERROR),y) --CFLAGS += -Werror -+override CFLAGS += -Werror - endif --CFLAGS += -c -fPIC -+override CFLAGS += -c -fPIC - - DEBUG ?= 0 - ifeq ($(DEBUG), 1) --CFLAGS += -DDEBUG -O0 -g -+override CFLAGS += -DDEBUG -O0 -g - endif - - RM := rm -f --- -2.17.1 - diff --git a/recipes-security/optee-imx/optee-client_3.7.0.imx.bb b/recipes-security/optee-imx/optee-client_3.10.0.imx.bb index d83f8a9c..58b6b8a4 100644 --- a/recipes-security/optee-imx/optee-client_3.7.0.imx.bb +++ b/recipes-security/optee-imx/optee-client_3.10.0.imx.bb @@ -1,23 +1,23 @@ -# Copyright (C) 2017-2018 NXP +# Copyright (C) 2017-2020 NXP SUMMARY = "OPTEE Client libs" HOMEPAGE = "http://www.optee.org/" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b" -inherit python3native systemd - -SRCBRANCH = "imx_5.4.24_2.1.0" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH}" - -SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe" - -SRC_URI += "file://tee-supplicant.service \ - file://0001-flags-do-not-override-CFLAGS-from-host.patch \ +SRCBRANCH = "imx_5.4.70_2.3.0" +SRC_URI = " \ + git://source.codeaurora.org/external/imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH} \ + file://tee-supplicant.service \ " +SRCREV = "2a77cf88d956c34cb4a1c191bea6113e327f5fe0" + S = "${WORKDIR}/git" B = "${WORKDIR}/build" + +inherit python3native systemd + SYSTEMD_SERVICE_${PN} = "tee-supplicant.service" OPTEE_ARCH ?= "arm32" diff --git a/recipes-security/optee-imx/optee-os/0001-optee-os-fix-gcc10-compilation-issue-and-missing-cc-.patch b/recipes-security/optee-imx/optee-os/0001-optee-os-fix-gcc10-compilation-issue-and-missing-cc-.patch deleted file mode 100644 index ab42d340..00000000 --- a/recipes-security/optee-imx/optee-os/0001-optee-os-fix-gcc10-compilation-issue-and-missing-cc-.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 109ed8d9a5351c7bb0fdc0953c7e7fb6cedcad9c Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.z@gmail.com> -Date: Sat, 30 May 2020 22:00:59 +0000 -Subject: [PATCH] optee-os: fix gcc10 compilation issue and missing cc-options - -Backport PR 3891 from upstream to imx fork, which addressed compilation -failure when GCC10 is used. - -Additional changes ported fixed cc-options macro, which allows to query -compiler used if the desired option exists before it could be set. This -solves also the build issues when GCC9 is used to build this component. - -Upstream-Status: Backport [https://github.com/OP-TEE/optee_os/pull/3891] - -Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> ---- - core/arch/arm/arm.mk | 22 +++++++++++++++++----- - core/core.mk | 5 +---- - mk/cc-option.mk | 9 +++++++++ - mk/gcc.mk | 2 +- - ta/mk/ta_dev_kit.mk | 3 +++ - ta/ta.mk | 1 + - 6 files changed, 32 insertions(+), 10 deletions(-) - create mode 100644 mk/cc-option.mk - -diff --git a/core/arch/arm/arm.mk b/core/arch/arm/arm.mk -index 5defb327..fffa491a 100644 ---- a/core/arch/arm/arm.mk -+++ b/core/arch/arm/arm.mk -@@ -1,3 +1,16 @@ -+# Setup compiler for the core module -+ifeq ($(CFG_ARM64_core),y) -+arch-bits-core := 64 -+else -+arch-bits-core := 32 -+endif -+CROSS_COMPILE_core := $(CROSS_COMPILE$(arch-bits-core)) -+COMPILER_core := $(COMPILER) -+include mk/$(COMPILER_core).mk -+ -+# Defines the cc-option macro using the compiler set for the core module -+include mk/cc-option.mk -+ - CFG_LTC_OPTEE_THREAD ?= y - # Size of emulated TrustZone protected SRAM, 448 kB. - # Only applicable when paging is enabled. -@@ -106,7 +119,7 @@ arm32-platform-aflags-no-hard-float ?= - - arm64-platform-cflags-no-hard-float ?= -mgeneral-regs-only - arm64-platform-cflags-hard-float ?= --arm64-platform-cflags-generic ?= -mstrict-align -+arm64-platform-cflags-generic := -mstrict-align $(call cc-option,-mno-outline-atomics,) - - ifeq ($(DEBUG),1) - # For backwards compatibility -@@ -135,14 +148,12 @@ core-platform-aflags += $(platform-aflags-generic) - core-platform-aflags += $(platform-aflags-debug-info) - - ifeq ($(CFG_ARM64_core),y) --arch-bits-core := 64 - core-platform-cppflags += $(arm64-platform-cppflags) - core-platform-cflags += $(arm64-platform-cflags) - core-platform-cflags += $(arm64-platform-cflags-generic) - core-platform-cflags += $(arm64-platform-cflags-no-hard-float) - core-platform-aflags += $(arm64-platform-aflags) - else --arch-bits-core := 32 - core-platform-cppflags += $(arm32-platform-cppflags) - core-platform-cflags += $(arm32-platform-cflags) - core-platform-cflags += $(arm32-platform-cflags-no-hard-float) -@@ -241,8 +252,9 @@ ta-mk-file-export-add-ta_arm64 += COMPILER ?= gcc_nl_ - ta-mk-file-export-add-ta_arm64 += COMPILER_ta_arm64 ?= $$(COMPILER)_nl_ - endif - --# Set cross compiler prefix for each submodule --$(foreach sm, core $(ta-targets), $(eval CROSS_COMPILE_$(sm) ?= $(CROSS_COMPILE$(arch-bits-$(sm))))) -+# Set cross compiler prefix for each TA target -+$(foreach sm, $(ta-targets), $(eval CROSS_COMPILE_$(sm) ?= $(CROSS_COMPILE$(arch-bits-$(sm))))) -+ - - arm32-sysreg-txt = core/arch/arm/kernel/arm32_sysreg.txt - arm32-sysregs-$(arm32-sysreg-txt)-h := arm32_sysreg.h -diff --git a/core/core.mk b/core/core.mk -index a51cf847..28c7235c 100644 ---- a/core/core.mk -+++ b/core/core.mk -@@ -8,6 +8,7 @@ arch-dir := core/arch/$(ARCH) - platform-dir := $(arch-dir)/plat-$(PLATFORM) - include $(platform-dir)/conf.mk - include mk/config.mk -+# $(ARCH).mk also sets the compiler for the core module - include core/arch/$(ARCH)/$(ARCH).mk - - PLATFORM_$(PLATFORM) := y -@@ -16,10 +17,6 @@ PLATFORM_FLAVOR_$(PLATFORM_FLAVOR) := y - $(eval $(call cfg-depends-all,CFG_PAGED_USER_TA,CFG_WITH_PAGER CFG_WITH_USER_TA)) - include core/crypto.mk - --# Setup compiler for this sub module --COMPILER_$(sm) ?= $(COMPILER) --include mk/$(COMPILER_$(sm)).mk -- - cppflags$(sm) += -D__KERNEL__ - - cppflags$(sm) += -Icore/include -diff --git a/mk/cc-option.mk b/mk/cc-option.mk -new file mode 100644 -index 00000000..4699fbcc ---- /dev/null -+++ b/mk/cc-option.mk -@@ -0,0 +1,9 @@ -+_cc-option-supported = $(if $(shell $(CC$(sm)) $(1) -c -x c /dev/null -o /dev/null 2>/dev/null >/dev/null || echo "Not supported"),,1) -+_cc-opt-cached-var-name = $(subst =,~,$(strip cached-cc-option-$(1)-$(subst $(empty) $(empty),,$(CC$(sm))))) -+define _cc-option -+$(eval _var_name := $(call _cc-opt-cached-var-name,$(1))) -+$(eval $(_var_name) := $(if $(filter $(origin $(_var_name)),undefined),$(call _cc-option-supported,$(1)),$($(_var_name)))) -+$(if $($(_var_name)),$(1),$(2)) -+endef -+cc-option = $(strip $(call _cc-option,$(1),$(2))) -+ -diff --git a/mk/gcc.mk b/mk/gcc.mk -index 1f2c5990..c53a23b1 100644 ---- a/mk/gcc.mk -+++ b/mk/gcc.mk -@@ -12,7 +12,7 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \ - -print-file-name=include 2> /dev/null) - - # Get location of libgcc from gcc --libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \ -+libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \ - -print-libgcc-file-name 2> /dev/null) - - # Define these to something to discover accidental use -diff --git a/ta/mk/ta_dev_kit.mk b/ta/mk/ta_dev_kit.mk -index 04a4f94b..e4b02ea7 100644 ---- a/ta/mk/ta_dev_kit.mk -+++ b/ta/mk/ta_dev_kit.mk -@@ -92,6 +92,9 @@ clean: - @$(cmd-echo-silent) ' CLEAN $(O)' - ${q}if [ -d "$(O)" ]; then $(RMDIR) $(O); fi - -+include $(ta-dev-kit-dir$(sm))/mk/$(COMPILER_$(sm)).mk -+include $(ta-dev-kit-dir$(sm))/mk/cc-option.mk -+ - subdirs = . - include $(ta-dev-kit-dir$(sm))/mk/subdir.mk - -diff --git a/ta/ta.mk b/ta/ta.mk -index dde7be67..ca17054a 100644 ---- a/ta/ta.mk -+++ b/ta/ta.mk -@@ -157,6 +157,7 @@ $(foreach f, $(libfiles), \ - - # Copy .mk files - ta-mkfiles = mk/compile.mk mk/subdir.mk mk/gcc.mk mk/clang.mk mk/cleandirs.mk \ -+ mk/cc-option.mk \ - ta/arch/$(ARCH)/link.mk ta/arch/$(ARCH)/link_shlib.mk \ - ta/mk/ta_dev_kit.mk - --- -2.17.1 - diff --git a/recipes-security/optee-imx/optee-os_3.7.0.imx.bb b/recipes-security/optee-imx/optee-os_3.10.0.imx.bb index 1bef749b..712b1aa6 100644 --- a/recipes-security/optee-imx/optee-os_3.7.0.imx.bb +++ b/recipes-security/optee-imx/optee-os_3.10.0.imx.bb @@ -6,35 +6,35 @@ HOMEPAGE = "http://www.optee.org/" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173" -inherit deploy python3native autotools -DEPENDS = "python3-pycrypto-native python3-pyelftools-native u-boot-mkimage-native" +DEPENDS = "python3-pycryptodomex-native python3-pyelftools-native u-boot-mkimage-native" -SRCBRANCH = "imx_5.4.24_2.1.0" +SRCBRANCH = "imx_5.4.70_2.3.0" SRC_URI = "\ git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-optee-os-fix-gcc10-compilation-issue-and-missing-cc-.patch \ " -SRCREV = "7a49776de59265500f10a247125429fde1555ac1" +SRCREV = "a991c90475bb1c715651e5fe27f7f32cbe61aef9" S = "${WORKDIR}/git" -B = "${WORKDIR}/build.${PLATFORM_FLAVOR}" + +inherit deploy python3native autotools # The platform flavor corresponds to the Yocto machine without the leading 'i'. -PLATFORM_FLAVOR = "${@d.getVar('MACHINE')[1:]}" -PLATFORM_FLAVOR_imx6qpdlsolox = "mx6qsabresd" -PLATFORM_FLAVOR_imx6ul7d = "mx6ulevk" -PLATFORM_FLAVOR_imx6ull14x14evk = "mx6ullevk" -PLATFORM_FLAVOR_imx6ull9x9evk = "mx6ullevk" -PLATFORM_FLAVOR_imx6ulz14x14evk = "mx6ulzevk" -PLATFORM_FLAVOR_mx8mm = "mx8mmevk" -PLATFORM_FLAVOR_mx8mn = "mx8mnevk" -PLATFORM_FLAVOR_mx8qxp = "mx8qxpmek" -PLATFORM_FLAVOR_mx8mp = "mx8mpevk" -PLATFORM_FLAVOR_mx8dx = "mx8dxmek" -PLATFORM_FLAVOR_mx8dxl = "mx8dxlevk" -PLATFORM_FLAVOR_mx8phantomdxl = "mx8qxpmek" +PLATFORM_FLAVOR = "${@d.getVar('MACHINE')[1:]}" +PLATFORM_FLAVOR_imx6qpdlsolox = "mx6qsabresd" +PLATFORM_FLAVOR_imx6ul7d = "mx6ulevk" +PLATFORM_FLAVOR_imx6ull14x14evk = "mx6ullevk" +PLATFORM_FLAVOR_imx6ull9x9evk = "mx6ullevk" +PLATFORM_FLAVOR_imx6ulz-14x14-evk = "mx6ulzevk" +PLATFORM_FLAVOR_mx8mq = "mx8mqevk" +PLATFORM_FLAVOR_mx8mm = "mx8mmevk" +PLATFORM_FLAVOR_mx8mn = "mx8mnevk" +PLATFORM_FLAVOR_mx8mp = "mx8mpevk" +PLATFORM_FLAVOR_mx8qm = "mx8qmmek" +PLATFORM_FLAVOR_mx8qxp = "mx8qxpmek" +PLATFORM_FLAVOR_mx8dx = "mx8dxmek" +PLATFORM_FLAVOR_mx8dxl = "mx8dxlevk" OPTEE_ARCH ?= "arm32" OPTEE_ARCH_armv7a = "arm32" @@ -50,31 +50,25 @@ EXTRA_OEMAKE = " \ PLATFORM_FLAVOR=${PLATFORM_FLAVOR} \ CROSS_COMPILE=${HOST_PREFIX} \ CROSS_COMPILE64=${HOST_PREFIX} \ - NOWERROR=1 \ - LDFLAGS= \ - O=${B} \ + CFG_TEE_TA_LOG_LEVEL=0 \ + CFG_TEE_CORE_LOG_LEVEL=0 \ + -C ${S} O=${B}\ " -do_compile () { - unset LDFLAGS - export CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_HOST}" - oe_runmake -C ${S} all CFG_TEE_TA_LOG_LEVEL=0 CFG_TEE_CORE_LOG_LEVEL=0 -} - +LDFLAGS = "" +CFLAGS += "--sysroot=${STAGING_DIR_HOST}" +CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}" do_deploy () { install -d ${DEPLOYDIR} ${TARGET_PREFIX}objcopy -O binary ${B}/core/tee.elf ${DEPLOYDIR}/tee.${PLATFORM_FLAVOR}.bin + ln -sf tee.${PLATFORM_FLAVOR}.bin ${DEPLOYDIR}/tee.bin if [ "${OPTEE_ARCH}" != "arm64" ]; then - IMX_LOAD_ADDR=`cat ${B}/core/tee-init_load_addr.txt` && \ + IMX_LOAD_ADDR=`${TARGET_PREFIX}readelf -h ${B}/core/tee.elf | grep "Entry point address" | awk '{print $4}'` uboot-mkimage -A arm -O linux -C none -a ${IMX_LOAD_ADDR} -e ${IMX_LOAD_ADDR} \ -d ${DEPLOYDIR}/tee.${PLATFORM_FLAVOR}.bin ${DEPLOYDIR}/uTee-${OPTEE_BIN_EXT} fi - - cd ${DEPLOYDIR} - ln -sf tee.${PLATFORM_FLAVOR}.bin tee.bin - cd - } do_install () { @@ -97,4 +91,4 @@ FILES_${PN}-staticdev = "/usr/include/optee/" RDEPENDS_${PN}-dev += "${PN}-staticdev" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(imx)" +COMPATIBLE_MACHINE = "(imx|imx-boot-container)" diff --git a/recipes-security/optee-imx/optee-test/0001-use-python3-instead-of-python.patch b/recipes-security/optee-imx/optee-test/0001-use-python3-instead-of-python.patch deleted file mode 100644 index 20f190af..00000000 --- a/recipes-security/optee-imx/optee-test/0001-use-python3-instead-of-python.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6271160639002a2580d80b75b5397a96d56329f2 Mon Sep 17 00:00:00 2001 -From: Scott Branden <scott.branden@broadcom.com> -Date: Fri, 27 Dec 2019 12:54:28 -0800 -Subject: [PATCH] use python3 instead of python - -use python3 instead of python as python2 is EOL January 2020. - -Signed-off-by: Scott Branden <scott.branden@broadcom.com> -Reviewed-by: Jerome Forissier <jerome@forissier.org> -Tested-by: Jerome Forissier <jerome@forissier.org> (QEMU, CFG_GCM_NIST_VECTORS=y) -Upstream-Status: Backport from v3.8.0 ---- - scripts/file_to_c.py | 4 ++-- - scripts/rsp_to_gcm_test.py | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/file_to_c.py b/scripts/file_to_c.py -index ae16f52..b4ce2a2 100755 ---- a/scripts/file_to_c.py -+++ b/scripts/file_to_c.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # SPDX-License-Identifier: BSD-2-Clause - # - # Copyright (c) 2018, Linaro Limited -@@ -29,7 +29,7 @@ def main(): - - f.write("const uint8_t " + args.name + "[] = {\n") - i = 0 -- for x in array.array("B", inf.read()): -+ for x in array.array("B", map(ord, (inf.read()))): - f.write("0x" + '{0:02x}'.format(x) + ",") - i = i + 1 - if i % 8 == 0: -diff --git a/scripts/rsp_to_gcm_test.py b/scripts/rsp_to_gcm_test.py -index 0543541..e4418be 100755 ---- a/scripts/rsp_to_gcm_test.py -+++ b/scripts/rsp_to_gcm_test.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - modes = {'encrypt': 0, 'decrypt': 1} - --- -2.7.4 - diff --git a/recipes-security/optee-imx/optee-test/0003-sock_server-fix-compilation-against-musl-sys-errno.h.patch b/recipes-security/optee-imx/optee-test/0003-sock_server-fix-compilation-against-musl-sys-errno.h.patch deleted file mode 100644 index d32a8eb7..00000000 --- a/recipes-security/optee-imx/optee-test/0003-sock_server-fix-compilation-against-musl-sys-errno.h.patch +++ /dev/null @@ -1,41 +0,0 @@ -From dc8cd1c43edeedb9f7335020537c4ffdddd683f8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> -Date: Thu, 7 Feb 2019 01:26:53 +0000 -Subject: [PATCH 1/3] sock_server: fix compilation against musl (sys/errno.h) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Compiling against musl-libc fails with the following error: - -| In file included from .../host/xtest/sock_server.c:24: -| .../usr/include/sys/errno.h:1:2: error: #warning redirecting incorrect #include <sys/errno.h> to <errno.h> [-Werror=cpp] -| #warning redirecting incorrect #include <sys/errno.h> to <errno.h> -| ^~~~~~~ - -Just remove the needless include. - -Signed-off-by: André Draszik <andre.draszik@jci.com> -Acked-by: Jens Wiklander <jens.wiklander@linaro.org> -Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> ---- -Signed-off-by: André Draszik <andre.draszik@jci.com> -Upstream-Status: Backport [3.5.0] - host/xtest/sock_server.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/host/xtest/sock_server.c b/host/xtest/sock_server.c -index 0d2ff06..1ba73d6 100644 ---- a/host/xtest/sock_server.c -+++ b/host/xtest/sock_server.c -@@ -21,7 +21,6 @@ - #include <netdb.h> - #include <netinet/in.h> - #include <poll.h> --#include <sys/errno.h> - #include <sys/socket.h> - #include <unistd.h> - --- -2.23.0.rc1 - diff --git a/recipes-security/optee-imx/optee-test/0004-build-ignore-declaration-after-statement-warnings.patch b/recipes-security/optee-imx/optee-test/0004-build-ignore-declaration-after-statement-warnings.patch deleted file mode 100644 index ed45df60..00000000 --- a/recipes-security/optee-imx/optee-test/0004-build-ignore-declaration-after-statement-warnings.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 1401b89684ee81bf0b3d3dea06e2926b24ba3f97 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> -Date: Thu, 7 Feb 2019 01:29:08 +0000 -Subject: [PATCH 2/3] build: ignore declaration-after-statement warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| Makefile:37: recipe for target 'xtest' failed -| make: *** [xtest] Error 2 -| make: *** Waiting for unfinished jobs.... -| arith_taf.c: In function 'get_handle': -| arith_taf.c:56:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] -| int h = handle_get(&hdb, ptr); -| ^~~ -| arith_taf.c: In function 'ta_entry_arith_new_var': -| arith_taf.c:82:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] -| size_t len = TEE_BigIntSizeInU32(params[0].value.a); -| ^~~~~~ -| arith_taf.c: In function 'ta_entry_arith_new_fmm_var': -| arith_taf.c:129:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] -| size_t len = TEE_BigIntFMMSizeInU32(params[0].value.a); -| ^~~~~~ -| arith_taf.c: In function 'ta_entry_arith_free_handle': -| arith_taf.c:150:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] -| void *ptr = put_handle(params[0].value.a & ~HT_MASK); -| ^~~~ -| arith_taf.c: In function 'ta_entry_arith_from_octet_string': -| arith_taf.c:165:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] -| TEE_BigInt *big_int = lookup_handle(HT_BIGINT, params[0].value.a); -| ^~~~~~~~~~ -| arith_taf.c: In function 'ta_entry_arith_from_s32': -| arith_taf.c:181:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] -| TEE_BigInt *big_int = lookup_handle(HT_BIGINT, params[0].value.a); -| ^~~~~~~~~~ - -etc. - -Signed-off-by: André Draszik <andre.draszik@jci.com> -Acked-by: Jens Wiklander <jens.wiklander@linaro.org> -Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> ---- -Signed-off-by: André Draszik <andre.draszik@jci.com> -Upstream-Status: Backport [3.5.0] - host/xtest/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/host/xtest/Makefile b/host/xtest/Makefile -index f4291e0..e97e555 100644 ---- a/host/xtest/Makefile -+++ b/host/xtest/Makefile -@@ -154,6 +154,7 @@ CFLAGS += -Wall -Wcast-align -Werror \ - -Wmissing-prototypes -Wnested-externs -Wpointer-arith \ - -Wshadow -Wstrict-prototypes -Wswitch-default \ - -Wwrite-strings \ -+ -Wno-declaration-after-statement \ - -Wno-missing-field-initializers -Wno-format-zero-length - endif - --- -2.23.0.rc1 - diff --git a/recipes-security/optee-imx/optee-test/0005-benchmark_1000-fix-compilation-against-musl-uint.patch b/recipes-security/optee-imx/optee-test/0005-benchmark_1000-fix-compilation-against-musl-uint.patch deleted file mode 100644 index 58734aa4..00000000 --- a/recipes-security/optee-imx/optee-test/0005-benchmark_1000-fix-compilation-against-musl-uint.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f74e9f339a8e8cb97fc8ea03bef51d7e3862a60a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> -Date: Thu, 7 Feb 2019 01:31:27 +0000 -Subject: [PATCH 3/3] benchmark_1000: fix compilation against musl (uint) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Compiling against musl-libc fails with the following error: - -| .../host/xtest/benchmark_1000.c: In function 'show_test_result': -| .../host/xtest/benchmark_1000.c:102:2: error: unknown type name 'uint'; did you mean 'int'? -| uint i; -| ^~~~ -| int -| ...host/xtest/benchmark_1000.c:108:16: error: comparison of integer expressions of different signedness: 'int' and 'size_t' {aka 'unsigned int'} [-Werror=sign-compare] -| for (i = 0; i < size; i++) { -| ^ - -etc. - -Convert to using more standard size_t - -Signed-off-by: André Draszik <andre.draszik@jci.com> -Acked-by: Jens Wiklander <jens.wiklander@linaro.org> -Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> ---- -Signed-off-by: André Draszik <andre.draszik@jci.com> -Upstream-Status: Backport [3.5.0] - host/xtest/benchmark_1000.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/host/xtest/benchmark_1000.c b/host/xtest/benchmark_1000.c -index bf92fa0..1caf420 100644 ---- a/host/xtest/benchmark_1000.c -+++ b/host/xtest/benchmark_1000.c -@@ -99,7 +99,7 @@ static TEEC_Result run_chunk_access_test(enum storage_benchmark_cmd cmd, - - static void show_test_result(struct test_record records[], size_t size) - { -- uint i; -+ size_t i; - - printf("-----------------+---------------+----------------\n"); - printf(" Data Size (B) \t | Time (s)\t | Speed (kB/s)\t \n"); -@@ -119,7 +119,7 @@ static void chunk_test(ADBG_Case_t *c, enum storage_benchmark_cmd cmd) - { - uint32_t chunk_size = DEFAULT_CHUNK_SIZE; - struct test_record records[ARRAY_SIZE(data_size_table) - 1]; -- uint i; -+ size_t i; - - for (i = 0; data_size_table[i]; i++) { - ADBG_EXPECT_TEEC_SUCCESS(c, --- -2.23.0.rc1 - diff --git a/recipes-security/optee-imx/optee-test/0006-regression_8100-use-null-terminated-strings-with-fil.patch b/recipes-security/optee-imx/optee-test/0006-regression_8100-use-null-terminated-strings-with-fil.patch deleted file mode 100644 index 1a5c4044..00000000 --- a/recipes-security/optee-imx/optee-test/0006-regression_8100-use-null-terminated-strings-with-fil.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 7d566ed585d1e13f444d48fde5705b5be54de4af Mon Sep 17 00:00:00 2001 -From: Ricardo Salveti <ricardo@foundries.io> -Date: Wed, 26 Jun 2019 17:32:11 -0300 -Subject: [PATCH] regression_8100: use null terminated strings with file_to_c - -GCC 9 is more strict with string manipulation, causing the build to -fail as the string data converted via file_to_c is not null terminated, -as described by the following build error: - -regression_8100.c:100:29: error: '%*s' directive argument is not a -nul-terminated string [-Werror=format-overflow=] -tlen = myasprintf(&trust, "%*s", (int)sizeof(regression_8100_ca_crt), - ^~~ - regression_8100_ca_crt); - ~~~~~~~~~~~~~~~~~~~~~~ - -Change file_to_c to terminate the string after conversion and update the -string size to remove the null terminated byte. Also update -regression_8100 to use the size variable defined via file_to_c instead -of manually calling sizeof. - -Signed-off-by: Ricardo Salveti <ricardo@foundries.io> -Acked-by: Jens Wiklander <jens.wiklander@linaro.org> ---- -Signed-off-by: André Draszik <andre.draszik@jci.com> -Upstream-Status: Backport [3.6.0] - host/xtest/regression_8100.c | 10 +++++----- - scripts/file_to_c.py | 4 ++-- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/host/xtest/regression_8100.c b/host/xtest/regression_8100.c -index 04d62d9..13780e1 100644 ---- a/host/xtest/regression_8100.c -+++ b/host/xtest/regression_8100.c -@@ -91,13 +91,13 @@ static void test_8102(ADBG_Case_t *c) - return; - - clen = myasprintf(&chain, "%*s\n%*s", -- (int)sizeof(regression_8100_my_crt), -+ (int)regression_8100_my_crt_size, - regression_8100_my_crt, -- (int)sizeof(regression_8100_mid_crt), -+ (int)regression_8100_mid_crt_size, - regression_8100_mid_crt); - if (!ADBG_EXPECT_COMPARE_SIGNED(c, clen, !=, -1)) - goto out; -- tlen = myasprintf(&trust, "%*s", (int)sizeof(regression_8100_ca_crt), -+ tlen = myasprintf(&trust, "%*s", (int)regression_8100_ca_crt_size, - regression_8100_ca_crt); - if (!ADBG_EXPECT_COMPARE_SIGNED(c, tlen, !=, -1)) - goto out; -@@ -282,7 +282,7 @@ static void test_8103(ADBG_Case_t *c) - NULL, &ret_orig))) - return; - -- clen = myasprintf(&csr, "%*s", (int)sizeof(regression_8100_my_csr), -+ clen = myasprintf(&csr, "%*s", (int)regression_8100_my_csr_size, - regression_8100_my_csr); - if (!ADBG_EXPECT_COMPARE_SIGNED(c, clen, >=, 0)) - goto out; -@@ -300,7 +300,7 @@ static void test_8103(ADBG_Case_t *c) - if (!ADBG_EXPECT_TEEC_SUCCESS(c, res)) - goto out; - -- myasprintf(&ca, "%*s", (int)sizeof(regression_8100_ca_crt), -+ myasprintf(&ca, "%*s", (int)regression_8100_ca_crt_size, - regression_8100_ca_crt); - if (!ADBG_EXPECT_NOT_NULL(c, ca)) - goto out; -diff --git a/scripts/file_to_c.py b/scripts/file_to_c.py -index 83a9832..ae16f52 100755 ---- a/scripts/file_to_c.py -+++ b/scripts/file_to_c.py -@@ -37,9 +37,9 @@ def main(): - else: - f.write(" ") - -- f.write("};\n") -+ f.write("'\\0'};\n") - f.write("const size_t " + args.name + "_size = sizeof(" + -- args.name + ");\n") -+ args.name + ") - 1;\n") - - f.close() - inf.close() --- -2.23.0.rc1 - diff --git a/recipes-security/optee-imx/optee-test_3.7.0.imx.bb b/recipes-security/optee-imx/optee-test_3.10.0.imx.bb index 04240ff0..a8a1b245 100644 --- a/recipes-security/optee-imx/optee-test_3.7.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.10.0.imx.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2018 NXP +# Copyright (C) 2017-2020 NXP SUMMARY = "OPTEE test" HOMEPAGE = "http://www.optee.org/" @@ -6,21 +6,18 @@ HOMEPAGE = "http://www.optee.org/" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa" -DEPENDS = "optee-os optee-client python3-pycrypto-native openssl" -inherit python3native - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +DEPENDS = "python3-pycrypto-native python3-pycryptodomex-native optee-os optee-client openssl" -SRCBRANCH = "imx_5.4.24_2.1.0" +SRCBRANCH = "imx_5.4.70_2.3.0" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-use-python3-instead-of-python.patch \ -" +SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}" S = "${WORKDIR}/git" B = "${WORKDIR}/build" -SRCREV = "227d6f4c40eaa6f84fe049b9e48c7b27ad7fab08" +SRCREV = "0c998f42a3fb87b9f2929955cf4b0116cc515091" + +inherit python3native OPTEE_ARCH ?= "arm32" OPTEE_ARCH_armv7a = "arm32" @@ -29,6 +26,9 @@ OPTEE_ARCH_aarch64 = "arm64" TA_DEV_KIT_DIR_arm = "${STAGING_INCDIR}/optee/export-user_ta_arm32/" TA_DEV_KIT_DIR_aarch64 = "${STAGING_INCDIR}/optee/export-user_ta_arm64/" +CFLAGS += "--sysroot=${STAGING_DIR_HOST}" +CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}" + EXTRA_OEMAKE = " \ TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ ARCH=${OPTEE_ARCH} \ @@ -40,6 +40,14 @@ EXTRA_OEMAKE = " \ -C ${S} O=${B} \ " +do_compile() { + cd ${S} + # Top level makefile doesn't seem to handle parallel make gracefully + oe_runmake xtest + oe_runmake ta +} +do_compile[cleandirs] = "${B}" + do_install () { install -d ${D}/usr/bin install ${B}/xtest/xtest ${D}/usr/bin/ diff --git a/recipes-security/optee/optee-client-qoriq.bb b/recipes-security/optee/optee-client-qoriq.bb deleted file mode 100644 index af5fc095..00000000 --- a/recipes-security/optee/optee-client-qoriq.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "OPTEE Client" -HOMEPAGE = "https://github.com/qoriq-open-source/optee_client" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b" - -inherit python3native systemd - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/optee_client;nobranch=1 \ -" -S = "${WORKDIR}/git" - -SRCREV = "08428734c67fb559e420d87fa52fd74a955ea1bd" - -EXTRA_OEMAKE = "ARCH=arm64" - -do_install() { - oe_runmake install - - install -D -p -m0755 ${S}/out/export/bin/tee-supplicant ${D}${bindir}/tee-supplicant - - install -D -p -m0644 ${S}/out/export/lib/libteec.so.1.0 ${D}${libdir}/libteec.so.1.0 - ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so - ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1 - - cp -a ${S}/out/export/include ${D}/usr/ -} - -COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-security/optee/optee-client-qoriq/0001-GCC-8-format-truncation-error.patch b/recipes-security/optee/optee-client-qoriq/0001-GCC-8-format-truncation-error.patch deleted file mode 100644 index f58590c3..00000000 --- a/recipes-security/optee/optee-client-qoriq/0001-GCC-8-format-truncation-error.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 05f741c1e6263bec2977901abe61463b7f8175ad Mon Sep 17 00:00:00 2001 -From: Chunrong Guo <chunrong.guo@nxp.com> -Date: Fri, 22 Jun 2018 11:58:09 +0800 -Subject: [PATCH] GCC 8 format-truncation error - -Signed-off-by: BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com> ---- - libteec/src/teec_trace.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libteec/src/teec_trace.c b/libteec/src/teec_trace.c -index 78b79d6..7901deb 100644 ---- a/libteec/src/teec_trace.c -+++ b/libteec/src/teec_trace.c -@@ -73,7 +73,7 @@ int _dprintf(const char *function, int flen, int line, int level, - const char *prefix, const char *fmt, ...) - { - char raw[MAX_PRINT_SIZE]; -- char prefixed[MAX_PRINT_SIZE]; -+ char prefixed[MAX_PRINT_SIZE + 10]; - char *to_print = NULL; - const char *func; - int err; -@@ -106,7 +106,7 @@ int _dprintf(const char *function, int flen, int line, int level, - */ - int thread_id = syscall(SYS_gettid); /* perf issue ? */ - -- snprintf(prefixed, MAX_PRINT_SIZE, -+ snprintf(prefixed, MAX_PRINT_SIZE + 10, - "%s [%d] %s:%s:%d: %s", - trace_level_strings[level], thread_id, prefix, func, - line, raw); --- -1.8.3.1 - diff --git a/recipes-security/optee/optee-client-qoriq/0001-flags-CFLAGS-add-Wno-cpp.patch b/recipes-security/optee/optee-client-qoriq/0001-flags-CFLAGS-add-Wno-cpp.patch deleted file mode 100644 index 09e4490d..00000000 --- a/recipes-security/optee/optee-client-qoriq/0001-flags-CFLAGS-add-Wno-cpp.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f2ebda1d85b10fd008c21974a0f7aa4e805d0e5c Mon Sep 17 00:00:00 2001 -From: Chunrong Guo <chunrong.guo@nxp.com> -Date: Tue, 11 Sep 2018 11:40:55 +0800 -Subject: [PATCH] flags: CFLAGS add -Wno-cpp - -*fix build with FORTIFY_SOURCES - -Signed-off-by: BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com> ---- - flags.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/flags.mk b/flags.mk -index 71f3d18..43c18f0 100644 ---- a/flags.mk -+++ b/flags.mk -@@ -14,7 +14,7 @@ CFLAGS := -Wall -Wbad-function-cast -Wcast-align \ - -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs \ - -Wpointer-arith -Wshadow -Wstrict-prototypes \ - -Wswitch-default -Wunsafe-loop-optimizations \ -- -Wwrite-strings -Werror -+ -Wwrite-strings -Werror -Wno-cpp - CFLAGS += -c -fPIC - - DEBUG ?= 0 --- -2.7.4 - diff --git a/recipes-security/optee/optee-client-qoriq_3.8.0.bb b/recipes-security/optee/optee-client-qoriq_3.8.0.bb new file mode 100644 index 00000000..0cd9eeab --- /dev/null +++ b/recipes-security/optee/optee-client-qoriq_3.8.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "OPTEE Client" +HOMEPAGE = "https://github.com/OP-TEE/optee_client" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b" + +inherit python3native systemd + +SRC_URI = "git://github.com/OP-TEE/optee_client;nobranch=1" +SRCREV = "be4fa2e36f717f03ca46e574aa66f697a897d090" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "ARCH=arm64" + +do_install() { + oe_runmake install + + install -D -p -m0755 ${S}/out/export/usr/sbin/tee-supplicant ${D}${bindir}/tee-supplicant + install -D -p -m0755 ${S}/out/export/usr/lib/libteec.so.1.0.0 ${D}${libdir}/libteec.so.1.0.0 + ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so.1.0 + ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so.1 + ln -sf libteec.so.1 ${D}${libdir}/libteec.so + + cp -a ${S}/out/export/usr/include ${D}/usr/ +} + +COMPATIBLE_MACHINE = "(qoriq-arm64)" diff --git a/recipes-security/optee/optee-os-qoriq/0001-Fix-alignment-of-data-for-mempool_alloc_pool.patch b/recipes-security/optee/optee-os-qoriq/0001-Fix-alignment-of-data-for-mempool_alloc_pool.patch deleted file mode 100644 index e22bd6c0..00000000 --- a/recipes-security/optee/optee-os-qoriq/0001-Fix-alignment-of-data-for-mempool_alloc_pool.patch +++ /dev/null @@ -1,148 +0,0 @@ -From b2dd8747125be413f9b8b7fd7e52f457cabd709c Mon Sep 17 00:00:00 2001 -From: Jens Wiklander <jens.wiklander@linaro.org> -Date: Tue, 5 Feb 2019 13:05:29 +0100 -Subject: [PATCH] Fix alignment of data for mempool_alloc_pool() - -Upstream-Status: Submitted - -Prior to this patch was _TEE_MathAPI_Init() in -lib/libutee/tee_api_arith_mpi.c supplying a data buffer which was only 4 -byte aligned while mempool_alloc_pool() requires the alignment of long. -This will work in 32-bit mode, but could lead to alignment problem in -64-bit mode. The same problem can happen with -lib/libutee/tee_api_arith_mpa.c, but so far it has remained hidden. - -Incorrect alignment can result in errors like: -E/TA: assertion '!((vaddr_t)data & (POOL_ALIGN - 1))' failed at lib/libutils/ext/mempool.c:134 in mempool_alloc_pool() - -This fix introduces MEMPOOL_ALIGN which specifies required alignment of -data supplied to mempool_alloc_pool(). - -Fixes: 062e3d01c039 ("ta: switch to to mbedtls for bignum") -Reviewed-by: Joakim Bech <joakim.bech@linaro.org> -Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU v8) -Acked-by: Jerome Forissier <jerome.forissier@linaro.org> -Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> ---- - core/lib/libtomcrypt/src/mpa_desc.c | 2 +- - core/lib/libtomcrypt/src/mpi_desc.c | 2 +- - lib/libutee/tee_api_arith_mpa.c | 3 ++- - lib/libutee/tee_api_arith_mpi.c | 3 +-- - lib/libutils/ext/include/mempool.h | 5 ++++- - lib/libutils/ext/mempool.c | 9 ++++----- - 6 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/core/lib/libtomcrypt/src/mpa_desc.c b/core/lib/libtomcrypt/src/mpa_desc.c -index b407f54..58aa242 100644 ---- a/core/lib/libtomcrypt/src/mpa_desc.c -+++ b/core/lib/libtomcrypt/src/mpa_desc.c -@@ -40,7 +40,7 @@ static struct mempool *get_mpa_scratch_memory_pool(void) - #else /* CFG_WITH_PAGER */ - static struct mempool *get_mpa_scratch_memory_pool(void) - { -- static uint32_t data[LTC_MEMPOOL_U32_SIZE] __aligned(__alignof__(long)); -+ static uint32_t data[LTC_MEMPOOL_U32_SIZE] __aligned(MEMPOOL_ALIGN); - - return mempool_alloc_pool(data, sizeof(data), NULL); - } -diff --git a/core/lib/libtomcrypt/src/mpi_desc.c b/core/lib/libtomcrypt/src/mpi_desc.c -index a43fbb4..67bc3a7 100644 ---- a/core/lib/libtomcrypt/src/mpi_desc.c -+++ b/core/lib/libtomcrypt/src/mpi_desc.c -@@ -38,7 +38,7 @@ static struct mempool *get_mp_scratch_memory_pool(void) - #else /* CFG_WITH_PAGER */ - static struct mempool *get_mp_scratch_memory_pool(void) - { -- static uint8_t data[MPI_MEMPOOL_SIZE] __aligned(__alignof__(long)); -+ static uint8_t data[MPI_MEMPOOL_SIZE] __aligned(MEMPOOL_ALIGN); - - return mempool_alloc_pool(data, sizeof(data), NULL); - } -diff --git a/lib/libutee/tee_api_arith_mpa.c b/lib/libutee/tee_api_arith_mpa.c -index 0f6c7f1..a8ca6aa 100644 ---- a/lib/libutee/tee_api_arith_mpa.c -+++ b/lib/libutee/tee_api_arith_mpa.c -@@ -19,7 +19,8 @@ - - static uint32_t mempool_u32[mpa_scratch_mem_size_in_U32( - MPA_INTERNAL_MEM_POOL_SIZE, -- CFG_TA_BIGNUM_MAX_BITS)]; -+ CFG_TA_BIGNUM_MAX_BITS)] -+ __aligned(MEMPOOL_ALIGN); - static mpa_scratch_mem mempool; - - /************************************************************* -diff --git a/lib/libutee/tee_api_arith_mpi.c b/lib/libutee/tee_api_arith_mpi.c -index 8e2751b..6b074e1 100644 ---- a/lib/libutee/tee_api_arith_mpi.c -+++ b/lib/libutee/tee_api_arith_mpi.c -@@ -42,8 +42,7 @@ static void __noreturn mpi_panic(const char *func, int line, int rc) - - void _TEE_MathAPI_Init(void) - { -- static uint8_t data[MPI_MEMPOOL_SIZE] -- __aligned(__alignof__(mbedtls_mpi_uint)); -+ static uint8_t data[MPI_MEMPOOL_SIZE] __aligned(MEMPOOL_ALIGN); - - mbedtls_mpi_mempool = mempool_alloc_pool(data, sizeof(data), NULL); - if (!mbedtls_mpi_mempool) -diff --git a/lib/libutils/ext/include/mempool.h b/lib/libutils/ext/include/mempool.h -index 62377df..2a60800 100644 ---- a/lib/libutils/ext/include/mempool.h -+++ b/lib/libutils/ext/include/mempool.h -@@ -19,9 +19,12 @@ struct mempool_item { - - struct mempool; - -+#define MEMPOOL_ALIGN __alignof__(long) -+ - /* - * mempool_alloc_pool() - Allocate a new memory pool -- * @data: a block of memory to carve out items from -+ * @data: a block of memory to carve out items from, must -+ * have an alignment of MEMPOOL_ALIGN. - * @size: size fo the block of memory - * @release_mem: function to call when the pool has been emptied, - * ignored if NULL. -diff --git a/lib/libutils/ext/mempool.c b/lib/libutils/ext/mempool.c -index f977699..6d38590 100644 ---- a/lib/libutils/ext/mempool.c -+++ b/lib/libutils/ext/mempool.c -@@ -53,7 +53,6 @@ - * So the potential fragmentation is mitigated. - */ - --#define POOL_ALIGN __alignof__(long) - - struct mempool { - size_t size; /* size of the memory pool, in bytes */ -@@ -130,8 +129,8 @@ mempool_alloc_pool(void *data, size_t size, - { - struct mempool *pool = calloc(1, sizeof(*pool)); - -- COMPILE_TIME_ASSERT(POOL_ALIGN >= __alignof__(struct mempool_item)); -- assert(!((vaddr_t)data & (POOL_ALIGN - 1))); -+ COMPILE_TIME_ASSERT(MEMPOOL_ALIGN >= __alignof__(struct mempool_item)); -+ assert(!((vaddr_t)data & (MEMPOOL_ALIGN - 1))); - - if (pool) { - pool->size = size; -@@ -163,13 +162,13 @@ void *mempool_alloc(struct mempool *pool, size_t size) - pool->last_offset); - offset = pool->last_offset + last_item->size; - -- offset = ROUNDUP(offset, POOL_ALIGN); -+ offset = ROUNDUP(offset, MEMPOOL_ALIGN); - if (offset > pool->size) - goto error; - } - - size = sizeof(struct mempool_item) + size; -- size = ROUNDUP(size, POOL_ALIGN); -+ size = ROUNDUP(size, MEMPOOL_ALIGN); - if (offset + size > pool->size) - goto error; - --- -2.7.4 - diff --git a/recipes-security/optee/optee-os-qoriq/0001-arm64-Disable-outline-atomics-when-compiling.patch b/recipes-security/optee/optee-os-qoriq/0001-arm64-Disable-outline-atomics-when-compiling.patch new file mode 100644 index 00000000..086d4333 --- /dev/null +++ b/recipes-security/optee/optee-os-qoriq/0001-arm64-Disable-outline-atomics-when-compiling.patch @@ -0,0 +1,41 @@ +From f94d9558d9eae48e92ce8d651539b6cf69eb4394 Mon Sep 17 00:00:00 2001 +From: Joshua Watt <JPEWhacker@gmail.com> +Date: Mon, 18 May 2020 20:00:00 -0500 +Subject: [PATCH] arm64: Disable outline-atomics when compiling + +Disables the automatic detection of LSE (Large System Extension) +instructions when compiling AArch64 code. GCC 10 implements this +detection in libgcc using __getauxval(), which optee doesn't implement. +This requires that the proper -mcpu is passed to GCC so that the code +can be correctly compiled to use either LSE or load-store-exclusive. + +Fixes linker errors like the following when compiling with GCC 10: + + aarch64-linux-ld.bfd: libgcc.a(lse-init.o): + in function `init_have_lse_atomics': + lse-init.c:44: undefined reference to `__getauxval' + core/arch/arm/kernel/link.mk:38: + recipe for target 'build/core/all_objs.o' failed + +Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> +Upstream-Status: Submitted [https://github.com/OP-TEE/optee_os/pull/3874] +--- + core/arch/arm/arm.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/arch/arm/arm.mk b/core/arch/arm/arm.mk +index a18eda3b..07069c66 100644 +--- a/core/arch/arm/arm.mk ++++ b/core/arch/arm/arm.mk +@@ -115,7 +115,7 @@ arm32-platform-aflags-no-hard-float ?= + + arm64-platform-cflags-no-hard-float ?= -mgeneral-regs-only + arm64-platform-cflags-hard-float ?= +-arm64-platform-cflags-generic ?= -mstrict-align ++arm64-platform-cflags-generic ?= -mstrict-align $(call cc-option,-mno-outline-atomics,) + + ifeq ($(DEBUG),1) + # For backwards compatibility +-- +2.17.1 + diff --git a/recipes-security/optee/optee-os-qoriq/0001-optee-os-fix-gcc10-compilation-issue-and-missing-cc-.patch b/recipes-security/optee/optee-os-qoriq/0001-optee-os-fix-gcc10-compilation-issue-and-missing-cc-.patch deleted file mode 100644 index f9c71d0d..00000000 --- a/recipes-security/optee/optee-os-qoriq/0001-optee-os-fix-gcc10-compilation-issue-and-missing-cc-.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 027a3b9a33fbb23e1d1d7ed6411d4d112d2a55a1 Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.z@gmail.com> -Date: Sat, 30 May 2020 22:00:59 +0000 -Subject: [PATCH] optee-os: fix gcc10 compilation issue and missing cc-options - -Backport PR 3891 from upstream to imx fork, which addressed compilation -failure when GCC10 is used. - -Additional changes ported fixed cc-options macro, which allows to query -compiler used if the desired option exists before it could be set. This -solves also the build issues when GCC9 is used to build this component. - -Upstream-Status: Backport [https://github.com/OP-TEE/optee_os/pull/3891] - -Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> ---- - core/arch/arm/arm.mk | 21 ++++++++++++++++----- - core/core.mk | 5 +---- - mk/cc-option.mk | 9 +++++++++ - mk/gcc.mk | 2 +- - ta/mk/ta_dev_kit.mk | 3 +++ - ta/ta.mk | 1 + - 6 files changed, 31 insertions(+), 10 deletions(-) - create mode 100644 mk/cc-option.mk - -diff --git a/core/arch/arm/arm.mk b/core/arch/arm/arm.mk -index 0a95b1ec..bfcbe896 100644 ---- a/core/arch/arm/arm.mk -+++ b/core/arch/arm/arm.mk -@@ -1,3 +1,16 @@ -+# Setup compiler for the core module -+ifeq ($(CFG_ARM64_core),y) -+arch-bits-core := 64 -+else -+arch-bits-core := 32 -+endif -+CROSS_COMPILE_core := $(CROSS_COMPILE$(arch-bits-core)) -+COMPILER_core := $(COMPILER) -+include mk/$(COMPILER_core).mk -+ -+# Defines the cc-option macro using the compiler set for the core module -+include mk/cc-option.mk -+ - CFG_LTC_OPTEE_THREAD ?= y - # Size of emulated TrustZone protected SRAM, 448 kB. - # Only applicable when paging is enabled. -@@ -95,7 +108,7 @@ arm32-platform-aflags-no-hard-float ?= - - arm64-platform-cflags-no-hard-float ?= -mgeneral-regs-only - arm64-platform-cflags-hard-float ?= --arm64-platform-cflags-generic ?= -mstrict-align -+arm64-platform-cflags-generic := -mstrict-align $(call cc-option,-mno-outline-atomics,) - - ifeq ($(DEBUG),1) - # For backwards compatibility -@@ -124,14 +137,12 @@ core-platform-aflags += $(platform-aflags-generic) - core-platform-aflags += $(platform-aflags-debug-info) - - ifeq ($(CFG_ARM64_core),y) --arch-bits-core := 64 - core-platform-cppflags += $(arm64-platform-cppflags) - core-platform-cflags += $(arm64-platform-cflags) - core-platform-cflags += $(arm64-platform-cflags-generic) - core-platform-cflags += $(arm64-platform-cflags-no-hard-float) - core-platform-aflags += $(arm64-platform-aflags) - else --arch-bits-core := 32 - core-platform-cppflags += $(arm32-platform-cppflags) - core-platform-cflags += $(arm32-platform-cflags) - core-platform-cflags += $(arm32-platform-cflags-no-hard-float) -@@ -217,8 +228,8 @@ ta-mk-file-export-add-ta_arm64 += CROSS_COMPILE64 ?= $$(CROSS_COMPILE)_nl_ - ta-mk-file-export-add-ta_arm64 += CROSS_COMPILE_ta_arm64 ?= $$(CROSS_COMPILE64)_nl_ - endif - --# Set cross compiler prefix for each submodule --$(foreach sm, core $(ta-targets), $(eval CROSS_COMPILE_$(sm) ?= $(CROSS_COMPILE$(arch-bits-$(sm))))) -+# Set cross compiler prefix for each TA target -+$(foreach sm, $(ta-targets), $(eval CROSS_COMPILE_$(sm) ?= $(CROSS_COMPILE$(arch-bits-$(sm))))) - - arm32-sysreg-txt = core/arch/arm/kernel/arm32_sysreg.txt - arm32-sysregs-$(arm32-sysreg-txt)-h := arm32_sysreg.h -diff --git a/core/core.mk b/core/core.mk -index 37906792..4eec217a 100644 ---- a/core/core.mk -+++ b/core/core.mk -@@ -8,6 +8,7 @@ arch-dir := core/arch/$(ARCH) - platform-dir := $(arch-dir)/plat-$(PLATFORM) - include $(platform-dir)/conf.mk - include mk/config.mk -+# $(ARCH).mk also sets the compiler for the core module - include core/arch/$(ARCH)/$(ARCH).mk - - PLATFORM_$(PLATFORM) := y -@@ -16,10 +17,6 @@ PLATFORM_FLAVOR_$(PLATFORM_FLAVOR) := y - $(call cfg-depends-all,CFG_PAGED_USER_TA,CFG_WITH_PAGER CFG_WITH_USER_TA) - include core/crypto.mk - --# Setup compiler for this sub module --COMPILER_$(sm) ?= $(COMPILER) --include mk/$(COMPILER_$(sm)).mk -- - cppflags$(sm) += -D__KERNEL__ - - cppflags$(sm) += -Icore/include -diff --git a/mk/cc-option.mk b/mk/cc-option.mk -new file mode 100644 -index 00000000..4699fbcc ---- /dev/null -+++ b/mk/cc-option.mk -@@ -0,0 +1,9 @@ -+_cc-option-supported = $(if $(shell $(CC$(sm)) $(1) -c -x c /dev/null -o /dev/null 2>/dev/null >/dev/null || echo "Not supported"),,1) -+_cc-opt-cached-var-name = $(subst =,~,$(strip cached-cc-option-$(1)-$(subst $(empty) $(empty),,$(CC$(sm))))) -+define _cc-option -+$(eval _var_name := $(call _cc-opt-cached-var-name,$(1))) -+$(eval $(_var_name) := $(if $(filter $(origin $(_var_name)),undefined),$(call _cc-option-supported,$(1)),$($(_var_name)))) -+$(if $($(_var_name)),$(1),$(2)) -+endef -+cc-option = $(strip $(call _cc-option,$(1),$(2))) -+ -diff --git a/mk/gcc.mk b/mk/gcc.mk -index c516c731..330b200a 100644 ---- a/mk/gcc.mk -+++ b/mk/gcc.mk -@@ -12,7 +12,7 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \ - -print-file-name=include 2> /dev/null) - - # Get location of libgcc from gcc --libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \ -+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \ - -print-libgcc-file-name 2> /dev/null) - - # Define these to something to discover accidental use -diff --git a/ta/mk/ta_dev_kit.mk b/ta/mk/ta_dev_kit.mk -index 8473c6df..40e77c3e 100644 ---- a/ta/mk/ta_dev_kit.mk -+++ b/ta/mk/ta_dev_kit.mk -@@ -86,6 +86,9 @@ clean: - @$(cmd-echo-silent) ' CLEAN $(O)' - ${q}if [ -d "$(O)" ]; then $(RMDIR) $(O); fi - -+include $(ta-dev-kit-dir$(sm))/mk/$(COMPILER_$(sm)).mk -+include $(ta-dev-kit-dir$(sm))/mk/cc-option.mk -+ - subdirs = . - include $(ta-dev-kit-dir$(sm))/mk/subdir.mk - -diff --git a/ta/ta.mk b/ta/ta.mk -index 1b7e999d..e0915d18 100644 ---- a/ta/ta.mk -+++ b/ta/ta.mk -@@ -105,6 +105,7 @@ $(foreach f, $(libfiles), \ - - # Copy .mk files - ta-mkfiles = mk/compile.mk mk/subdir.mk mk/gcc.mk mk/cleandirs.mk \ -+ mk/cc-option.mk \ - ta/arch/$(ARCH)/link.mk ta/arch/$(ARCH)/link_shlib.mk \ - ta/mk/ta_dev_kit.mk - --- -2.17.1 - diff --git a/recipes-security/optee/optee-os-qoriq/0001-use-python3-instead-of-python.patch b/recipes-security/optee/optee-os-qoriq/0001-use-python3-instead-of-python.patch deleted file mode 100644 index 6ecc6152..00000000 --- a/recipes-security/optee/optee-os-qoriq/0001-use-python3-instead-of-python.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/scripts/arm32_sysreg.py b/scripts/arm32_sysreg.py -index bd0c619e..530b0f44 100755 ---- a/scripts/arm32_sysreg.py -+++ b/scripts/arm32_sysreg.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # SPDX-License-Identifier: BSD-2-Clause - # - # Copyright (c) 2018, Linaro Limited -diff --git a/scripts/gen_hashed_bin.py b/scripts/gen_hashed_bin.py -index 67b2b049..619cf26e 100755 ---- a/scripts/gen_hashed_bin.py -+++ b/scripts/gen_hashed_bin.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # SPDX-License-Identifier: BSD-2-Clause - # - # Copyright (c) 2014-2017, Linaro Limited -diff --git a/scripts/gen_ld_sects.py b/scripts/gen_ld_sects.py -index 43e812b5..bc82dd8b 100755 ---- a/scripts/gen_ld_sects.py -+++ b/scripts/gen_ld_sects.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # SPDX-License-Identifier: BSD-2-Clause - # - # Copyright (c) 2017, Linaro Limited -diff --git a/scripts/pem_to_pub_c.py b/scripts/pem_to_pub_c.py -index ddc17c18..69a4355c 100755 ---- a/scripts/pem_to_pub_c.py -+++ b/scripts/pem_to_pub_c.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # SPDX-License-Identifier: BSD-2-Clause - # - # Copyright (c) 2015, Linaro Limited -diff --git a/scripts/sign.py b/scripts/sign.py -index 84fd7714..f6e6b667 100755 ---- a/scripts/sign.py -+++ b/scripts/sign.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Copyright (c) 2015, 2017, Linaro Limited - # -diff --git a/scripts/symbolize.py b/scripts/symbolize.py -index 99a48c70..cbd9884a 100755 ---- a/scripts/symbolize.py -+++ b/scripts/symbolize.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # SPDX-License-Identifier: BSD-2-Clause - # - # Copyright (c) 2017, Linaro Limited -diff --git a/scripts/ta_bin_to_c.py b/scripts/ta_bin_to_c.py -index 1496f816..a01e7f9b 100755 ---- a/scripts/ta_bin_to_c.py -+++ b/scripts/ta_bin_to_c.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # SPDX-License-Identifier: BSD-2-Clause - # - # Copyright (c) 2017, Linaro Limited -diff --git a/scripts/tee_bin_parser.py b/scripts/tee_bin_parser.py -index 8356ad5d..4409074b 100755 ---- a/scripts/tee_bin_parser.py -+++ b/scripts/tee_bin_parser.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # SPDX-License-Identifier: BSD-2-Clause - # - # Copyright (c) 2016, Linaro Limited diff --git a/recipes-security/optee/optee-os-qoriq_git.bb b/recipes-security/optee/optee-os-qoriq_3.8.0.bb index d7b28278..b8d764ff 100644 --- a/recipes-security/optee/optee-os-qoriq_git.bb +++ b/recipes-security/optee/optee-os-qoriq_3.8.0.bb @@ -2,24 +2,26 @@ SUMMARY = "OP-TEE Trusted OS" DESCRIPTION = "OPTEE OS" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173" -DEPENDS = "python3-pycrypto-native" +PV = "3.8+git${SRCPV}" + +DEPENDS += "python3-pyelftools-native python3-pycryptodome-native python3-pycryptodomex-native dtc-native" inherit deploy python3native -SRCREV = "4e8d2e5307b99a91a0cac3ea3560ecb7d62898d6" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/optee_os;nobranch=1 \ file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \ - file://0001-Fix-alignment-of-data-for-mempool_alloc_pool.patch \ - file://0001-use-python3-instead-of-python.patch \ - file://0001-optee-os-fix-gcc10-compilation-issue-and-missing-cc-.patch \ + file://0001-arm64-Disable-outline-atomics-when-compiling.patch \ " +SRCREV = "0cb01f7f6aee552ead49990c06f69f73f459cc65" + S = "${WORKDIR}/git" OPTEEMACHINE ?= "${MACHINE}" OPTEEMACHINE_ls1088ardb-pb = "ls1088ardb" OPTEEMACHINE_ls1046afrwy = "ls1046ardb" +OPTEEMACHINE_lx2162aqds = "lx2160aqds" EXTRA_OEMAKE = "PLATFORM=ls-${OPTEEMACHINE} CFG_ARM64_core=y \ ARCH=arm \ @@ -29,6 +31,7 @@ EXTRA_OEMAKE = "PLATFORM=ls-${OPTEEMACHINE} CFG_ARM64_core=y \ LDFLAGS= \ LIBGCC_LOCATE_CFLAGS=--sysroot=${STAGING_DIR_HOST} \ " +EXTRA_OEMAKE_append_lx2162aqds = " CFG_EMBED_DTB_SOURCE_FILE=fsl-lx2160a-qds.dts CFG_EMBED_DT=y" OPTEE_ARCH_armv7a = "arm32" OPTEE_ARCH_aarch64 = "arm64" diff --git a/recipes-security/optee/optee-test-qoriq/0001-fix-build-failure-with-GCC-9.patch b/recipes-security/optee/optee-test-qoriq/0001-fix-build-failure-with-GCC-9.patch deleted file mode 100644 index 9b912777..00000000 --- a/recipes-security/optee/optee-test-qoriq/0001-fix-build-failure-with-GCC-9.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 79330c8383e02e91a355964a3cc7b932d03c2517 Mon Sep 17 00:00:00 2001 -From: Chunrong Guo <chunrong.guo@nxp.com> -Date: Wed, 10 Jul 2019 11:09:01 +0200 -Subject: [PATCH] fix build failure with GCC 9 - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com> ---- - host/xtest/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/host/xtest/Makefile b/host/xtest/Makefile -index e4e2881..e86e056 100644 ---- a/host/xtest/Makefile -+++ b/host/xtest/Makefile -@@ -152,7 +152,7 @@ CFLAGS += -Wall -Wcast-align -Werror \ - -Wmissing-include-dirs -Wmissing-noreturn \ - -Wmissing-prototypes -Wnested-externs -Wpointer-arith \ - -Wshadow -Wstrict-prototypes -Wswitch-default \ -- -Wwrite-strings \ -+ -Wwrite-strings -Wno-format-overflow \ - -Wno-missing-field-initializers -Wno-format-zero-length - endif - --- -2.7.4 - diff --git a/recipes-security/optee/optee-test-qoriq/0001-use-python3-instead-of-python.patch b/recipes-security/optee/optee-test-qoriq/0001-use-python3-instead-of-python.patch deleted file mode 100644 index 20f190af..00000000 --- a/recipes-security/optee/optee-test-qoriq/0001-use-python3-instead-of-python.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6271160639002a2580d80b75b5397a96d56329f2 Mon Sep 17 00:00:00 2001 -From: Scott Branden <scott.branden@broadcom.com> -Date: Fri, 27 Dec 2019 12:54:28 -0800 -Subject: [PATCH] use python3 instead of python - -use python3 instead of python as python2 is EOL January 2020. - -Signed-off-by: Scott Branden <scott.branden@broadcom.com> -Reviewed-by: Jerome Forissier <jerome@forissier.org> -Tested-by: Jerome Forissier <jerome@forissier.org> (QEMU, CFG_GCM_NIST_VECTORS=y) -Upstream-Status: Backport from v3.8.0 ---- - scripts/file_to_c.py | 4 ++-- - scripts/rsp_to_gcm_test.py | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/file_to_c.py b/scripts/file_to_c.py -index ae16f52..b4ce2a2 100755 ---- a/scripts/file_to_c.py -+++ b/scripts/file_to_c.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # SPDX-License-Identifier: BSD-2-Clause - # - # Copyright (c) 2018, Linaro Limited -@@ -29,7 +29,7 @@ def main(): - - f.write("const uint8_t " + args.name + "[] = {\n") - i = 0 -- for x in array.array("B", inf.read()): -+ for x in array.array("B", map(ord, (inf.read()))): - f.write("0x" + '{0:02x}'.format(x) + ",") - i = i + 1 - if i % 8 == 0: -diff --git a/scripts/rsp_to_gcm_test.py b/scripts/rsp_to_gcm_test.py -index 0543541..e4418be 100755 ---- a/scripts/rsp_to_gcm_test.py -+++ b/scripts/rsp_to_gcm_test.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - modes = {'encrypt': 0, 'decrypt': 1} - --- -2.7.4 - diff --git a/recipes-security/optee/optee-test-qoriq_git.bb b/recipes-security/optee/optee-test-qoriq_3.8.0.bb index b66725c7..94cd00c2 100644 --- a/recipes-security/optee/optee-test-qoriq_git.bb +++ b/recipes-security/optee/optee-test-qoriq_3.8.0.bb @@ -1,20 +1,17 @@ SUMMARY = "OP-TEE sanity testsuite" -HOMEPAGE = "https://github.com/qoriq-open-source/optee_test" +HOMEPAGE = "https://github.com/OP-TEE/optee_test" LICENSE = "BSD & GPLv2" LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa" -DEPENDS = "optee-client-qoriq optee-os-qoriq python3-pycrypto-native" +DEPENDS = "optee-client-qoriq optee-os-qoriq python3-pycryptodome-native python3-pycryptodomex-native" inherit python3native -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/optee_test;nobranch=1 \ - file://0001-fix-build-failure-with-GCC-9.patch \ - file://0001-use-python3-instead-of-python.patch \ -" -S = "${WORKDIR}/git" +SRC_URI = "git://github.com/OP-TEE/optee_test;nobranch=1" +SRCREV = "30481e381cb4285706e7516853495a7699c93b2c" -SRCREV = "669058459e4a544be12f37dab103ee4c2b32e31d" +S = "${WORKDIR}/git" OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}" TEEC_EXPORT = "${STAGING_DIR_HOST}${prefix}" diff --git a/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch new file mode 100644 index 00000000..9e6a6137 --- /dev/null +++ b/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch @@ -0,0 +1,36 @@ +From 9b4959b97d2e95d4b49cf6ca2a3fce3cdb484f2d Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> +Date: Thu, 31 Mar 2016 00:20:15 +0200 +Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp + +Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> +Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> + +--- + 3rdparty/ippicv/ippicv.cmake | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake +index 257af6fcc6..f88460450f 100644 +--- a/3rdparty/ippicv/ippicv.cmake ++++ b/3rdparty/ippicv/ippicv.cmake +@@ -34,18 +34,5 @@ function(download_ippicv root_var) + endif() + + set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv") +- ocv_download(FILENAME ${OPENCV_ICV_NAME} +- HASH ${OPENCV_ICV_HASH} +- URL +- "${OPENCV_IPPICV_URL}" +- "$ENV{OPENCV_IPPICV_URL}" +- "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/" +- DESTINATION_DIR "${THE_ROOT}" +- ID IPPICV +- STATUS res +- UNPACK RELATIVE_URL) +- +- if(res) +- set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) +- endif() ++ set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) + endfunction() diff --git a/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch b/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch new file mode 100644 index 00000000..0aabee29 --- /dev/null +++ b/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch @@ -0,0 +1,179 @@ +From fca4d9eec289f22c081daa2c61a1110e3f268f92 Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Tue, 1 Sep 2020 14:57:07 -0500 +Subject: [PATCH] Add smaller version of download_models.py + +Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> +--- + testdata/dnn/download_models_basic.py | 159 ++++++++++++++++++++++++++ + 1 file changed, 159 insertions(+) + create mode 100644 testdata/dnn/download_models_basic.py + +diff --git a/testdata/dnn/download_models_basic.py b/testdata/dnn/download_models_basic.py +new file mode 100644 +index 0000000..5c8a616 +--- /dev/null ++++ b/testdata/dnn/download_models_basic.py +@@ -0,0 +1,159 @@ ++#!/usr/bin/env python ++ ++from __future__ import print_function ++import hashlib ++import sys ++import tarfile ++if sys.version_info[0] < 3: ++ from urllib2 import urlopen ++else: ++ from urllib.request import urlopen ++ ++ ++class Model: ++ MB = 1024*1024 ++ BUFSIZE = 10*MB ++ ++ def __init__(self, **kwargs): ++ self.name = kwargs.pop('name') ++ self.url = kwargs.pop('url', None) ++ self.filename = kwargs.pop('filename') ++ self.sha = kwargs.pop('sha', None) ++ self.archive = kwargs.pop('archive', None) ++ self.member = kwargs.pop('member', None) ++ ++ def __str__(self): ++ return 'Model <{}>'.format(self.name) ++ ++ def printRequest(self, r): ++ def getMB(r): ++ d = dict(r.info()) ++ for c in ['content-length', 'Content-Length']: ++ if c in d: ++ return int(d[c]) / self.MB ++ return '<unknown>' ++ print(' {} {} [{} Mb]'.format(r.getcode(), r.msg, getMB(r))) ++ ++ def verify(self): ++ if not self.sha: ++ return False ++ print(' expect {}'.format(self.sha)) ++ sha = hashlib.sha1() ++ try: ++ with open(self.filename, 'rb') as f: ++ while True: ++ buf = f.read(self.BUFSIZE) ++ if not buf: ++ break ++ sha.update(buf) ++ print(' actual {}'.format(sha.hexdigest())) ++ return self.sha == sha.hexdigest() ++ except Exception as e: ++ print(' catch {}'.format(e)) ++ ++ def get(self): ++ if self.verify(): ++ print(' hash match - skipping') ++ return True ++ ++ if self.archive or self.member: ++ assert(self.archive and self.member) ++ print(' hash check failed - extracting') ++ print(' get {}'.format(self.member)) ++ self.extract() ++ else: ++ assert(self.url) ++ print(' hash check failed - downloading') ++ print(' get {}'.format(self.url)) ++ self.download() ++ ++ print(' done') ++ print(' file {}'.format(self.filename)) ++ return self.verify() ++ ++ def download(self): ++ try: ++ r = urlopen(self.url, timeout=60) ++ self.printRequest(r) ++ self.save(r) ++ except Exception as e: ++ print(' catch {}'.format(e)) ++ ++ def extract(self): ++ try: ++ with tarfile.open(self.archive) as f: ++ assert self.member in f.getnames() ++ self.save(f.extractfile(self.member)) ++ except Exception as e: ++ print(' catch {}'.format(e)) ++ ++ def save(self, r): ++ with open(self.filename, 'wb') as f: ++ print(' progress ', end='') ++ sys.stdout.flush() ++ while True: ++ buf = r.read(self.BUFSIZE) ++ if not buf: ++ break ++ f.write(buf) ++ print('>', end='') ++ sys.stdout.flush() ++ ++models = [ ++ Model( ++ name='Fcn', ++ url='http://dl.caffe.berkeleyvision.org/fcn8s-heavy-pascal.caffemodel', ++ sha='c449ea74dd7d83751d1357d6a8c323fcf4038962', ++ filename='fcn8s-heavy-pascal.caffemodel'), ++ Model( ++ name='SqueezeNet_v1.1', ++ url='https://raw.githubusercontent.com/DeepScale/SqueezeNet/b5c3f1a23713c8b3fd7b801d229f6b04c64374a5/SqueezeNet_v1.1/squeezenet_v1.1.caffemodel', ++ sha='3397f026368a45ae236403ccc81cfcbe8ebe1bd0', ++ filename='squeezenet_v1.1.caffemodel'), ++ Model( ++ name='Colorization', ++ url='https://raw.githubusercontent.com/richzhang/colorization/master/models/colorization_deploy_v2.prototxt', ++ sha='f528334e386a69cbaaf237a7611d833bef8e5219', ++ filename='colorization_deploy_v2.prototxt'), ++ Model( ++ name='Colorization', ++ url='http://eecs.berkeley.edu/~rich.zhang/projects/2016_colorization/files/demo_v2/colorization_release_v2.caffemodel', ++ sha='21e61293a3fa6747308171c11b6dd18a68a26e7f', ++ filename='colorization_release_v2.caffemodel'), ++ Model( ++ name='OpenPose/pose/coco', # https://github.com/CMU-Perceptual-Computing-Lab/openpose ++ url='http://posefs1.perception.cs.cmu.edu/OpenPose/models/pose/coco/pose_iter_440000.caffemodel', ++ sha='ac7e97da66f3ab8169af2e601384c144e23a95c1', ++ filename='openpose_pose_coco.caffemodel'), ++ Model( ++ name='YOLOv3', # https://pjreddie.com/darknet/yolo/ ++ url='https://pjreddie.com/media/files/yolov3.weights', ++ sha='520878f12e97cf820529daea502acca380f1cb8e', ++ filename='yolov3.weights'), ++ Model( ++ name='EAST', # https://github.com/argman/EAST (a TensorFlow model), https://arxiv.org/abs/1704.03155v2 (a paper) ++ url='https://www.dropbox.com/s/r2ingd0l3zt8hxs/frozen_east_text_detection.tar.gz?dl=1', ++ sha='3ca8233d6edd748f7ed23246c8ca24cbf696bb94', ++ filename='frozen_east_text_detection.tar.gz'), ++ Model( ++ name='EAST', ++ archive='frozen_east_text_detection.tar.gz', ++ member='frozen_east_text_detection.pb', ++ sha='fffabf5ac36f37bddf68e34e84b45f5c4247ed06', ++ filename='frozen_east_text_detection.pb'), ++] ++ ++# Note: models will be downloaded to current working directory ++# expected working directory is opencv_extra/testdata/dnn ++if __name__ == '__main__': ++ failedModels = [] ++ for m in models: ++ print(m) ++ if not m.get(): ++ failedModels.append(m.filename) ++ ++ if failedModels: ++ print("Following models have not been downloaded:") ++ for f in failedModels: ++ print("* {}".format(f)) ++ exit(15) +-- +2.17.1 + diff --git a/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch b/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch new file mode 100644 index 00000000..948a80fa --- /dev/null +++ b/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch @@ -0,0 +1,28 @@ +From 66e50ee69fa9ee2469d349100e70d8b296c4b4dc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 11 Sep 2018 00:21:18 -0700 +Subject: [PATCH] Dont use isystem + +clang really does not like it + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + cmake/OpenCVPCHSupport.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake +index 08cd06def4..46c9c02da3 100644 +--- a/cmake/OpenCVPCHSupport.cmake ++++ b/cmake/OpenCVPCHSupport.cmake +@@ -18,6 +18,8 @@ IF(CV_GCC) + SET(PCHSupport_FOUND TRUE) + ENDIF() + ++ SET(CMAKE_INCLUDE_SYSTEM_FLAG_C "-I") ++ SET(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-I") + SET(_PCH_include_prefix "-I") + SET(_PCH_isystem_prefix "-isystem") + SET(_PCH_define_prefix "-D") diff --git a/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch new file mode 100644 index 00000000..d56b8ae6 --- /dev/null +++ b/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch @@ -0,0 +1,42 @@ +From 11bbf909e08594628bd757d989ae34cf1bfe200b Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 18 Jun 2020 05:51:38 +0000 +Subject: [PATCH] Make ts module external + +Make ts module external + +Reference: https://github.com/qbonnard/opencv/commit/6b229c5834cb9a0930425e762a6c7b03244d7abb + +Upstream-Status: Submitted [https://github.com/opencv/opencv/issues/8408] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + modules/ts/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt +index f95bed0793..66f315bcca 100644 +--- a/modules/ts/CMakeLists.txt ++++ b/modules/ts/CMakeLists.txt +@@ -4,9 +4,6 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) + ocv_module_disable(ts) + endif() + +-set(OPENCV_MODULE_TYPE STATIC) +-set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) +- + if(WINRT) + # WINRT doesn't have access to environment variables + # so adding corresponding macros during CMake run +@@ -16,7 +13,7 @@ endif() + + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) + +-ocv_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) ++ocv_add_module(ts opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) + + ocv_glob_module_sources() + ocv_module_include_directories() +-- +2.24.1 + diff --git a/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch new file mode 100644 index 00000000..1e47f8b1 --- /dev/null +++ b/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch @@ -0,0 +1,31 @@ +From e4ec6cea72da9e9ae5ba57140fa2f5c63f1f8295 Mon Sep 17 00:00:00 2001 +From: Jason Wessel <jason.wessel@windriver.com> +Date: Wed, 9 May 2018 13:33:59 -0700 +Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function + compile failure until next uprev + +Signed-off-by: Jason Wessel <jason.wessel@windriver.com> + +--- + modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp +index 6dca724a89..ae55dd4555 100644 +--- a/modules/videoio/src/cap_ffmpeg_impl.hpp ++++ b/modules/videoio/src/cap_ffmpeg_impl.hpp +@@ -774,6 +774,14 @@ struct ImplMutex::Impl + + #endif + ++/* NOTE This is deprecated in ffmpeg and the code should be removed */ ++#ifndef AVFMT_RAWPICTURE ++#define AVFMT_RAWPICTURE 0x0020 ++#endif /* AVFMT_RAWPICTURE */ ++#ifndef CODEC_FLAG_GLOBAL_HEADER ++#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++#endif ++ + void ImplMutex::init() + { + impl = new Impl(); diff --git a/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch b/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch new file mode 100644 index 00000000..c5a64387 --- /dev/null +++ b/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch @@ -0,0 +1,31 @@ +From 59fafe6e39759e193b5764b36b4c5a93da352123 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 18 Aug 2020 00:36:49 -0700 +Subject: [PATCH] Use -Os to compile tinyxml2.cpp + +This workarounds issue [1] seen on riscv with gcc + +[1] https://github.com/riscv/riscv-gnu-toolchain/issues/624 + +Upstream-Status: Inappropriate [ OE-Specific ] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + modules/datasets/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt +index 56ca9e310..99b7a33f6 100644 +--- a/modules/datasets/CMakeLists.txt ++++ b/modules/datasets/CMakeLists.txt +@@ -2,7 +2,7 @@ set(the_description "datasets framework") + + set(filter_srcs "${CMAKE_CURRENT_LIST_DIR}/src/tinyxml2/tinyxml2.cpp") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override") # GCC ++ ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override -Os") # GCC + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-inconsistent-missing-override") # Clang + endif() +-- +2.28.0 + diff --git a/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch new file mode 100644 index 00000000..bb47ef2b --- /dev/null +++ b/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch @@ -0,0 +1,70 @@ +From f42c9b8c7bafcadc7e95fb25a391707f970eb426 Mon Sep 17 00:00:00 2001 +From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> +Date: Fri, 19 May 2017 04:27:50 +0900 +Subject: [PATCH] To fix errors as following: + +"test_main.cpp:45: undefined reference to `parseCustomOptions(int, char**)'" +"perf_abs.cpp:13: undefined reference to `cvtest::param_seed'" +"test_superres.cpp:270: undefined reference to `checkIppStatus()'" + +Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> + +Also add the visibility changes for certain OpenCL-related functions in +ts module. + +Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> + +--- + modules/ts/include/opencv2/ts.hpp | 4 ++-- + modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +- + modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp +index ed7491a89a..80919d13ee 100644 +--- a/modules/ts/include/opencv2/ts.hpp ++++ b/modules/ts/include/opencv2/ts.hpp +@@ -728,7 +728,7 @@ protected: + } + }; + +-extern uint64 param_seed; ++CV_EXPORTS extern uint64 param_seed; + + struct DefaultRngAuto + { +@@ -791,7 +791,7 @@ private: + #endif + #endif + +-void parseCustomOptions(int argc, char **argv); ++CV_EXPORTS void parseCustomOptions(int argc, char **argv); + + #define CV_TEST_INIT0_NOOP (void)0 + +diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp +index 11572e9f48..438112e2aa 100644 +--- a/modules/ts/include/opencv2/ts/ocl_test.hpp ++++ b/modules/ts/include/opencv2/ts/ocl_test.hpp +@@ -82,7 +82,7 @@ inline UMat ToUMat(InputArray src) + return dst; + } + +-extern int test_loop_times; ++CV_EXPORTS extern int test_loop_times; + + #define MAX_VALUE 357 + +diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp +index b2a4cac241..b94c681c0c 100644 +--- a/modules/ts/include/opencv2/ts/ts_ext.hpp ++++ b/modules/ts/include/opencv2/ts/ts_ext.hpp +@@ -9,7 +9,7 @@ + #define OPENCV_TS_EXT_HPP + + namespace cvtest { +-void checkIppStatus(); ++CV_EXPORTS void checkIppStatus(); + extern bool skipUnstableTests; + extern bool runBigDataTests; + extern int testThreads; diff --git a/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch b/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch new file mode 100644 index 00000000..569d5b02 --- /dev/null +++ b/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch @@ -0,0 +1,148 @@ +From 3c4daafb54f961e376104a461ca7ec114ff0331a Mon Sep 17 00:00:00 2001 +From: Ludek Slosarcik <ludek.slosarcik@nxp.com> +Date: Fri, 14 Feb 2020 15:46:50 +0100 +Subject: [PATCH] opencv_dnn: added video device for 2 examples, and change text labels + +Signed-off-by: Ludek Slosarcik <ludek.slosarcik@nxp.com> + +Upstream-Status: Pending +--- + samples/cpp/logistic_regression.cpp | 2 +- + samples/dnn/classification.cpp | 7 ++++--- + samples/dnn/object_detection.cpp | 10 +++++----- + samples/dnn/segmentation.cpp | 2 +- + samples/dnn/text_detection.cpp | 5 +++-- + 5 files changed, 14 insertions(+), 12 deletions(-) + +Index: git/samples/cpp/logistic_regression.cpp +=================================================================== +--- git.orig/samples/cpp/logistic_regression.cpp ++++ git/samples/cpp/logistic_regression.cpp +@@ -83,7 +83,7 @@ static float calculateAccuracyPercent(co + + int main() + { +- const String filename = samples::findFile("data01.xml"); ++ const String filename = samples::findFile("../data/data01.xml"); + cout << "**********************************************************************" << endl; + cout << filename + << " contains digits 0 and 1 of 20 samples each, collected on an Android device" << endl; +Index: git/samples/dnn/classification.cpp +=================================================================== +--- git.orig/samples/dnn/classification.cpp ++++ git/samples/dnn/classification.cpp +@@ -11,6 +11,7 @@ std::string keys = + "{ help h | | Print help message. }" + "{ @alias | | An alias name of model to extract preprocessing parameters from models.yml file. }" + "{ zoo | models.yml | An optional path to file with preprocessing parameters }" ++ "{ device | 0 | camera device number. }" + "{ input i | | Path to input image or video file. Skip this argument to capture frames from a camera.}" + "{ framework f | | Optional name of an origin framework of the model. Detect it automatically if it does not set. }" + "{ classes | | Optional path to a text file with names of classes. }" +@@ -94,7 +95,7 @@ int main(int argc, char** argv) + if (parser.has("input")) + cap.open(parser.get<String>("input")); + else +- cap.open(0); ++ cap.open(parser.get<int>("device")); + //! [Open a video file or an image file or a camera stream] + + // Process frames. +@@ -131,13 +132,13 @@ int main(int argc, char** argv) + double freq = getTickFrequency() / 1000; + double t = net.getPerfProfile(layersTimes) / freq; + std::string label = format("Inference time: %.2f ms", t); +- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + // Print predicted class. + label = format("%s: %.4f", (classes.empty() ? format("Class #%d", classId).c_str() : + classes[classId].c_str()), + confidence); +- putText(frame, label, Point(0, 40), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + imshow(kWinName, frame); + } +Index: git/samples/dnn/object_detection.cpp +=================================================================== +--- git.orig/samples/dnn/object_detection.cpp ++++ git/samples/dnn/object_detection.cpp +@@ -251,13 +251,13 @@ int main(int argc, char** argv) + if (predictionsQueue.counter > 1) + { + std::string label = format("Camera: %.2f FPS", framesQueue.getFPS()); +- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + label = format("Network: %.2f FPS", predictionsQueue.getFPS()); +- putText(frame, label, Point(0, 30), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + label = format("Skipped frames: %d", framesQueue.counter - predictionsQueue.counter); +- putText(frame, label, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 70), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + } + imshow(kWinName, frame); + } +@@ -293,7 +293,7 @@ int main(int argc, char** argv) + double freq = getTickFrequency() / 1000; + double t = net.getPerfProfile(layersTimes) / freq; + std::string label = format("Inference time: %.2f ms", t); +- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + imshow(kWinName, frame); + } +@@ -462,7 +462,7 @@ void drawPred(int classId, float conf, i + top = max(top, labelSize.height); + rectangle(frame, Point(left, top - labelSize.height), + Point(left + labelSize.width, top + baseLine), Scalar::all(255), FILLED); +- putText(frame, label, Point(left, top), FONT_HERSHEY_SIMPLEX, 0.5, Scalar()); ++ putText(frame, label, Point(left, top), FONT_HERSHEY_SIMPLEX, 0.8, Scalar()); + } + + void callback(int pos, void*) +Index: git/samples/dnn/segmentation.cpp +=================================================================== +--- git.orig/samples/dnn/segmentation.cpp ++++ git/samples/dnn/segmentation.cpp +@@ -157,7 +157,7 @@ int main(int argc, char** argv) + double freq = getTickFrequency() / 1000; + double t = net.getPerfProfile(layersTimes) / freq; + std::string label = format("Inference time: %.2f ms", t); +- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + imshow(kWinName, frame); + if (!classes.empty()) +Index: git/samples/dnn/text_detection.cpp +=================================================================== +--- git.orig/samples/dnn/text_detection.cpp ++++ git/samples/dnn/text_detection.cpp +@@ -25,6 +25,7 @@ using namespace cv::dnn; + const char* keys = + "{ help h | | Print help message. }" + "{ input i | | Path to input image or video file. Skip this argument to capture frames from a camera.}" ++ "{ device | 0 | camera device number. }" + "{ model m | | Path to a binary .pb file contains trained detector network.}" + "{ ocr | | Path to a binary .pb or .onnx file contains trained recognition network.}" + "{ width | 320 | Preprocess input image by resizing to a specific width. It should be multiple by 32. }" +@@ -75,7 +76,7 @@ int main(int argc, char** argv) + + // Open a video file or an image file or a camera stream. + VideoCapture cap; +- bool openSuccess = parser.has("input") ? cap.open(parser.get<String>("input")) : cap.open(0); ++ bool openSuccess = parser.has("input") ? cap.open(parser.get<String>("input")) : cap.open(parser.get<int>("device")); + CV_Assert(openSuccess); + + static const std::string kWinName = "EAST: An Efficient and Accurate Scene Text Detector"; +@@ -156,7 +157,7 @@ int main(int argc, char** argv) + + // Put efficiency information. + std::string label = format("Inference time: %.2f ms", tickMeter.getTimeMilli()); +- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + imshow(kWinName, frame); + diff --git a/recipes-support/opencv/opencv/download.patch b/recipes-support/opencv/opencv/download.patch new file mode 100644 index 00000000..33ac4831 --- /dev/null +++ b/recipes-support/opencv/opencv/download.patch @@ -0,0 +1,41 @@ +From b18a280fab06a680d9f831bf8b462647f3cb6214 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 9 Jan 2020 16:24:24 +0000 +Subject: [PATCH] opencv: abort configure if we need to download + +This CMake module will download files during do_configure. This is bad as it +means we can't do offline builds. + +Add an option to disallow downloads by emitting a fatal error. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +--- + cmake/OpenCVDownload.cmake | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake +index 63cf6d3238..4acf477f70 100644 +--- a/cmake/OpenCVDownload.cmake ++++ b/cmake/OpenCVDownload.cmake +@@ -14,6 +14,7 @@ + # RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will be appended to it + # Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is <opencv>/.cache + ++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads") + set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files") + if(DEFINED ENV{OPENCV_DOWNLOAD_PATH}) + set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH "${HELP_OPENCV_DOWNLOAD_PATH}") +@@ -156,6 +157,11 @@ function(ocv_download) + + # Download + if(NOT EXISTS "${CACHE_CANDIDATE}") ++ if(NOT OPENCV_ALLOW_DOWNLOADS) ++ message(FATAL_ERROR "Not going to download ${DL_FILENAME}") ++ return() ++ endif() ++ + ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"") + foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST}) + ocv_download_log("#try ${try}") diff --git a/recipes-support/opencv/opencv_4.4.0.imx.bb b/recipes-support/opencv/opencv_4.4.0.imx.bb new file mode 100644 index 00000000..f50cca8a --- /dev/null +++ b/recipes-support/opencv/opencv_4.4.0.imx.bb @@ -0,0 +1,295 @@ +# This recipe is for the i.MX fork of opencv. For ease of +# maintenance, the top section is a verbatim copy of an OE-core +# recipe. The second section customizes the recipe for i.MX. + +########## meta-openembedded copy ########### + +SUMMARY = "Opencv : The Open Computer Vision Library" +HOMEPAGE = "http://opencv.org/" +SECTION = "libs" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" + +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + +DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" + +SRCREV_opencv = "c3bb57afeaf030f10939204d48d7c2a3842f4293" +SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" +SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" +SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" +SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" +SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" + +def ipp_filename(d): + import re + arch = d.getVar('TARGET_ARCH') + if re.match("i.86$", arch): + return "ippicv_2020_lnx_ia32_20191018_general.tgz" + else: + return "ippicv_2020_lnx_intel64_20191018_general.tgz" + +def ipp_md5sum(d): + import re + arch = d.getVar('TARGET_ARCH') + if re.match("i.86$", arch): + return "ad189a940fb60eb71f291321322fe3e8" + else: + return "7421de0095c7a39162ae13a6098782f9" + +IPP_FILENAME = "${@ipp_filename(d)}" +IPP_MD5 = "${@ipp_md5sum(d)}" + +SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ + git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ + file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ + file://0003-To-fix-errors-as-following.patch \ + file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ + file://0001-Dont-use-isystem.patch \ + file://download.patch \ + file://0001-Make-ts-module-external.patch \ + " +SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" + +S = "${WORKDIR}/git" + +# OpenCV wants to download more files during configure. We download these in +# do_fetch and construct a source cache in the format it expects +OPENCV_DLDIR = "${WORKDIR}/downloads" + +do_unpack_extra() { + tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} + + md5() { + # Return the MD5 of $1 + echo $(md5sum $1 | cut -d' ' -f1) + } + cache() { + TAG=$1 + shift + mkdir --parents ${OPENCV_DLDIR}/$TAG + for F in $*; do + DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F) + test -e $DEST || ln -s $F $DEST + done + } + cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i + cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i + cache data ${WORKDIR}/face/*.dat +} +addtask unpack_extra after do_unpack before do_patch + +CMAKE_VERBOSE = "VERBOSE=1" + +EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ + -DWITH_1394=OFF \ + -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DOPENCV_ICV_HASH=${IPP_MD5} \ + -DIPPROOT=${WORKDIR}/ippicv_lnx \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ + -DOPENCV_ALLOW_DOWNLOADS=OFF \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ +" +EXTRA_OECMAKE_append_x86 = " -DX86=ON" + +PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" + +PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" +PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," +PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," +PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," +PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," +PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," +PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," +PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," +PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," +PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," +PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," +PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," +PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," +PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," +PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," +PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," +PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," +PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," +PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," +PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," +PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," + +inherit pkgconfig cmake + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} + +export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" +export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" +export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" +export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" +export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" + +TARGET_CC_ARCH += "-I${S}/include " + +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ + ${PN}-apps" + +python populate_packages_prepend () { + cv_libdir = d.expand('${libdir}') + do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) + + pn = d.getVar('PN') + metapkg = pn + '-dev' + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + blacklist = [ metapkg ] + metapkg_rdepends = [ ] + packages = d.getVar('PACKAGES').split() + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): + metapkg_rdepends.append(pkg) + d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) + + metapkg = pn + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + blacklist = [ metapkg, "libopencv-ts" ] + metapkg_rdepends = [ ] + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): + metapkg_rdepends.append(pkg) + d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) +} + +PACKAGES_DYNAMIC += "^libopencv-.*" + +FILES_${PN} = "" +FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" +FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" +FILES_${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" +FILES_${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" +FILES_${PN}-java = "${datadir}/OpenCV/java" +FILES_${PN}-samples = "${datadir}/opencv4/samples/" + +INSANE_SKIP_${PN}-java = "libdir" +INSANE_SKIP_${PN}-dbg = "libdir" + +ALLOW_EMPTY_${PN} = "1" + +SUMMARY_python-opencv = "Python bindings to opencv" +FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS_python-opencv = "python-core python-numpy" + +SUMMARY_python3-opencv = "Python bindings to opencv" +FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS_python3-opencv = "python3-core python3-numpy" + +RDEPENDS_${PN}-apps = "bash" + +do_compile_prepend() { + # remove the build host info to improve reproducibility + if [ -f ${WORKDIR}/build/modules/core/version_string.inc ]; then + sed -i "s#${WORKDIR}#/workdir#g" ${WORKDIR}/build/modules/core/version_string.inc + fi +} + +do_install_append() { + # Move Python files into correct library folder (for multilib build) + if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then + mv ${D}/usr/lib/* ${D}/${libdir}/ + rm -rf ${D}/usr/lib + fi +} + +TOOLCHAIN = "gcc" + +########## End of meta-openembedded copy ########## + +########## i.MX overrides ########## + +SUMMARY = "Opencv : The Open Computer Vision Library, i.MX Fork" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" + +SRCREV_opencv = "e39e6eded2d365a5dc370e1a72717e132166cf07" +SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" +SRCREV_extra = "65796edadce27ed013e3deeedb3c081ff527e4ec" +SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59" +SRC_URI[tinydnn.sha256sum] = "e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b" +SRCREV_FORMAT_append = "_extra" + +OPENCV_SRC ?= "git://source.codeaurora.org/external/imx/opencv-imx.git;protocol=https" +SRCBRANCH = "4.4.0_imx" +SRC_URI = "${OPENCV_SRC};branch=${SRCBRANCH};name=opencv \ + git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra \ + git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ + https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz;destsuffix=git/3rdparty/tinydnn/tiny-dnn-1.0.0a3;name=tinydnn;unpack=false \ + file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ + file://0003-To-fix-errors-as-following.patch \ + file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ + file://0001-Dont-use-isystem.patch \ + file://download.patch \ + file://0001-Make-ts-module-external.patch \ + file://OpenCV_DNN_examples.patch \ + file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=../extra \ + " +PV = "4.4.0.imx" + +PACKAGECONFIG_remove = "eigen" +PACKAGECONFIG_append_mx8 = " dnn text" +PACKAGECONFIG_OPENCL = "" +PACKAGECONFIG_OPENCL_mx8 = "opencl" +PACKAGECONFIG_OPENCL_mx8dxl = "" +PACKAGECONFIG_OPENCL_mx8phantomdxl = "" +PACKAGECONFIG_OPENCL_mx8mm = "" +PACKAGECONFIG_OPENCL_mx8mnlite = "" +PACKAGECONFIG_append = " ${PACKAGECONFIG_OPENCL}" + +PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx," +PACKAGECONFIG[qt5] = "-DWITH_QT=ON -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} -DCMAKE_PREFIX_PATH=${STAGING_BINDIR_NATIVE}/cmake,-DWITH_QT=OFF,qtbase qtbase-native," +PACKAGECONFIG[test] = "-DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${S}/../extra/testdata, -DBUILD_TESTS=OFF -DINSTALL_TESTS=OFF," + +do_unpack_extra_append() { + mkdir -p ${S}/3rdparty/tinydnn/ + tar xzf ${WORKDIR}/v1.0.0a3.tar.gz -C ${S}/3rdparty/tinydnn/ +} + +do_install_append() { + ln -sf opencv4/opencv2 ${D}${includedir}/opencv2 + install -d ${D}${datadir}/OpenCV/samples/data + cp -r ${S}/samples/data/* ${D}${datadir}/OpenCV/samples/data + install -d ${D}${datadir}/OpenCV/samples/bin/ + cp -f bin/example_* ${D}${datadir}/OpenCV/samples/bin/ + if ${@bb.utils.contains('PACKAGECONFIG', 'test', 'true', 'false', d)}; then + cp -r share/opencv4/testdata/cv/face/* ${D}${datadir}/opencv4/testdata/cv/face/ + fi +} + +FILES_${PN}-samples += "${datadir}/OpenCV/samples" + +COMPATIBLE_MACHINE = "(mx8)" + +########## End of i.MX overrides ########## |