zephyr-bsp/mimx8mq_evk_cm4: add support

ci/mimx8mq_evk_cm4.yml

@@ -0,0 +1,11 @@
+header:
+  version: 9
+  includes:
+    - ci/base.yml
+
+machine: mimx8mq_evk_cm4
+
+target:
+  - zephyr-helloworld
+  - zephyr-openamp-remote
+

meta-zephyr-bsp/conf/machine/include/mimx8mq-cortex-m4.inc

@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: mimx8mq-cortex-m4
+
+#@DESCRIPTION: Machine configuration for Cortex-M4 core of NXP MIMX8MQ SoC.
+
+require conf/machine/include/arm/armv7m/tune-cortexm4.inc
+
+TUNE_FEATURES = "armv7em cortexm4"

meta-zephyr-bsp/conf/machine/mimx8mq_evk_cm4.conf

@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: mimx8mq_evk_cm4
+
+#@DESCRIPTION: Machine configuration for mimx8mq_evk_cm4 Board.
+
+require conf/machine/include/mimx8mq-cortex-m4.inc
+
+ARCH:mimx8mq_evk_cm4 = "arm"

meta-zephyr-core/recipes-devtools/zephyr-sdk/zephyr-sdk_0.15.2.bb → meta-zephyr-core/recipes-devtools/zephyr-sdk/zephyr-sdk_0.16.1.bb

@@ -10,12 +10,12 @@ INHIBIT_DEFAULT_DEPS = "1"
 # CMake is required by the setup script
 DEPENDS += "cmake"
 
-SDK_ARCHIVE = "zephyr-sdk-${PV}_linux-${BUILD_ARCH}.tar.gz"
+SDK_ARCHIVE = "zephyr-sdk-${PV}_linux-${BUILD_ARCH}.tar.xz"
 SDK_NAME = "${BUILD_ARCH}"
 SRC_URI = "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${PV}/${SDK_ARCHIVE};subdir=${S};name=${SDK_NAME}"
 
-SRC_URI[x86_64.sha256sum] = "8e3572fbca9f9ba18a4436c00d680af34a85e239f7fe66c7988da85571a0d23d"
-SRC_URI[aarch64.sha256sum] = "0d36e40a81a3aa1b64d65c4c5c6cd381555a33ef1684b7ba98236fa486f176a4"
+SRC_URI[x86_64.sha256sum] = "51338d51aa4cea2516641ce0d9dc0b51b763779f00dc4564a2bc0dd713df22c7"
+SRC_URI[aarch64.sha256sum] = "062bb2b5c47ca56dd29b7f92dd7f07a5ce22ba513759d2b6960bc658531eb00c"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"

meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-3.3-x86-fix-efi-binary-generation-issue-in-cross-compila.patch → meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-3.4-x86-fix-efi-binary-generation-issue-in-cross-compila.patch

@@ -1,6 +1,6 @@
-From 60b4dc4214ee645833eff109ff04d4849219fd4e Mon Sep 17 00:00:00 2001
+From f314ca637eb2eb5ed1cda7320ab2448d6487aed8 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <[email protected]>
-Date: Thu, 28 Jul 2022 14:15:11 +0800
+Date: Thu, 22 Jun 2023 16:21:50 +0800
 Subject: [PATCH] x86: fix efi binary generation issue in cross compilation env
 
 Set root directory for headers.
@@ -41,53 +41,53 @@ index 99c188ecd0..1cd86a21cd 100755
      return parser.parse_args()
 
 diff --git a/boards/x86/ehl_crb/CMakeLists.txt b/boards/x86/ehl_crb/CMakeLists.txt
-index cdf8c9e097..6ea94b54e1 100644
+index 06bbb2dce1..60aa1496e8 100644
 --- a/boards/x86/ehl_crb/CMakeLists.txt
 +++ b/boards/x86/ehl_crb/CMakeLists.txt
-@@ -7,6 +7,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+@@ -6,6 +6,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+   -o ${CMAKE_OBJCOPY}
    -i ${ZEPHYR_BASE}/include
-      $<$<BOOL:${CONFIG_LEGACY_INCLUDE_PATH}>:${ZEPHYR_BASE}/include/zephyr>
    -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
 +  -s ${SYSROOT_DIR}
    $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
  )
 diff --git a/boards/x86/qemu_x86/CMakeLists.txt b/boards/x86/qemu_x86/CMakeLists.txt
