]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - atf/arm-trusted-firmware.git/commitdiff
plat: marvell: armada: a3k: Use make ifeq/endif syntax for $(MARVELL_SECURE_BOOT...
authorPali Rohár <pali@kernel.org>
Mon, 23 Nov 2020 18:37:28 +0000 (19:37 +0100)
committerManish Pandey <manish.pandey2@arm.com>
Mon, 7 Dec 2020 11:05:20 +0000 (11:05 +0000)
Signed-off-by: Pali Rohár <pali@kernel.org>
Change-Id: Id766db4a900a56c795fe5ffdd8a2b80b1aaa2132

plat/marvell/armada/a3k/common/a3700_common.mk

index fccd4868c41cefc27817d0f1ea5ea193615e5791..437f5d050b81e9966515bc671a144625e4d064be 100644 (file)
@@ -170,11 +170,15 @@ ifeq ($(MARVELL_SECURE_BOOT),1)
 endif
        $(DOIMAGETOOL) $(DOIMAGE_FLAGS)
        @if [ -e "$(TIMNCFG)" ]; then $(DOIMAGETOOL) -r $(TIMNCFG); fi
-       @if [ "$(MARVELL_SECURE_BOOT)" = "1" ]; then sed -i 's|$(WTMI_MULTI_IMG)|$(WTMI_ENC_IMG)|1;s|$(BOOT_IMAGE)|$(BOOT_ENC_IMAGE)|1;' $(TIMNCFG); fi
+ifeq ($(MARVELL_SECURE_BOOT),1)
+       @sed -i 's|$(WTMI_MULTI_IMG)|$(WTMI_ENC_IMG)|1;s|$(BOOT_IMAGE)|$(BOOT_ENC_IMAGE)|1;' $(TIMNCFG)
+endif
        $(TIM2IMG) $(TIM2IMGARGS) -o $(BUILD_PLAT)/$(FLASH_IMAGE)
        @mv -t $(BUILD_PLAT) $(TIM_IMAGE) $(DOIMAGE_CFG) $(TIMN_IMAGE) $(TIMNCFG)
        @cp -t $(BUILD_PLAT) $(WTMI_IMG) $(WTMI_SYSINIT_IMG) $(WTMI_MULTI_IMG)
-       @if [ "$(MARVELL_SECURE_BOOT)" = "1" ]; then mv -t $(BUILD_PLAT) OtpHash.txt; fi
+ifeq ($(MARVELL_SECURE_BOOT),1)
+       @mv -t $(BUILD_PLAT) OtpHash.txt
+endif
        @find . -name "*.txt" | grep -E "CSK[[:alnum:]]_KeyHash.txt|Tim_msg.txt|TIMHash.txt" | xargs rm -f
 
 else # ${WTP}