Skip to content

Commit

Permalink
fixup! BCM2708: Add core Device Tree support
Browse files Browse the repository at this point in the history
  • Loading branch information
pelwell committed Jul 12, 2023
1 parent 20c733c commit d6bd06d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 deletions.
7 changes: 1 addition & 6 deletions arch/arm/boot/dts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,4 @@ subdir-y += xilinx
targets += dtbs dtbs_install
targets += $(dtb-y)

subdir-y := overlays

# Enable fixups to support overlays on BCM2835 platforms
ifeq ($(CONFIG_ARCH_BCM2835),y)
DTC_FLAGS += -@
endif
subdir-y += overlays
18 changes: 16 additions & 2 deletions arch/arm/boot/dts/broadcom/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
bcm2835-rpi-zero.dtb \
bcm2835-rpi-zero-w.dtb

DTC_FLAGS_bcm2708-rpi-b := -@
DTC_FLAGS_bcm2708-rpi-b-rev1 := -@
DTC_FLAGS_bcm2708-rpi-b-plus := -@
DTC_FLAGS_bcm2708-rpi-cm := -@
DTC_FLAGS_bcm2708-rpi-zero := -@
DTC_FLAGS_bcm2708-rpi-zero-w := -@
DTC_FLAGS_bcm2710-rpi-zero-2 := -@
DTC_FLAGS_bcm2710-rpi-zero-2-w := -@
DTC_FLAGS_bcm2709-rpi-2-b := -@
DTC_FLAGS_bcm2710-rpi-2-b := -@
DTC_FLAGS_bcm2710-rpi-3-b := -@
DTC_FLAGS_bcm2710-rpi-3-b-plus := -@
DTC_FLAGS_bcm2709-rpi-cm2 := -@
DTC_FLAGS_bcm2710-rpi-cm3 := -@
DTC_FLAGS_bcm2711-rpi-cm4 := -@
DTC_FLAGS_bcm2711-rpi-cm4s := -@
dtb-$(CONFIG_ARCH_BCM2835) += \
bcm2708-rpi-b.dtb \
bcm2708-rpi-b-rev1.dtb \
Expand All @@ -49,8 +65,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
bcm2710-rpi-2-b.dtb \
bcm2710-rpi-3-b.dtb \
bcm2710-rpi-3-b-plus.dtb \
bcm2711-rpi-4-b.dtb \
bcm2711-rpi-400.dtb \
bcm2709-rpi-cm2.dtb \
bcm2710-rpi-cm3.dtb \
bcm2711-rpi-cm4.dtb \
Expand Down
2 changes: 1 addition & 1 deletion scripts/Makefile.dtbinst
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ $(dst)/%.dtbo: $(obj)/%.dtbo

PHONY += $(subdirs)
$(subdirs):
$(Q)$(MAKE) $(dtbinst)=$@ dst=$(if $(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@))
$(Q)$(MAKE) $(dtbinst)=$@ dst=$(if $(if $(subst $(obj)/overlays,,$@),$(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@))

.PHONY: $(PHONY)

0 comments on commit d6bd06d

Please sign in to comment.