-index 8d227f8b26..a5d6480bc3 100644
+index de31c25a82..2910fa0192 100644
 --- a/boards/x86/qemu_x86/CMakeLists.txt
 +++ b/boards/x86/qemu_x86/CMakeLists.txt
-@@ -6,6 +6,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-      $<$<BOOL:${CONFIG_LEGACY_INCLUDE_PATH}>:${ZEPHYR_BASE}/include/zephyr>
+@@ -5,6 +5,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+   -i ${ZEPHYR_BASE}/include
    -o ${CMAKE_OBJCOPY}
    -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
 +  -s ${SYSROOT_DIR}
    $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
  )
 diff --git a/boards/x86/rpl_crb/CMakeLists.txt b/boards/x86/rpl_crb/CMakeLists.txt
-index 8bd6e36099..7316f23759 100644
+index 7db36d8d7c..700f51bf01 100644
 --- a/boards/x86/rpl_crb/CMakeLists.txt
 +++ b/boards/x86/rpl_crb/CMakeLists.txt
-@@ -7,6 +7,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+@@ -6,6 +6,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+   -o ${CMAKE_OBJCOPY}
    -i ${ZEPHYR_BASE}/include
-      $<$<BOOL:${CONFIG_LEGACY_INCLUDE_PATH}>:${ZEPHYR_BASE}/include/zephyr>
    -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
 +  -s ${SYSROOT_DIR}
    $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
  )
 diff --git a/boards/x86/up_squared/CMakeLists.txt b/boards/x86/up_squared/CMakeLists.txt
-index b867282d60..43cd081b21 100644
+index 57eef4eabe..ad90969fa9 100644
 --- a/boards/x86/up_squared/CMakeLists.txt
 +++ b/boards/x86/up_squared/CMakeLists.txt
-@@ -7,6 +7,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+@@ -6,6 +6,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+   -o ${CMAKE_OBJCOPY}
    -i ${ZEPHYR_BASE}/include
-      $<$<BOOL:${CONFIG_LEGACY_INCLUDE_PATH}>:${ZEPHYR_BASE}/include/zephyr>
    -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
 +  -s ${SYSROOT_DIR}
    $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
  )
 -- 
-2.25.1
+2.34.1
 

meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.3.0.inc → meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.4.0.inc

@@ -2,63 +2,87 @@
 
 SRCREV_FORMAT = "default"
 
-SRCREV_default = "07c6af3b8c35c1e49186578ca61a25c76e2fb308"
+SRCREV_default = "356c8cbe63ae01b3ab438382639d25bb418a0213"
+SRCREV_bsim = "908ffde6298a937c6549dbfa843a62caab26bfc5"
+SRCREV_babblesim_base = "02838ca04c4562e68dc876196828d8121679e537"
+SRCREV_babblesim_ext_2G4_libPhyComv1 = "9018113a362fa6c9e8f4b9cab9e5a8f12cc46b94"
+SRCREV_babblesim_ext_2G4_phy_v1 = "cf2d86e736efac4f12fad5093ed2da2c5b406156"
+SRCREV_babblesim_ext_2G4_channel_NtNcable = "20a38c997f507b0aa53817aab3d73a462fff7af1"
+SRCREV_babblesim_ext_2G4_channel_multiatt = "e09bc2d14b1975f969ad19c6ed23eb20e5dc3d09"
+SRCREV_babblesim_ext_2G4_modem_magic = "cb70771794f0bf6f262aa474848611c68ae8f1ed"
+SRCREV_babblesim_ext_2G4_modem_BLE_simple = "ce975a3259fd0dd761d371b60435242d54794bad"
+SRCREV_babblesim_ext_2G4_device_burst_interferer = "5b5339351d6e6a2368c686c734dc8b2fc65698fc"
+SRCREV_babblesim_ext_2G4_device_WLAN_actmod = "9cb6d8e72695f6b785e57443f0629a18069d6ce4"
+SRCREV_babblesim_ext_2G4_device_playback = "85c645929cf1ce995d8537107d9dcbd12ed64036"
+SRCREV_babblesim_ext_libCryptov1 = "eed6d7038e839153e340bd333bc43541cb90ba64"
 SRCREV_canopennode = "dec12fa3f0d790cafa8414a4c2930ea71ab72ffd"
 SRCREV_chre = "b7955c27e50485b7dafdc3888d7d6afdc2ac6d96"
 SRCREV_cmsis = "74981bf893e8b10931464b9945e2143d99a3f0a3"
