| Message ID | 20231005142117.18671-1-afd@ti.com |
|---|---|
| State | Accepted |
| Commit | 693886856a668790debd72ffea1905ae849d5bc5 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | arm: mach-k3: Remove secure device makefile | expand |
Hi Andrew On 05/10/23 19:51, Andrew Davis wrote: > This is now done using binman but this file was leftover and is now > unused, remove it. > > Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Neha Malcom Francis <n-francis@ti.com> > --- > MAINTAINERS | 1 - > arch/arm/mach-k3/config_secure.mk | 44 ------------------------------- > 2 files changed, 45 deletions(-) > delete mode 100644 arch/arm/mach-k3/config_secure.mk > > diff --git a/MAINTAINERS b/MAINTAINERS > index 4df79254dfe..de4711721b2 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1548,7 +1548,6 @@ F: arch/arm/mach-omap2/omap5/sec_entry_cpu1.S > F: arch/arm/mach-omap2/sec-common.c > F: arch/arm/mach-omap2/config_secure.mk > F: arch/arm/mach-k3/security.c > -F: arch/arm/mach-k3/config_secure.mk > F: configs/am335x_hs_evm_defconfig > F: configs/am335x_hs_evm_uart_defconfig > F: configs/am43xx_hs_evm_defconfig > diff --git a/arch/arm/mach-k3/config_secure.mk b/arch/arm/mach-k3/config_secure.mk > deleted file mode 100644 > index 9cc1f9eb24f..00000000000 > --- a/arch/arm/mach-k3/config_secure.mk > +++ /dev/null > @@ -1,44 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0 > -# > -# Copyright (C) 2018 Texas Instruments, Incorporated - http://www.ti.com/ > -# Andrew F. Davis <afd@ti.com> > - > -quiet_cmd_k3secureimg = SECURE $@ > -ifneq ($(TI_SECURE_DEV_PKG),) > -ifneq ($(wildcard $(TI_SECURE_DEV_PKG)/scripts/secure-binary-image.sh),) > -cmd_k3secureimg = $(TI_SECURE_DEV_PKG)/scripts/secure-binary-image.sh \ > - $< $@ \ > - $(if $(KBUILD_VERBOSE:1=), >/dev/null) > -else > -cmd_k3secureimg = echo "WARNING:" \ > - "$(TI_SECURE_DEV_PKG)/scripts/secure-binary-image.sh not found." \ > - "$@ was NOT secured!"; cp $< $@ > -endif > -else > -cmd_k3secureimg = echo "WARNING: TI_SECURE_DEV_PKG environment" \ > - "variable must be defined for TI secure devices." \ > - "$@ was NOT secured!"; cp $< $@ > -endif > - > -%.dtb_HS: %.dtb FORCE > - $(call if_changed,k3secureimg) > - > -$(obj)/u-boot-spl-nodtb.bin_HS: $(obj)/u-boot-spl-nodtb.bin FORCE > - $(call if_changed,k3secureimg) > - > -tispl.bin_HS: $(obj)/u-boot-spl-nodtb.bin_HS $(patsubst %,$(obj)/dts/%.dtb_HS,$(subst ",,$(CONFIG_SPL_OF_LIST))) $(SPL_ITS) FORCE > - $(call if_changed,mkfitimage) > - > -MKIMAGEFLAGS_u-boot.img_HS = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ > - -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ > - -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ > - $(patsubst %,-b arch/$(ARCH)/dts/%.dtb_HS,$(subst ",,$(CONFIG_OF_LIST))) > - > -OF_LIST_TARGETS = $(patsubst %,arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) > -$(OF_LIST_TARGETS): dtbs > - > -u-boot-nodtb.bin_HS: u-boot-nodtb.bin FORCE > - $(call if_changed,k3secureimg) > - > -u-boot.img_HS: u-boot-nodtb.bin_HS u-boot.img $(patsubst %.dtb,%.dtb_HS,$(OF_LIST_TARGETS)) FORCE > - $(call if_changed,mkimage)
On Thu, Oct 05, 2023 at 09:21:17AM -0500, Andrew Davis wrote: > This is now done using binman but this file was leftover and is now > unused, remove it. > > Signed-off-by: Andrew Davis <afd@ti.com> > Reviewed-by: Neha Malcom Francis <n-francis@ti.com> Applied to u-boot/master, thanks!
diff --git a/MAINTAINERS b/MAINTAINERS index 4df79254dfe..de4711721b2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1548,7 +1548,6 @@ F: arch/arm/mach-omap2/omap5/sec_entry_cpu1.S F: arch/arm/mach-omap2/sec-common.c F: arch/arm/mach-omap2/config_secure.mk F: arch/arm/mach-k3/security.c -F: arch/arm/mach-k3/config_secure.mk F: configs/am335x_hs_evm_defconfig F: configs/am335x_hs_evm_uart_defconfig F: configs/am43xx_hs_evm_defconfig diff --git a/arch/arm/mach-k3/config_secure.mk b/arch/arm/mach-k3/config_secure.mk deleted file mode 100644 index 9cc1f9eb24f..00000000000 --- a/arch/arm/mach-k3/config_secure.mk +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Copyright (C) 2018 Texas Instruments, Incorporated - http://www.ti.com/ -# Andrew F. Davis <afd@ti.com> - -quiet_cmd_k3secureimg = SECURE $@ -ifneq ($(TI_SECURE_DEV_PKG),) -ifneq ($(wildcard $(TI_SECURE_DEV_PKG)/scripts/secure-binary-image.sh),) -cmd_k3secureimg = $(TI_SECURE_DEV_PKG)/scripts/secure-binary-image.sh \ - $< $@ \ - $(if $(KBUILD_VERBOSE:1=), >/dev/null) -else -cmd_k3secureimg = echo "WARNING:" \ - "$(TI_SECURE_DEV_PKG)/scripts/secure-binary-image.sh not found." \ - "$@ was NOT secured!"; cp $< $@ -endif -else -cmd_k3secureimg = echo "WARNING: TI_SECURE_DEV_PKG environment" \ - "variable must be defined for TI secure devices." \ - "$@ was NOT secured!"; cp $< $@ -endif - -%.dtb_HS: %.dtb FORCE - $(call if_changed,k3secureimg) - -$(obj)/u-boot-spl-nodtb.bin_HS: $(obj)/u-boot-spl-nodtb.bin FORCE - $(call if_changed,k3secureimg) - -tispl.bin_HS: $(obj)/u-boot-spl-nodtb.bin_HS $(patsubst %,$(obj)/dts/%.dtb_HS,$(subst ",,$(CONFIG_SPL_OF_LIST))) $(SPL_ITS) FORCE - $(call if_changed,mkfitimage) - -MKIMAGEFLAGS_u-boot.img_HS = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ - -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ - -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ - $(patsubst %,-b arch/$(ARCH)/dts/%.dtb_HS,$(subst ",,$(CONFIG_OF_LIST))) - -OF_LIST_TARGETS = $(patsubst %,arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) -$(OF_LIST_TARGETS): dtbs - -u-boot-nodtb.bin_HS: u-boot-nodtb.bin FORCE - $(call if_changed,k3secureimg) - -u-boot.img_HS: u-boot-nodtb.bin_HS u-boot.img $(patsubst %.dtb,%.dtb_HS,$(OF_LIST_TARGETS)) FORCE - $(call if_changed,mkimage)
This is now done using binman but this file was leftover and is now unused, remove it. Signed-off-by: Andrew Davis <afd@ti.com> --- MAINTAINERS | 1 - arch/arm/mach-k3/config_secure.mk | 44 ------------------------------- 2 files changed, 45 deletions(-) delete mode 100644 arch/arm/mach-k3/config_secure.mk