Skip to content

Commit 8ab2178

Browse files
committed
Merge tag 'u-boot-imx-master-20241018a' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/22796 - Switch to using upstream DT on DH i.MX8MP DHCOM PDK2/PDK3. - Add ability to build fallback DTBOs from arch/$(ARCH)/dts. - Remove fdt_high and initrd_high env variables from imx6-dhcom. - Add dummy clk for imx8. - Fix DT corruption in imx8_cpu. - Improve DDR stability on pico-imx7d.
2 parents f8fe853 + 9b1cecd commit 8ab2178

File tree

14 files changed

+78
-504
lines changed

14 files changed

+78
-504
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,11 @@ of_list := "$(ext_dtb_list)"
13841384
of_list_dirs := $(dir $(EXT_DTB))
13851385
else
13861386
of_list := $(CONFIG_OF_LIST)
1387+
ifneq ($(CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS),)
1388+
of_list_dirs := $(dt_dir) arch/$(ARCH)/dts
1389+
else
13871390
of_list_dirs := $(dt_dir)
1391+
endif
13881392
default_dt := $(if $(DEVICE_TREE),$(DEVICE_TREE),$(CONFIG_DEFAULT_DEVICE_TREE))
13891393
endif
13901394

arch/arm/dts/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,8 +961,6 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
961961
imx8mp-dhcom-som-overlay-eth2xfast.dtbo \
962962
imx8mp-dhcom-pdk-overlay-eth2xfast.dtbo \
963963
imx8mp-dhcom-drc02.dtb \
964-
imx8mp-dhcom-pdk2.dtb \
965-
imx8mp-dhcom-pdk3.dtb \
966964
imx8mp-dhcom-pdk3-overlay-rev100.dtbo \
967965
imx8mp-dhcom-picoitx.dtb \
968966
imx8mp-icore-mx8mp-edimm2.2.dtb \

arch/arm/dts/imx8mp-dhcom-pdk2.dts

Lines changed: 0 additions & 158 deletions
This file was deleted.

0 commit comments

Comments
 (0)