diff options
| author | Tom Rini <[email protected]> | 2023-10-04 10:49:30 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-10-04 10:49:30 -0400 |
| commit | b83e2858667dfaf2fb67331d0f45a2c39179ef91 (patch) | |
| tree | 36046c483cf01bc35ae38ae474b57c985ead6b44 /include/dt-bindings/clock | |
| parent | 65b9b3462bec2966911658836983819ab4e4823e (diff) | |
| parent | 6d91f0a3a14dd13a04946e672a4640fc65e4d275 (diff) | |
Merge tag 'u-boot-stm32-20231004' of https://source.denx.de/u-boot/custodians/u-boot-stm
STM32 MCU:
_ alignment with kernel DT v6.5 for stm32f429 and stm32f746
_ rework way of displaying ST logo for stm32f746-disco and stm32f769-disco
STM32 MPU:
_ alignment with kernel DT v6.6-rc1
_ add RNG support for stm32mp13
_ add USB, USB boot and stm32prog command support for stm32mp13
_ add support of USART1 clock for stm32mp1
_ only print RAM and board code with SPL_DISPLAY_PRINT flag for
stm32mp1
_ rename update_sf to dh_update_sd_to_sf and add dh_update_sd_to_emmc
for stm32mp15xx DHCOR
[ Fix merge conflict at board/st/common/stm32mp_dfu.c ]
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'include/dt-bindings/clock')
| -rw-r--r-- | include/dt-bindings/clock/stm32mp1-clks.h | 2 | ||||
| -rw-r--r-- | include/dt-bindings/clock/stm32mp13-clks.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/dt-bindings/clock/stm32mp1-clks.h b/include/dt-bindings/clock/stm32mp1-clks.h index 25e8cfd4345..0a5324bcdbd 100644 --- a/include/dt-bindings/clock/stm32mp1-clks.h +++ b/include/dt-bindings/clock/stm32mp1-clks.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* * Copyright (C) STMicroelectronics 2018 - All Rights Reserved * Author: Gabriel Fernandez <[email protected]> for STMicroelectronics. diff --git a/include/dt-bindings/clock/stm32mp13-clks.h b/include/dt-bindings/clock/stm32mp13-clks.h index da4cb756743..0bd7b54c65f 100644 --- a/include/dt-bindings/clock/stm32mp13-clks.h +++ b/include/dt-bindings/clock/stm32mp13-clks.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause */ /* * Copyright (C) STMicroelectronics 2020 - All Rights Reserved * Author: Gabriel Fernandez <[email protected]> for STMicroelectronics. |