Skip to content

Commit 1d595d6

Browse files
jforissierjforissier
committed
Merge branch 'master' into import/mbedtls-3.6.2
2 parents 02e9598 + 6169a1f commit 1d595d6

File tree

298 files changed

+41307
-3830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+41307
-3830
lines changed

‎.devcontainer/Dockerfile.vscode

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
FROM ubuntu:22.04
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
RUN apt update && apt upgrade -y && apt-get install -y \
5+
build-essential \
6+
autoconf \
7+
bc \
8+
bison \
9+
ccache \
10+
clang \
11+
lld \
12+
cmake \
13+
codespell \
14+
device-tree-compiler \
15+
expect \
16+
flex \
17+
gcc-aarch64-linux-gnu \
18+
gcc-arm-linux-gnueabihf \
19+
gcc-riscv64-linux-gnu \
20+
gdb-multiarch \
21+
gdisk \
22+
gettext \
23+
libncurses5 \
24+
libssl-dev \
25+
lsb-release \
26+
python3 \
27+
python3-pip \
28+
python3-cryptography \
29+
python3-pycodestyle \
30+
python3-pycryptodome \
31+
python3-pyelftools \
32+
sudo \
33+
uuid-dev \
34+
wget \
35+
curl \
36+
git-core \
37+
git-man \
38+
git-email \
39+
sudo \
40+
nano \
41+
vim \
42+
openssh-client \
43+
bash-completion
44+
45+
# Add non root user
46+
RUN useradd -ms /bin/bash optee
47+
RUN echo "optee ALL=(ALL) NOPASSWD: ALL" | tee -a /etc/sudoers
48+
USER optee

‎.devcontainer/devcontainer.json

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"name": "optee-os-docker",
3+
"build": {
4+
"dockerfile": "Dockerfile.vscode"
5+
},
6+
7+
"customizations": {
8+
"vscode": {
9+
"settings": {
10+
"terminal.integrated.profiles.linux": {
11+
"bash": {
12+
"path": "/bin/bash",
13+
"args": ["-l"]
14+
}
15+
},
16+
"terminal.integrated.defaultProfile.linux": "bash"
17+
},
18+
"extensions": [
19+
"ms-vscode.cpptools",
20+
"eamodio.gitlens"
21+
]
22+
}
23+
},
24+
25+
// Map the host .ssh folder into the container for a seamless ssh experience
26+
"mounts": [
27+
"source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/home/optee/.ssh,type=bind,consistency=cached"
28+
]
29+
}

‎.github/workflows/ci.yml

