Hi,

On 10/5/24 03:15, Marek Vasut wrote:
Enable OF_UPSTREAM to use upstream DT and add st/ prefix to the
DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/
including *-u-boot.dtsi from arch/$(ARCH)/dts/ directory.

The previous setup used generic SoC prefix like stm32mp15xx-dhco* for
generic DTs which could be used on any STM32MP15xx DHSOM variant. The
new setup uses specific SoC prefix stm32mp157c-dhco* to match Linux DT
names. Since the hardware present on STM32MP153 and STM32MP157 is not
enabled in the board configuration and not supported by U-Boot except
for the DSI host, using the existing Linux DTs poses no issue even on
plain STM32MP151A based SoMs.

Signed-off-by: Marek Vasut <ma...@denx.de>
---
Cc: Patrice Chotard <patrice.chot...@foss.st.com>
Cc: Patrick Delaunay <patrick.delau...@foss.st.com>
Cc: Sean Anderson <sean...@gmail.com>
Cc: Simon Glass <s...@chromium.org>
Cc: Tom Rini <tr...@konsulko.com>
Cc: u-b...@dh-electronics.com
Cc: u-boot@lists.denx.de
Cc: uboot-st...@st-md-mailman.stormreply.com
---
V2: - Drop arch/arm/dts/Makefile entries
     - Convert stm32mp135f-dhcom-dhsbc
---
  arch/arm/dts/Makefile                         |   9 +-
  arch/arm/dts/stm32mp135f-dhcor-dhsbc.dts      | 383 ------------
  ...> stm32mp151a-dhcor-testbench-u-boot.dtsi} |   0
  ...si => stm32mp153c-dhcom-drc02-u-boot.dtsi} |   0
  ...stm32mp153c-dhcor-drc-compact-u-boot.dtsi} |   0
  ...> stm32mp157a-dhcor-avenger96-u-boot.dtsi} |   0
  ...tsi => stm32mp157c-dhcom-pdk2-u-boot.dtsi} |   0
  ... => stm32mp157c-dhcom-picoitx-u-boot.dtsi} |   0
  arch/arm/dts/stm32mp15xx-dhcom-drc02.dts      |  17 -
  arch/arm/dts/stm32mp15xx-dhcom-drc02.dtsi     | 169 ------
  arch/arm/dts/stm32mp15xx-dhcom-pdk2.dts       |  17 -
  arch/arm/dts/stm32mp15xx-dhcom-pdk2.dtsi      | 329 -----------
  arch/arm/dts/stm32mp15xx-dhcom-picoitx.dts    |  17 -
  arch/arm/dts/stm32mp15xx-dhcom-picoitx.dtsi   | 151 -----
  arch/arm/dts/stm32mp15xx-dhcom-som.dtsi       | 544 ------------------
  arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts  |  20 -
  arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi | 437 --------------
  .../arm/dts/stm32mp15xx-dhcor-drc-compact.dts |  18 -
  .../dts/stm32mp15xx-dhcor-drc-compact.dtsi    | 326 -----------
  arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi     |  28 -
  arch/arm/dts/stm32mp15xx-dhcor-som.dtsi       | 221 -------
  arch/arm/dts/stm32mp15xx-dhcor-testbench.dts  | 180 ------
  .../dh_stm32mp1/u-boot-dhcom.its              |  18 +-
  .../dh_stm32mp1/u-boot-dhcor.its              |  12 +-
  configs/stm32mp13_dhcor_defconfig             |   3 +-
  configs/stm32mp15_dhcom_basic_defconfig       |   5 +-
  configs/stm32mp15_dhcor_basic_defconfig       |   5 +-
  27 files changed, 24 insertions(+), 2885 deletions(-)
  delete mode 100644 arch/arm/dts/stm32mp135f-dhcor-dhsbc.dts
  rename arch/arm/dts/{stm32mp15xx-dhcor-testbench-u-boot.dtsi => 
stm32mp151a-dhcor-testbench-u-boot.dtsi} (100%)
  rename arch/arm/dts/{stm32mp15xx-dhcom-drc02-u-boot.dtsi => 
stm32mp153c-dhcom-drc02-u-boot.dtsi} (100%)
  rename arch/arm/dts/{stm32mp15xx-dhcor-drc-compact-u-boot.dtsi => 
stm32mp153c-dhcor-drc-compact-u-boot.dtsi} (100%)
  rename arch/arm/dts/{stm32mp15xx-dhcor-avenger96-u-boot.dtsi => 
stm32mp157a-dhcor-avenger96-u-boot.dtsi} (100%)
  rename arch/arm/dts/{stm32mp15xx-dhcom-pdk2-u-boot.dtsi => 
stm32mp157c-dhcom-pdk2-u-boot.dtsi} (100%)
  rename arch/arm/dts/{stm32mp15xx-dhcom-picoitx-u-boot.dtsi => 
stm32mp157c-dhcom-picoitx-u-boot.dtsi} (100%)
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcom-drc02.dts
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcom-drc02.dtsi
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcom-pdk2.dts
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcom-pdk2.dtsi
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcom-picoitx.dts
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcom-picoitx.dtsi
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcom-som.dtsi
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcor-drc-compact.dts
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcor-drc-compact.dtsi
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcor-som.dtsi
  delete mode 100644 arch/arm/dts/stm32mp15xx-dhcor-testbench.dts


Nice.



Reviewed-by: Patrick Delaunay <patrick.delau...@foss.st.com>

Thanks
Patrick


Reply via email to