Merge remote-tracking branch 'origin/walnascar-6.12.49-2.2.0' into walnascar

Author: neenareddi

.sourcegraph/ignore

@@ -0,0 +1,10 @@
+# Vim temporary files
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+
+*.orig
+*.rej
+*~
+
+# Source Code files with incompatible licenses
+*.patch

README.md

@@ -59,7 +59,7 @@ Follow the instructions here: https://docs.yoctoproject.org/5.2.2/singleindex.ht
 
 Use the i.MX Linux BSP manifest repository to create the Yocto Project layers.
 ```
-$: repo init -u https://github.com/nxp-imx/imx-manifest.git -b imx-linux-walnascar -m imx-6.12.34-2.1.0.xml
+$: repo init -u https://github.com/nxp-imx/imx-manifest.git -b imx-linux-walnascar -m imx-6.12.49-2.2.0.xml
 $: repo sync
 ```
 

SBOM-NXP.spdx.json

@@ -10,11 +10,11 @@ BBFILE_PATTERN_fsl-bsp-release := "^${LAYERDIR}/"
 BBFILE_PRIORITY_fsl-bsp-release = "8"
 LAYERSERIES_COMPAT_fsl-bsp-release = "mickledore nanbield scarthgap styhead walnascar"
 
+LAYERDEPENDS_fsl-bsp-release = "freescale-layer"
+
 # Create a mirror for unreliable packages
 MIRRORS += "http://sourceforge.net/.* http://www.nxp.com/lgfiles/updates/other"
 
-BBMASK += "meta-freescale-3rdparty/recipes-bsp/u-boot/u-boot-imx_%.bbappend"
-
 # Define new EULAs and add them to the list defined in meta-freescale.
 # See fsl-eula-unpack.bbclass.
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V60 = "cf2070b16b9d4acf60a98e8cbc32a25a"
@@ -281,10 +281,6 @@ IMAGE_BOOT_FILES:remove:imx8mp-ddr4-evk = " \
     mcore-demos/imx8mp_m7_TCM_low_power_wakeword.bin \
 "
 
-IMAGE_BOOT_FILES:remove:imx8mp-lpddr4-ndm = " \
-    mcore-demos/imx8mp_m7_TCM_low_power_wakeword.bin \
-"
-
 # Overrides for imx8mq-evk.conf
 IMAGE_BOOT_FILES:append:imx8mqevk = " \
     mcore-demos/imx8mq_m4_DDR_hello_world.bin \
@@ -361,6 +357,9 @@ KERNEL_DEVICETREE:append:imx93-11x11-lpddr4x-evk = " \
 KERNEL_DEVICETREE:remove:imx93-11x11-lpddr4x-evk = " \
     freescale/imx93-11x11-evk-rpmsg-lpv.dtb \
 "
+IMAGE_BOOT_FILES:remove:imx93-11x11-lpddr4x-evk = " \
+    mcore-demos/imx93-11x11-evk_m33_TCM_low_power_wakeword.bin \
+"
 MACHINE_FEATURES:append:imx93-11x11-lpddr4x-evk = " rvgpu-emu"
 
 # Overrides for imx93-14x14-lpddr4x-evk.conf
@@ -373,4 +372,16 @@ MACHINE_FEATURES:append:imx93-14x14-lpddr4x-evk = " rvgpu-emu"
 KERNEL_DEVICETREE:remove:imx93-9x9-lpddr4-qsb = " \
     freescale/imx93-9x9-qsb-rpmsg-lpv.dtb \
 "
+IMAGE_BOOT_FILES:remove:imx93-9x9-lpddr4-qsb = " \
+    mcore-demos/imx93-9x9-qsb_m33_TCM_low_power_wakeword.bin \
+"
 MACHINE_FEATURES:append:imx93-9x9-lpddr4-qsb = " rvgpu-emu"
+
+BBFILES_DYNAMIC += " \
+    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bbappend \
+    meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/*/*/*.bb \
+    meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/*/*/*.bbappend \
+    meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bbappend \
+    multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \
+    parsec-layer:${LAYERDIR}/dynamic-layers/parsec-layer/*/*/*.bbappend \
+"

SCR-6.12.34-2.1.0.txt SCR-6.12.49-2.2.0.txtSCR-6.12.34-2.1.0.txt renamed to SCR-6.12.49-2.2.0.txt

