diff options
| author | Yann Gautier <yann.gautier@foss.st.com> | 2023-09-20 15:12:26 +0200 |
|---|---|---|
| committer | Yann Gautier <yann.gautier@st.com> | 2023-10-23 11:56:30 +0200 |
| commit | 9f72f5eac81c23fe39415b2346b112f64fba8610 (patch) | |
| tree | dd44b3ee84745ecbaad5b21576d10be59efb5f2b /plat | |
| parent | d1a974a3b7059bd87d28bca3dc66519ba8d0eafc (diff) | |
fix(st): properly check LOADADDR
LOADADDR variable is retrieved from line starting with RAM in map file.
But if the build path contains RAM, this keywords will appear several
times and the grep will fail. Correct that by really checking the line
starting with RAM thanks to grep '^RAM'.
Change-Id: I2ce23edb5255028b1a56ba45c16569a42ae21ae2
Signed-off-by: Yann Gautier <yann.gautier@foss.st.com>
Reviewed-on: https://gerrit.st.com/c/mpu/oe/st/tf-a/+/328648
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/st/common/common_rules.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plat/st/common/common_rules.mk b/plat/st/common/common_rules.mk index fa48dfcff..8d545660f 100644 --- a/plat/st/common/common_rules.mk +++ b/plat/st/common/common_rules.mk @@ -68,7 +68,7 @@ tf-a-%.bin: tf-a-%.elf tf-a-%.stm32: tf-a-%.bin ${STM32_DEPS} @echo @echo "Generate $@" - $(eval LOADADDR = $(shell cat $(@:.stm32=.map) | grep RAM | awk '{print $$2}')) + $(eval LOADADDR = $(shell cat $(@:.stm32=.map) | grep '^RAM' | awk '{print $$2}')) $(eval ENTRY = $(shell cat $(@:.stm32=.map) | grep "__BL2_IMAGE_START" | awk '{print $$1}')) ${Q}${STM32IMAGE} -s $< -d $@ \ -l $(LOADADDR) -e ${ENTRY} \ |