diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-28 07:33:16 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-28 07:33:16 -0500 |
| commit | 29061447a0750826d68e02645d1c43abd799ca96 (patch) | |
| tree | 2ac0bc170aae80b981c5266685aa7bc852d151ab /arch/arm/dts/stm32f469.dtsi | |
| parent | 4b39568cfd5c3556dda125c99f6e2777692d2034 (diff) | |
| parent | b4fee1610864036c8363e552f8547e99b1100f0b (diff) | |
Merge tag 'u-boot-stm32-20191126' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- Solve warning for stih410-b2260
- Device tree alignment on v5.4-rc4 for all stm32 boards
- Correct the eMMC pin configuration on stm32mp157c-ev1
- Add DFU and SPI-NAND support for stm32mp1 board
Diffstat (limited to 'arch/arm/dts/stm32f469.dtsi')
| -rw-r--r-- | arch/arm/dts/stm32f469.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/stm32f469.dtsi b/arch/arm/dts/stm32f469.dtsi index 0d58d40649..69c862d973 100644 --- a/arch/arm/dts/stm32f469.dtsi +++ b/arch/arm/dts/stm32f469.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) /* Copyright (C) STMicroelectronics 2017 - All Rights Reserved */ #include "stm32f429.dtsi" |