-SRCREV_edtt = "000fb87261beaf33f80a8868e73857bd62edc668"
+SRCREV_edtt = "64e5105ad82390164fb73fc654be3f73a608209a"
 SRCREV_fatfs = "427159bf95ea49b7680facffaa29ad506b42709b"
 SRCREV_hal_altera = "0d225ddd314379b32355a00fb669eacf911e750d"
-SRCREV_hal_atmel = "d45adfb6897aba323cac29cdda8070ce4f23f014"
-SRCREV_hal_espressif = "73e7af1e2ed64571ce49ff9f07dc02690b9f2df5"
+SRCREV_hal_atmel = "5ab43007eda3f380c125f957f03638d2e8d1144d"
+SRCREV_hal_espressif = "abe299333411cb37a1cb1dd0aa2ea35c27382604"
 SRCREV_hal_ethos_u = "90ada2ea5681b2a2722a10d2898eac34c2510791"
 SRCREV_hal_gigadevice = "2994b7dde8b0b0fa9b9c0ccb13474b6a486cddc3"
-SRCREV_hal_infineon = "5b0c7700a7be049e02835dfa0950d378aac39e67"
+SRCREV_hal_infineon = "0bebc14d8bd1a249ee7fbc70b37db6f01f72544f"
 SRCREV_hal_microchip = "5d079f1683a00b801373bbbbf5d181d4e33b30d5"
-SRCREV_hal_nordic = "3f7ae2320b6d348898c7b11e956a6e792d0b3724"
+SRCREV_hal_nordic = "a1c3e0fbaafda091139b8744becd4853ada2f747"
 SRCREV_hal_nuvoton = "0a1f153c433f5f637a4490651bdda6d966de3b99"
-SRCREV_hal_nxp = "d957472002a3758154f402e982d95ce90cf58e12"
-SRCREV_hal_openisa = "40d049f69c50b58ea20473bee14cf93f518bf262"
+SRCREV_hal_nxp = "904830e8f684a9fd573751a1cdecde877ec49242"
+SRCREV_hal_openisa = "d1e61c0c654d8ca9e73d27fca3a7eb3b7881cb6a"
 SRCREV_hal_quicklogic = "b3a66fe6d04d87fd1533a5c8de51d0599fcd08d0"
-SRCREV_hal_renesas = "468d3f2146d18c7f86a4640fc641cc1d20a4a100"
-SRCREV_hal_rpi_pico = "a094c060e0c2d43c7f9d8f5c06cc0665117e0c18"
-SRCREV_hal_silabs = "9dcaa761258cfdfecaacc5a9f0af92f6535d74a3"
-SRCREV_hal_st = "cccbc24c14decfd3f93959f7b14514536af973c7"
-SRCREV_hal_stm32 = "b916f9a01c665194fbbdd6a67a0f37b4e0a7e78c"
+SRCREV_hal_renesas = "f2d791d28cd8fdbc5861652b863822632c91f690"
+SRCREV_hal_rpi_pico = "b7801e4db6a62ea2d37bbef7880c3d056530c9bf"
+SRCREV_hal_silabs = "a143f03e846eb1b7b3135f3c8192820ce1b6d9c4"
+SRCREV_hal_st = "5948f7b3304f1628a45ee928cd607619a7f53bbb"
+SRCREV_hal_stm32 = "c865374fc83d93416c0f380e6310368ff55d6ce2"
 SRCREV_hal_telink = "38573af589173259801ae6c2b34b7d4c9e626746"
-SRCREV_hal_ti = "5e7d5cd584047699c9fd279923120cb25ba3dda7"
+SRCREV_hal_ti = "ae1db23f32dde779cdfc4afaa9a60ea219310a64"
 SRCREV_hal_wurthelektronik = "24ca9873c3d608fad1fea0431836bc8f144c132e"