+96-8
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
function _make() { make -j$(nproc) -s O=out $*; }
8383
function download_plug_and_trust() { mkdir -p $HOME/se050 && git clone --single-branch -b v0.4.2 https://github.com/foundriesio/plug-and-trust $HOME/se050/plug-and-trust || (rm -rf $HOME/se050 ; echo Nervermind); }
8484
85-
function download_scp_firmware() { git clone --single-branch -b v2.15.0 --depth 1 https://git.gitlab.arm.com/firmware/SCP-firmware.git $HOME/scp-firmware || (rm -rf $HOME/scp-firmware ; echo Nervermind); }
85+
function download_scp_firmware() { git clone --single-branch https://git.gitlab.arm.com/firmware/SCP-firmware.git $HOME/scp-firmware && git -C $HOME/scp-firmware checkout 22aecaa9cee258d707880c5b8823dd7974b66717 || (rm -rf $HOME/scp-firmware ; echo Nervermind); }
8686
8787
ccache -s -v
8888
download_plug_and_trust
@@ -122,7 +122,7 @@ jobs:
122122
_make CFG_SECURE_DATA_PATH=y
123123
_make CFG_REE_FS_TA_BUFFERED=y
124124
_make CFG_WITH_USER_TA=n
125-
_make CFG_{ATTESTATION,DEVICE_ENUM,RTC,SCMI,SECSTOR_TA_MGT}_PTA=y CFG_WITH_STATS=y CFG_TA_STATS=y
125+
_make CFG_{ATTESTATION,DEVICE_ENUM,RTC,SCMI,SECSTOR_TA_MGT,VERAISON_ATTESTATION}_PTA=y CFG_WITH_STATS=y CFG_TA_STATS=y
126126
_make PLATFORM=vexpress-qemu_armv8a
127127
_make PLATFORM=vexpress-qemu_armv8a COMPILER=clang
128128
_make PLATFORM=vexpress-qemu_armv8a CFG_TEE_CORE_LOG_LEVEL=0 CFG_TEE_CORE_DEBUG=n CFG_TEE_TA_LOG_LEVEL=0 CFG_DEBUG_INFO=n
@@ -135,7 +135,7 @@ jobs:
135135
_make PLATFORM=vexpress-qemu_armv8a CFG_TRANSFER_LIST=y CFG_MAP_EXT_DT_SECURE=y
136136
_make PLATFORM=vexpress-qemu_armv8a CFG_CORE_SEL1_SPMC=y
137137
_make PLATFORM=vexpress-qemu_armv8a CFG_CORE_SEL2_SPMC=y CFG_CORE_PHYS_RELOCATABLE=y CFG_TZDRAM_START=0x0d304000 CFG_TZDRAM_SIZE=0x00cfc000
138-
_make PLATFORM=vexpress-qemu_armv8a CFG_{ATTESTATION,DEVICE_ENUM,RTC,SCMI,SECSTOR_TA_MGT}_PTA=y CFG_WITH_STATS=y CFG_TA_STATS=y
138+
_make PLATFORM=vexpress-qemu_armv8a CFG_{ATTESTATION,DEVICE_ENUM,RTC,SCMI,SECSTOR_TA_MGT,VERAISON_ATTESTATION}_PTA=y CFG_WITH_STATS=y CFG_TA_STATS=y
139139
_make PLATFORM=vexpress-qemu_armv8a CFG_CORE_SEL1_SPMC=y CFG_NS_VIRTUALIZATION=y
140140
_make PLATFORM=vexpress-qemu_armv8a CFG_CRYPTO_WITH_CE=y CFG_CRYPTOLIB_NAME=mbedtls CFG_CRYPTOLIB_DIR=lib/libmbedtls
141141
dd if=/dev/urandom of=BL32_AP_MM.fd bs=2621440 count=1 && _make PLATFORM=vexpress-qemu_armv8a CFG_STMM_PATH=BL32_AP_MM.fd CFG_RPMB_FS=y CFG_CORE_HEAP_SIZE=524288 CFG_TEE_RAM_VA_SIZE=0x00400000
@@ -189,7 +189,7 @@ jobs:
189189
_make PLATFORM=imx-mx7ulpevk
190190
_make PLATFORM=imx-mx8mmevk
191191
_make PLATFORM=imx-mx8mmevk CFG_NXP_CAAM=y CFG_CRYPTO_DRIVER=y
192-
if [ -d $HOME/se050/plug-and-trust ]; then _make PLATFORM=imx-mx8mmevk CFG_NXP_CAAM=y CFG_NXP_CAAM_RNG_DRV=y CFG_NXP_SE05X=y CFG_IMX_I2C=y CFG_STACK_{THREAD,TMP}_EXTRA=8192 CFG_CRYPTO_DRV_{CIPHER,ACIPHER}=y CFG_NXP_SE05X_RNG_DRV=n CFG_WITH_SOFTWARE_PRNG=n CFG_NXP_SE05X_{DIEID,RSA,ECC,CTR}_DRV=y CFG_NXP_SE05X_RSA_DRV_FALLBACK=y CFG_NXP_SE05X_ECC_DRV_FALLBACK=y CFG_NXP_SE05X_PLUG_AND_TRUST=$HOME/se050/plug-and-trust ; fi
192+
if [ -d $HOME/se050/plug-and-trust ]; then _make PLATFORM=imx-mx8mmevk CFG_NXP_CAAM=y CFG_NXP_CAAM_AE_{GCM,CCM}_DRV=y CFG_NXP_CAAM_RNG_DRV=y CFG_NXP_SE05X=y CFG_IMX_I2C=y CFG_STACK_{THREAD,TMP}_EXTRA=8192 CFG_CRYPTO_DRV_{CIPHER,ACIPHER,AUTHENC}=y CFG_NXP_SE05X_RNG_DRV=n CFG_WITH_SOFTWARE_PRNG=n CFG_NXP_SE05X_{DIEID,RSA,ECC,CTR}_DRV=y CFG_NXP_SE05X_RSA_DRV_FALLBACK=y CFG_NXP_SE05X_ECC_DRV_FALLBACK=y CFG_NXP_SE05X_PLUG_AND_TRUST=$HOME/se050/plug-and-trust ; fi
193193
_make PLATFORM=imx-mx8mnevk
194194
_make PLATFORM=imx-mx8mqevk
195195
_make PLATFORM=imx-mx8mpevk
@@ -212,6 +212,8 @@ jobs:
212212
_make PLATFORM=k3-am64x CFG_ARM64_core=y
213213
_make PLATFORM=k3-am62x
214214
_make PLATFORM=k3-am62x CFG_ARM64_core=y
215+
_make PLATFORM=k3-am62lx
216+
_make PLATFORM=k3-am62lx CFG_ARM64_core=y
215217
_make PLATFORM=ti-dra7xx out/core/tee{,-pager,-pageable}.bin
216218
_make PLATFORM=ti-am57xx
217219
_make PLATFORM=ti-am43xx
@@ -245,6 +247,7 @@ jobs:
245247
_make PLATFORM=poplar CFG_ARM64_core=y
246248
_make PLATFORM=rockchip-rk322x
247249
_make PLATFORM=rockchip-rk3399
250+
_make PLATFORM=rockchip-rk3588
248251
_make PLATFORM=sam
249252
_make PLATFORM=sam-sama5d2_xplained
250253
_make PLATFORM=sam-sama5d27_som1_ek
@@ -270,12 +273,15 @@ jobs:
270273
_make PLATFORM=nuvoton
271274
_make PLATFORM=d06
272275
_make PLATFORM=d06 CFG_HISILICON_ACC_V3=y
276+
_make PLATFORM=telechips-tcc805x
273277
274278
export ARCH=riscv
275279
unset CROSS_COMPILE32
276280
export CROSS_COMPILE64="ccache riscv64-linux-gnu-"
277281
278282
_make PLATFORM=virt
283+
_make PLATFORM=virt CFG_RISCV_PLIC=n CFG_RISCV_APLIC=y
284+
_make PLATFORM=virt CFG_RISCV_PLIC=n CFG_RISCV_APLIC_MSI=y CFG_RISCV_IMSIC=y
279285
280286
QEMUv7_check:
281287
name: make check (QEMUv7)
@@ -313,8 +319,8 @@ jobs:
313319
314320
make -j$(nproc) check CFG_LOCKDEP=y CFG_LOCKDEP_RECORD_STACK=n CFG_IN_TREE_EARLY_TAS=pkcs11/fd02c9da-306c-48c7-a49c-bbd827ae86ee CFG_PKCS11_TA=y CFG_CORE_UNSAFE_MODEXP=y XTEST_ARGS="-x pkcs11_1007"
315321
316-
QEMUv8_check:
317-
name: make check (QEMUv8)
322+
QEMUv8_check1:
323+
name: make check (QEMUv8) 1 / 2
318324
runs-on: ubuntu-latest
319325
container: jforissier/optee_os_ci:qemu_check
320326
steps:
@@ -352,10 +358,51 @@ jobs:
352358
make -j$(nproc) check
353359
make -j$(nproc) check CFG_CRYPTO_WITH_CE82=y
354360
# Rust is disabled because signature_verification-rs hangs with this OP-TEE configuration
355-
make -j$(nproc) check CFG_FTRACE_SUPPORT=y CFG_SYSCALL_FTRACE=y XTEST_ARGS=regression_1001 RUST_ENABLE=n
361+
# fTPM is disabled because it takes too long to probe with this OP-TEE configuration
362+
make -j$(nproc) check CFG_FTRACE_SUPPORT=y CFG_SYSCALL_FTRACE=y XTEST_ARGS=regression_1001 RUST_ENABLE=n MEASURED_BOOT_FTPM=n
363+
# fTPM is disabled because tests are too slow otherwise (lots of paging)
364+
make -j$(nproc) check CFG_WITH_PAGER=y MEASURED_BOOT_FTPM=n
365+
366+
QEMUv8_check2:
367+
name: make check (QEMUv8) 2 / 2
368+
runs-on: ubuntu-latest
369+
container: jforissier/optee_os_ci:qemu_check
370+
steps:
371+
- name: Remove /__t/*
372+
run: rm -rf /__t/*
373+
- name: Restore build cache
374+
uses: actions/cache@v4
375+
with:
376+
path: /github/home/.cache/ccache
377+
key: qemuv8_check-cache-${{ github.sha }}
378+
restore-keys: |
379+
qemuv8_check-cache-
380+
- name: Checkout
381+
uses: actions/checkout@v4
382+
- name: Update Git config
383+
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
384+
- shell: bash
385+
run: |
386+
# make check task
387+
set -e -v
388+
export LC_ALL=C
389+
export BR2_CCACHE_DIR=/github/home/.cache/ccache
390+
export FORCE_UNSAFE_CONFIGURE=1 # Prevent Buildroot error when building as root
391+
export CFG_TEE_CORE_LOG_LEVEL=0
392+
export CFG_ATTESTATION_PTA=y
393+
export CFG_ATTESTATION_PTA_KEY_SIZE=1024
394+
OPTEE_OS_TO_TEST=$(pwd)
395+
cd ..
396+
TOP=$(pwd)/optee_repo_qemu_v8
397+
/root/get_optee.sh qemu_v8 ${TOP}
398+
mv ${TOP}/optee_os ${TOP}/optee_os_old
399+
ln -s ${OPTEE_OS_TO_TEST} ${TOP}/optee_os
400+
cd ${TOP}/build
401+
356402
make -j$(nproc) check CFG_PAN=y
357-
make -j$(nproc) check CFG_WITH_PAGER=y
358403
make -j$(nproc) check CFG_ULIBS_SHARED=y
404+
make -j$(nproc) arm-tf-clean SPMC_AT_EL=3 && make -j$(nproc) check SPMC_AT_EL=3
405+
make -j$(nproc) arm-tf-clean SPMC_AT_EL=1 && make -j$(nproc) check SPMC_AT_EL=1 CFG_SECURE_PARTITION=y CFG_SPMC_TESTS=y
359406
360407
QEMUv8_clang_check:
361408
name: make check (QEMUv8, Clang)
@@ -551,3 +598,44 @@ jobs:
551598
# xtest 1031 is excluded because 1031.4 (C++ exception from shared library) fails with this cross-compiler
552599
# Rust is disabled because of a link error in the examples with this toolchain
553600
make -j$(nproc) CFG_CORE_BTI=y CFG_TA_BTI=y MEMTAG=y PAUTH=y RUST_ENABLE=n XTEST_ARGS="-x 1031" check
601+
602+
QEMUv8_check_arm64_host:
603+
name: make check (QEMUv8) (arm64 host)
604+
runs-on: ubuntu-24.04-arm
605+
container: jforissier/optee_os_ci:qemu_check_arm64
606+
steps:
607+
- name: Remove /__t/*
608+
run: rm -rf /__t/*
609+
- name: Restore build cache
610+
uses: actions/cache@v4
611+
with:
612+
path: /github/home/.cache/ccache
613+
key: qemuv8_check_arm64-cache-${{ github.sha }}
614+
restore-keys: |
615+
qemuv8_check_arm64-cache-
616+
- name: Checkout
617+
uses: actions/checkout@v4
618+
- name: Update Git config
619+
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
620+
- shell: bash
621+
run: |
622+
# make check task
623+
set -e -v
624+
export LC_ALL=C
625+
export BR2_CCACHE_DIR=/github/home/.cache/ccache
626+
export FORCE_UNSAFE_CONFIGURE=1 # Prevent Buildroot error when building as root
627+
export CFG_TEE_CORE_LOG_LEVEL=0
628+
export CFG_ATTESTATION_PTA=y
629+
export CFG_ATTESTATION_PTA_KEY_SIZE=1024
630+
OPTEE_OS_TO_TEST=$(pwd)
631+
cd ..
632+
TOP=$(pwd)/optee_repo_qemu_v8
633+
/root/get_optee.sh qemu_v8 ${TOP}
634+
mv ${TOP}/optee_os ${TOP}/optee_os_old
635+
ln -s ${OPTEE_OS_TO_TEST} ${TOP}/optee_os
636+
cd ${TOP}/build
637+
638+
# CFG_CORE_UNSAFE_MODEXP=y to speed up regression_4011
639+
# See commit cb03400251f9 ("Squashed commit upgrading to mbedtls-3.6.2")
640+
# and commit 85df256c4a67 ("libmbedtls: add CFG_CORE_UNSAFE_MODEXP and CFG_TA_MEBDTLS_UNSAFE_MODEXP")
641+
make -j$(nproc) check CFG_CORE_UNSAFE_MODEXP=y

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
!.gitattributes
1313
!.gitignore
1414
!.github
15+
!.devcontainer
16+
!.vscode

‎.vscode/extensions.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"recommendations": [
3+
"ms-vscode-remote.remote-containers",
4+
"ms-vscode-remote.remote-wsl",
5+
"ms-vscode-remote.vscode-remote-extensionpack",
6+
"ms-vscode.cpptools-extension-pack",
7+
"ms-vscode.cpptools",
8+
"eamodio.gitlens",
9+
]
10+
}

‎CHANGELOG.md

+30
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
# OP-TEE - version 4.5.0 (2025-01-17)
2+
3+
- Links to the release pages, commits and pull requests merged into this release for:
4+
- OP-TEE/optee_os: [release page][OP_TEE_optee_os_release_4_5_0], [commits][OP_TEE_optee_os_commits_4_5_0] and [pull requests][OP_TEE_optee_os_pr_4_5_0]
5+
- OP-TEE/optee_client: [release page][OP_TEE_optee_client_release_4_5_0], [commits][OP_TEE_optee_client_commits_4_5_0] and [pull requests][OP_TEE_optee_client_pr_4_5_0]
6+
- OP-TEE/optee_test: [release page][OP_TEE_optee_test_release_4_5_0], [commits][OP_TEE_optee_test_commits_4_5_0] and [pull requests][OP_TEE_optee_test_pr_4_5_0]
7+
- OP-TEE/build: [release page][OP_TEE_build_release_4_5_0], [commits][OP_TEE_build_commits_4_5_0] and [pull requests][OP_TEE_build_pr_4_5_0]
8+
- linaro-swg/optee_examples: [release page][linaro_swg_optee_examples_release_4_5_0], [commits][linaro_swg_optee_examples_commits_4_5_0] and [pull requests][linaro_swg_optee_examples_pr_4_5_0]
9+
10+
11+
[OP_TEE_optee_os_release_4_5_0]: https://github.com/OP-TEE/optee_os/releases/tag/4.5.0
12+
[OP_TEE_optee_os_commits_4_5_0]: https://github.com/OP-TEE/optee_os/compare/4.4.0...4.5.0
13+
[OP_TEE_optee_os_pr_4_5_0]: https://github.com/OP-TEE/optee_os/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2024-10-18..2025-01-17
14+
15+
[OP_TEE_optee_client_release_4_5_0]: https://github.com/OP-TEE/optee_client/releases/tag/4.5.0
16+
[OP_TEE_optee_client_commits_4_5_0]: https://github.com/OP-TEE/optee_client/compare/4.4.0...4.5.0
17+
[OP_TEE_optee_client_pr_4_5_0]: https://github.com/OP-TEE/optee_client/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2024-10-18..2025-01-17
18+
19+
[OP_TEE_optee_test_release_4_5_0]: https://github.com/OP-TEE/optee_test/releases/tag/4.5.0
20+
[OP_TEE_optee_test_commits_4_5_0]: https://github.com/OP-TEE/optee_test/compare/4.4.0...4.5.0
21+
[OP_TEE_optee_test_pr_4_5_0]: https://github.com/OP-TEE/optee_test/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2024-10-18..2025-01-17
22+
23+
[OP_TEE_build_release_4_5_0]: https://github.com/OP-TEE/build/releases/tag/4.5.0
24+
[OP_TEE_build_commits_4_5_0]: https://github.com/OP-TEE/build/compare/4.4.0...4.5.0
25+
[OP_TEE_build_pr_4_5_0]: https://github.com/OP-TEE/build/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2024-10-18..2025-01-17
26+
27+
[linaro_swg_optee_examples_release_4_5_0]: https://github.com/linaro-swg/optee_examples/releases/tag/4.5.0
28+
[linaro_swg_optee_examples_commits_4_5_0]: https://github.com/linaro-swg/optee_examples/compare/4.4.0...4.5.0
29+
[linaro_swg_optee_examples_pr_4_5_0]: https://github.com/linaro-swg/optee_examples/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2024-10-18..2025-01-17
30+
131
# OP-TEE - version 4.4.0 (2024-10-18)
232

333
- Links to the release pages, commits and pull requests merged into this release for:

‎MAINTAINERS

+16-3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ R: Amit Singh Tomar <amittomer25@gmail.com> [@Amit-Radur]
6262
S: Maintained
6363
F: core/arch/arm/plat-sunxi/
6464

65+
AMD Versal Gen 2
66+
R: Michal Simek <michal.simek@amd.com> [@michalsimek]
67+
R: Akshay Belsare <akshay.belsare@amd.com> [@Akshay-Belsare]
68+
S: Maintained
69+
F: core/arch/arm/plat-versal2/
70+
6571
AmLogic AXG (A113D)
6672
R: Carlo Caione <ccaione@baylibre.com> [@carlocaione]
6773
S: Maintained
@@ -118,7 +124,7 @@ F: core/drivers/zynqmp_huk.c
118124
F: core/drivers/zynqmp_pm.c
119125

120126
Function Graph Tracer (ftrace) support
121-
R: Sumit Garg <sumit.garg@linaro.org> [@b49020]
127+
R: Sumit Garg <sumit.garg@kernel.org> [@b49020]
122128
S: Maintained
123129
F: ldelf/ftrace.c
124130
F: lib/libutils/ext/ftrace/
@@ -243,7 +249,7 @@ S: Maintained
243249
F: core/arch/arm/plat-rzg/
244250

245251
Renesas RZ/N1
246-
R: Sumit Garg <sumit.garg@linaro.org> [@b49020]
252+
R: Sumit Garg <sumit.garg@kernel.org> [@b49020]
247253
S: Maintained
248254
F: core/arch/arm/plat-rzn1/
249255

@@ -253,7 +259,7 @@ S: Maintained
253259
F: core/arch/arm/plat-rockchip/
254260

255261
Socionext DeveloperBox (Synquacer SC2A11)
256-
R: Sumit Garg <sumit.garg@linaro.org> [@b49020]
262+
R: Sumit Garg <sumit.garg@kernel.org> [@b49020]
257263
S: Maintained
258264
F: core/arch/arm/plat-synquacer/
259265

@@ -324,6 +330,13 @@ R: Neal Liu <neal_liu@aspeedtech.com> [@Neal-liu]
324330
S: Maintained
325331
F: core/arch/arm/plat-aspeed/
326332

333+
Telechips TCC805x
334+
R: Sungmin Han <sungminhan@telechips.com> [@meeneemaru]
335+
R: GY Hwang <gy.hwang@telechips.com> [@hwang-telechips]
336+
S: Maintained
337+
F: core/arch/arm/plat-telechips/
338+
F: core/drivers/openedges_omc.c
339+
327340
RISC-V
328341
R: Marouene Boubakri <marouene.boubakri@nxp.com> [@maroueneboubakri]
329342
S: Maintained

‎core/arch/arm/dts/stm32mp13-pinctrl.dtsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727

2828
uart4_pins_a: uart4-0 {
2929
pins1 {
30-
pinmux = <STM32_PINMUX('D', 6, AF8)>; /* UART4_TX */
30+
pinmux = <STM32_PINMUX_NSEC('D', 6, AF8)>; /* UART4_TX */
3131
bias-disable;
3232
drive-push-pull;
3333
slew-rate = <0>;
3434
};
3535
pins2 {
36-
pinmux = <STM32_PINMUX('D', 8, AF8)>; /* UART4_RX */
36+
pinmux = <STM32_PINMUX_NSEC('D', 8, AF8)>; /* UART4_RX */
3737
bias-disable;
3838
};
3939
};

0 commit comments

Comments
 (0)