diff options
| author | Terry Zhou <bjzhou@marvell.com> | 2017-04-18 09:29:17 +0800 |
|---|---|---|
| committer | Hua Jing <jinghua@marvell.com> | 2017-04-26 10:32:31 +0300 |
| commit | b771205b24351039fb294f43d29e86a4f60b958a (patch) | |
| tree | 903d6b4474fe194dc3e8f301d8ccea64efd2894f | |
| parent | 70e2b016430856b76c0e906597070098ed9e4e53 (diff) | |
fix: a3700: restore timn image in uart trusted build
- The TIMN image is missing in Armada3700 build folder,
which is one of the image components needed by the
recovery procedure. Makefile is supposed to get the
image filename from atf_timN.txt and it defines a
variable to parse the filename in the atf_timN.txt.
But the atf_timN.txt is dynamically generated. It
doesn't exist when this variable is initialized (if
ATF performs a clean build).
- This patch is to change this global variable as the
second-expansion of shell command in Makefile. So
that the shell will execute the enclosed command only
when the Makefile is referring this variable
Change-Id: Iba39377cc2752c42bcb0ecbd854f8a9e57e1353d
Signed-off-by: Terry Zhou <bjzhou@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/38699
Tested-by: iSoC Platform CI <ykjenk@marvell.com>
Reviewed-by: Hua Jing <jinghua@marvell.com>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -469,7 +469,7 @@ IMAGESPATH := $(DOIMAGEPATH)/trusted TIMNCFG := $(DOIMAGEPATH)/atf-timN.txt TIMNSIG := $(IMAGESPATH)/timnsign.txt TIM2IMGARGS := -i $(DOIMAGE_CFG) -n $(TIMNCFG) -TIMN_IMAGE := $(shell grep "Image Filename:" -m 1 $(TIMNCFG) | cut -c 17-) +TIMN_IMAGE := $$(grep "Image Filename:" -m 1 $(TIMNCFG) | cut -c 17-) else #MARVELL_SECURE_BOOT DOIMAGETOOL := $(DOIMAGEPATH)/wtptp_tool/linux/ntbb_linux.exe DOIMAGE_CFG := $(DOIMAGEPATH)/atf-ntim.txt |