-SRCREV_hal_xtensa = "63f655362423aa49507da7977a2d37142e8debeb"
-SRCREV_libmetal = "efa2ace6028290ddee494a78ade772a0b112ab83"
+SRCREV_hal_xtensa = "41a631d4aeeeaedc0daece21eecc338807296ad7"
+SRCREV_libmetal = "b91611a6f47dd29fb24c46e5621e797557f80ec6"
 SRCREV_liblc3 = "448f3de31f49a838988a162ef1e23a89ddf2d2ed"
 SRCREV_littlefs = "ca583fd297ceb48bced3c2548600dc615d67af24"
 SRCREV_loramac-node = "ce57712f3e426bbbb13acaec97b45369f716f43a"
-SRCREV_lvgl = "5ab83099854719ed326b6ecb9b09b07b1eee4818"
+SRCREV_lvgl = "7102083f626cda09e5792420ea60af0525cce9ae"
 SRCREV_lz4 = "8e303c264fc21c2116dc612658003a22e933124d"
-SRCREV_mbedtls = "6e166050075688fd3cf3d0cb3fc34a1c52df2496"
-SRCREV_mcuboot = "750678e33819b95756203e5db1ba827baee35708"
+SRCREV_mbedtls = "6e7841e5a08eb5da3c82dbc8b6b6d82ae4b7d2a0"
+SRCREV_mcuboot = "74c4d1c52fd51d07904b27a7aa9b2303e896a4e3"
 SRCREV_mipi-sys-t = "0d521d8055f3b2b4842f728b0365d3f0ece9c37f"
-SRCREV_nanopb = "dc4deed54fd4c7e1935e3b6387eedf21bb45dc38"
+SRCREV_nanopb = "42fa8b211e946b90b9d968523fce7b1cfe27617e"
 SRCREV_net-tools = "e0828aa9629b533644dc96ff6d1295c939bd713c"
-SRCREV_nrf_hw_models = "d8f125e1988221ebfea5944fc3118f1780787ccc"
-SRCREV_open-amp = "aedcc262f93bbb1b0c2f58026911575729b7465c"
-SRCREV_openthread = "a1979fdd8ed756468719cc4921b04a57efcf9f15"
-SRCREV_picolibc = "98e59b70d6ef8eb18f7dccc3d39cecaa0658fa4f"
-SRCREV_segger = "e2ff2200556e8a8f962921444275c04971a2bb3d"
-SRCREV_sof = "6f5f7258ad2738df78e600568d38fc261e2a118d"
+SRCREV_nrf_hw_models = "c8d2ecd25d6976d2d77eccf66878420fdb8ef5a1"
+SRCREV_open-amp = "c904a01d4a882bcbb39987e0e2ce5308f49ac7ad"
+SRCREV_openthread = "d9abe3071c0131a4adb5d7e7451319b735e6d855"
+SRCREV_picolibc = "d07c38ff051386f8e09a143ea0a6c1d6d66dd1d8"
+SRCREV_segger = "4bfaf28a11c3e5ec29badac744fab6d2f342749e"
+SRCREV_sof = "ffbf9c2a6ea2930b0ac7e3a37c7cd7f5c417d090"
 SRCREV_tflite-micro = "9156d050927012da87079064db59d07f03b8baf6"
 SRCREV_tinycrypt = "3e9a49d2672ec01435ffbf0d788db6d95ef28de0"
-SRCREV_TraceRecorderSource = "d92607521335eaaaedb01b241cdd26fda48a5ca6"
-SRCREV_trusted-firmware-m = "f2a639c8d1842acb2964a27461f5c9cfdfaa4d16"
+SRCREV_TraceRecorderSource = "bc839bf94904bcdb91b33760e918afbef82e3ab4"
+SRCREV_trusted-firmware-m = "79a6115d3a8d0e04864ae8156c1dc8532b750f5a"
 SRCREV_trusted-firmware-a = "28f5e137837f1c1a7a7b2af2dd8bb778c0a27532"
 SRCREV_tf-m-tests = "0f80a65193ddbbe3f0ac38b33b07b26138c11fa7"