@@ -70,7 +70,6 @@ IMAGE_BOOT_FILES:append = " \
     mcore-demos/imx93-14x14-evk_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx93-14x14-evk_m33_TCM_rpmsg_lite_str_echo_rtos.bin \
     mcore-demos/imx93-9x9-qsb_m33_TCM_power_mode_switch.bin \
-    mcore-demos/imx93-9x9-qsb_m33_TCM_low_power_wakeword.bin \
     mcore-demos/imx93-9x9-qsb_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
     mcore-demos/imx93-9x9-qsb_m33_TCM_rpmsg_lite_str_echo_rtos.bin \
     mcore-demos/imx93-9x9-qsb_m33_TCM_sai_low_power_audio.bin \

meta-imx-bsp/conf/layer.conf

@@ -12,12 +12,12 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 UBOOT_CONFIG_BASENAME = "imx943_evk"
 
 OEI_BOARD  ?= "mx943lp4-15"
-
 DDR_TYPE   = "lpddr4x"
-
 DDR_FIRMWARE_NAME = " \
     lpddr4x_dmem_v202409.bin \
     lpddr4x_dmem_qb_v202409.bin \
     lpddr4x_imem_v202409.bin \
     lpddr4x_imem_qb_v202409.bin \
 "
+OEI_DDR_CONFIG     = "MIMX943_LPDDR4_EVK_15X15_3733MTS_FW2024.09_timing"
+OEI_DDR_CONFIG_ECC = "MIMX943_LPDDR4_EVK_15X15_3733MTS_FW2024.09_ECC_enabled_timing"

meta-imx-bsp/conf/machine/imx93evk.conf

@@ -12,12 +12,12 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 UBOOT_CONFIG_BASENAME = "imx943_evk"
 
 OEI_BOARD  ?= "mx943lp4-19"
-
 DDR_TYPE   = "lpddr4x"
-
 DDR_FIRMWARE_NAME = " \
     lpddr4x_dmem_v202409.bin \
     lpddr4x_dmem_qb_v202409.bin \
     lpddr4x_imem_v202409.bin \
     lpddr4x_imem_qb_v202409.bin \
 "
+OEI_DDR_CONFIG     = "MIMX943_LPDDR4_EVK_19X19_4266MTS_FW2024.09_timing"
+OEI_DDR_CONFIG_ECC = "MIMX943_LPDDR4_EVK_19X19_4266MTS_FW2024.09_ECC_enabled_timing"

meta-imx-bsp/conf/machine/imx943-15x15-lpddr4-evk.conf

@@ -12,12 +12,12 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 UBOOT_CONFIG_BASENAME = "imx943_evk"
 
 OEI_BOARD  ?= "mx943lp5-19"
-
 DDR_TYPE   = "lpddr5"
-
 DDR_FIRMWARE_NAME = " \
     lpddr5_dmem_v202409.bin \
     lpddr5_dmem_qb_v202409.bin \
     lpddr5_imem_v202409.bin \
     lpddr5_imem_qb_v202409.bin \
 "
+OEI_DDR_CONFIG     = "MIMX943_LPDDR5_EVK_19X19_4266MTS_FW2024.09_timing"
+OEI_DDR_CONFIG_ECC = "MIMX943_LPDDR5_EVK_19X19_4266MTS_FW2024.09_ECC_enabled_timing"

meta-imx-bsp/conf/machine/imx943-19x19-lpddr4-evk.conf

@@ -78,13 +78,14 @@ IMXBOOT_TARGETS_BASENAME = "flash"
 
 OEI_BOARD  = "mx95lp4x-15"
 DDR_TYPE   = "lpddr4x"
-
 DDR_FIRMWARE_NAME = " \
     lpddr4x_dmem_v202409.bin \
     lpddr4x_dmem_qb_v202409.bin \
     lpddr4x_imem_v202409.bin \
     lpddr4x_imem_qb_v202409.bin \
 "
+OEI_DDR_CONFIG     = "MIMX95_LPDDR4X_EVK_15X15_4000MTS_FW2024.09_timing"
+OEI_DDR_CONFIG_ECC = "MIMX95_LPDDR4X_EVK_15X15_4000MTS_FW2024.09_ECC_enabled_timing"
 
 M4_DEFAULT_IMAGE_MX95 = "imx95-15x15-evk_m7_TCM_power_mode_switch.bin"