Skip to content

Commit

Permalink
stm32mp1: remove LINUX_DTB_BIN
Browse files Browse the repository at this point in the history
Removes variable LINUX_DTB_BIN and uses $(STM32MP1_DTS_BASENAME).dtb
instead where applicable. This change makes the makefile easier to
maintain.

Acked-by: Jerome Forissier <[email protected]>
Signed-off-by: Etienne Carriere <[email protected]>
  • Loading branch information
etienne-lms authored and jforissier committed Nov 14, 2023
1 parent 7479941 commit 00bc6ec
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions stm32mp1.mk
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ OPTEE_PAGEABLE_BIN := tee-pageable_v2.bin
U_BOOT_BIN := u-boot.bin
U_BOOT_DTB := u-boot.dtb
LINUX_KERNEL_BIN := uImage
LINUX_DTB_BIN := $(STM32MP1_DTS_BASENAME).dtb

################################################################################
# Paths to git projects and various binaries
Expand Down Expand Up @@ -167,7 +166,7 @@ LINUX_COMMON_FLAGS += ARCH=arm uImage LOADADDR=0xc2000000 \

linux: linux-common
@$(call install_in_binaries,$(LINUX_PATH)/arch/arm/boot/$(LINUX_KERNEL_BIN))
@$(call install_in_binaries,$(LINUX_PATH)/arch/arm/boot/dts/st/$(LINUX_DTB_BIN))
@$(call install_in_binaries,$(LINUX_PATH)/arch/arm/boot/dts/st/$(STM32MP1_DTS_BASENAME).dtb)

linux-defconfig-clean: linux-defconfig-clean-common

Expand Down Expand Up @@ -230,7 +229,7 @@ copy_images_to_br: tfa optee-os u-boot linux
$(call install_in_br_images,$(U_BOOT_BIN))
$(call install_in_br_images,$(U_BOOT_DTB))
$(call install_in_br_images,$(LINUX_KERNEL_BIN))
$(call install_in_br_images,$(LINUX_DTB_BIN))
$(call install_in_br_images,$(STM32MP1_DTS_BASENAME).dtb)
$(call install_in_br_images,$(OPTEE_HEADER_BIN))
$(call install_in_br_images,$(OPTEE_PAGER_BIN))
$(call install_in_br_images,$(OPTEE_PAGEABLE_BIN))

0 comments on commit 00bc6ec

Please sign in to comment.