-SRCREV_psa-arch-tests = "24ed42e34e03ebbc945a7204819c1471cce2bda8"
+SRCREV_psa-arch-tests = "6a17330e0dfb5f319730f974d5b05f7b7f04757b"
 SRCREV_uoscore-uedhoc = "e8920192b66db4f909eb9cd3f155d5245c1ae825"
-SRCREV_zcbor = "0556edac504d1f34699aa8a22fcd507c14756c9e"
-SRCREV_zscilib = "0035be5e6a45e4ab89755b176d305d7a877fc79c"
+SRCREV_zcbor = "67fd8bb88d3136738661fa8bb5f9989103f4599e"
+SRCREV_zscilib = "34c3432e81085bb717e4871d21ca419ae0058ec5"
 SRCREV_thrift = "10023645a0e6cb7ce23fcd7fd3dbac9f18df6234"
 
 SRC_URI_ZEPHYR ?= "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https"
+SRC_URI_ZEPHYR_BSIM ?= "git://github.com/zephyrproject-rtos/babblesim-manifest;protocol=https"
+SRC_URI_ZEPHYR_BABBLESIM_BASE ?= "git://github.com/BabbleSim/base.git;protocol=https"
+SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_LIBPHYCOMV1 ?= "git://github.com/BabbleSim/ext_2G4_libPhyComv1.git;protocol=https"
+SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_PHY_V1 ?= "git://github.com/BabbleSim/ext_2G4_phy_v1.git;protocol=https"
+SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_CHANNEL_NTNCABLE ?= "git://github.com/BabbleSim/ext_2G4_channel_NtNcable.git;protocol=https"
+SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_CHANNEL_MULTIATT ?= "git://github.com/BabbleSim/ext_2G4_channel_multiatt.git;protocol=https"
+SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_MODEM_MAGIC ?= "git://github.com/BabbleSim/ext_2G4_modem_magic.git;protocol=https"
+SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_MODEM_BLE_SIMPLE ?= "git://github.com/BabbleSim/ext_2G4_modem_BLE_simple.git;protocol=https"
+SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_DEVICE_BURST_INTERFERER ?= "git://github.com/BabbleSim/ext_2G4_device_burst_interferer.git;protocol=https"
+SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_DEVICE_WLAN_ACTMOD ?= "git://github.com/BabbleSim/ext_2G4_device_WLAN_actmod.git;protocol=https"
+SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_DEVICE_PLAYBACK ?= "git://github.com/BabbleSim/ext_2G4_device_playback.git;protocol=https"
+SRC_URI_ZEPHYR_BABBLESIM_EXT_LIBCRYPTOV1 ?= "git://github.com/BabbleSim/ext_libCryptov1.git;protocol=https"
 SRC_URI_ZEPHYR_CANOPENNODE ?= "git://github.com/zephyrproject-rtos/canopennode;protocol=https"
 SRC_URI_ZEPHYR_CHRE ?= "git://github.com/zephyrproject-rtos/chre;protocol=https"
 SRC_URI_ZEPHYR_CMSIS ?= "git://github.com/zephyrproject-rtos/cmsis;protocol=https"
@@ -115,13 +139,23 @@ SRC_URI_ZEPHYR_ZSCILIB ?= "git://github.com/zephyrproject-rtos/zscilib;protocol=
 SRC_URI_ZEPHYR_THRIFT ?= "git://github.com/zephyrproject-rtos/thrift;protocol=https"
 
 SRC_URI_PATCHES ?= "\
-    file://0001-3.3-x86-fix-efi-binary-generation-issue-in-cross-compila.patch;patchdir=zephyr \
-    file://0002-3.3-toolchain-gcc-Fix-separator-between-directives-on-sa.patch;patchdir=zephyr \
-    file://0001-gcc-target.cmake-fix-build-with-gcc-13.patch;patchdir=zephyr \
+    file://0001-3.4-x86-fix-efi-binary-generation-issue-in-cross-compila.patch;patchdir=zephyr \
 "
 
 SRC_URI = "\
     ${SRC_URI_ZEPHYR};branch=${ZEPHYR_BRANCH};name=default;destsuffix=git/zephyr \
+    ${SRC_URI_ZEPHYR_BSIM};name=bsim;nobranch=1;destsuffix=git/tools/bsim \
+    ${SRC_URI_ZEPHYR_BABBLESIM_BASE};name=babblesim_base;nobranch=1;destsuffix=git/tools/bsim/components \
+    ${SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_LIBPHYCOMV1};name=babblesim_ext_2G4_libPhyComv1;nobranch=1;destsuffix=git/tools/bsim/components/ext_2G4_libPhyComv1 \
+    ${SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_PHY_V1};name=babblesim_ext_2G4_phy_v1;nobranch=1;destsuffix=git/tools/bsim/components/ext_2G4_phy_v1 \
+    ${SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_CHANNEL_NTNCABLE};name=babblesim_ext_2G4_channel_NtNcable;nobranch=1;destsuffix=git/tools/bsim/components/ext_2G4_channel_NtNcable \
+    ${SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_CHANNEL_MULTIATT};name=babblesim_ext_2G4_channel_multiatt;nobranch=1;destsuffix=git/tools/bsim/components/ext_2G4_channel_multiatt \
+    ${SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_MODEM_MAGIC};name=babblesim_ext_2G4_modem_magic;nobranch=1;destsuffix=git/tools/bsim/components/ext_2G4_modem_magic \
+    ${SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_MODEM_BLE_SIMPLE};name=babblesim_ext_2G4_modem_BLE_simple;nobranch=1;destsuffix=git/tools/bsim/components/ext_2G4_modem_BLE_simple \
+    ${SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_DEVICE_BURST_INTERFERER};name=babblesim_ext_2G4_device_burst_interferer;nobranch=1;destsuffix=git/tools/bsim/components/ext_2G4_device_burst_interferer \
+    ${SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_DEVICE_WLAN_ACTMOD};name=babblesim_ext_2G4_device_WLAN_actmod;nobranch=1;destsuffix=git/tools/bsim/components/ext_2G4_device_WLAN_actmod \
+    ${SRC_URI_ZEPHYR_BABBLESIM_EXT_2G4_DEVICE_PLAYBACK};name=babblesim_ext_2G4_device_playback;nobranch=1;destsuffix=git/tools/bsim/components/ext_2G4_device_playback \
+    ${SRC_URI_ZEPHYR_BABBLESIM_EXT_LIBCRYPTOV1};name=babblesim_ext_libCryptov1;nobranch=1;destsuffix=git/tools/bsim/components/ext_libCryptov1 \
     ${SRC_URI_ZEPHYR_CANOPENNODE};name=canopennode;nobranch=1;destsuffix=git/modules/lib/canopennode \
     ${SRC_URI_ZEPHYR_CHRE};name=chre;nobranch=1;destsuffix=git/modules/lib/chre \
     ${SRC_URI_ZEPHYR_CMSIS};name=cmsis;nobranch=1;destsuffix=git/modules/hal/cmsis \
@@ -180,6 +214,18 @@ SRC_URI = "\
 "
 
 ZEPHYR_MODULES = "\
+${S}/tools/bsim\;\
+${S}/tools/bsim/components\;\
+${S}/tools/bsim/components/ext_2G4_libPhyComv1\;\
+${S}/tools/bsim/components/ext_2G4_phy_v1\;\
+${S}/tools/bsim/components/ext_2G4_channel_NtNcable\;\
+${S}/tools/bsim/components/ext_2G4_channel_multiatt\;\
+${S}/tools/bsim/components/ext_2G4_modem_magic\;\
+${S}/tools/bsim/components/ext_2G4_modem_BLE_simple\;\
+${S}/tools/bsim/components/ext_2G4_device_burst_interferer\;\
+${S}/tools/bsim/components/ext_2G4_device_WLAN_actmod\;\
+${S}/tools/bsim/components/ext_2G4_device_playback\;\
+${S}/tools/bsim/components/ext_libCryptov1\;\
 ${S}/modules/lib/canopennode\;\
 ${S}/modules/lib/chre\;\
 ${S}/modules/hal/cmsis\;\
@@ -236,5 +282,5 @@ ${S}/modules/lib/zscilib\;\
 ${S}/modules/lib/thrift\;\
 "
 
-ZEPHYR_BRANCH = "v3.3-branch"
-PV = "3.3.0+git${SRCPV}"
+ZEPHYR_BRANCH = "v3.4-branch"
+PV = "3.4.0+git${SRCPV}"