From ea2c6521ca1ba42e00545110ea955fc24606d671 Mon Sep 17 00:00:00 2001 From: Chris Kay Date: Tue, 4 Jun 2024 11:31:06 +0000 Subject: [PATCH] build(rcar-layout): split combined targets This is a small change to split up the generation of the R-Car layout images into unique targets. This is predominantly for cleanliness reasons - Make current doesn't know about the `.bin` and `.srec` binaries generated by the `.elf` target. Change-Id: I624bc0c62e99cead66a6d6e25ff016aecf6b985a Signed-off-by: Chris Kay --- changelog.yaml | 6 ++++ tools/renesas/rcar_layout_create/makefile | 35 +++++++++++++---------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/changelog.yaml b/changelog.yaml index 5655603f4..302546e01 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -1428,6 +1428,12 @@ subsections: - title: Marvell Tools scope: marvell-tools + - title: Renesas Tools + scope: renesas-tools + + subsections: + - title: R-Car Layout Tool + scope: rcar-layout - title: Dependencies scope: deps diff --git a/tools/renesas/rcar_layout_create/makefile b/tools/renesas/rcar_layout_create/makefile index 8c2c054d7..115ca5c63 100644 --- a/tools/renesas/rcar_layout_create/makefile +++ b/tools/renesas/rcar_layout_create/makefile @@ -1,4 +1,5 @@ # +# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved. # Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause @@ -85,27 +86,31 @@ CL = rm -f # command .PHONY: all -all: $(OUTPUT_FILE_SA0) $(OUTPUT_FILE_SA6) + +all: $(FILE_NAME_SA0).srec $(FILE_NAME_SA0).bin +all: $(FILE_NAME_SA6).srec $(FILE_NAME_SA6).bin + ################################################### # Linker ################################################### -$(OUTPUT_FILE_SA0) : $(MEMORY_DEF_SA0) $(OBJ_FILE_SA0) - $(aarch64-ld) $(OBJ_FILE_SA0) -nostdlib \ - -T $(MEMORY_DEF_SA0) \ - -o $(OUTPUT_FILE_SA0) \ - -Wl,-Map $(FILE_NAME_SA0).map \ - $(aarch64-oc) -O srec --adjust-vma=$(RCAR_VMA_ADJUST_ADDR) --srec-forceS3 $(OUTPUT_FILE_SA0) $(FILE_NAME_SA0).srec - $(aarch64-oc) -O binary --adjust-vma=$(RCAR_VMA_ADJUST_ADDR) --srec-forceS3 $(OUTPUT_FILE_SA0) $(FILE_NAME_SA0).bin +$(FILE_NAME_SA0).srec: $(OUTPUT_FILE_SA0) + $(aarch64-oc) -O srec --adjust-vma=$(RCAR_VMA_ADJUST_ADDR) --srec-forceS3 $(OUTPUT_FILE_SA0) $(FILE_NAME_SA0).srec -$(OUTPUT_FILE_SA6) : $(MEMORY_DEF_SA6) $(OBJ_FILE_SA6) - $(aarch64-ld) $(OBJ_FILE_SA6) -nostdlib \ - -T $(MEMORY_DEF_SA6) \ - -o $(OUTPUT_FILE_SA6) \ - -Wl,-Map $(FILE_NAME_SA6).map \ +$(FILE_NAME_SA0).bin: $(OUTPUT_FILE_SA0) + $(aarch64-oc) -O binary --adjust-vma=$(RCAR_VMA_ADJUST_ADDR) --srec-forceS3 $(OUTPUT_FILE_SA0) $(FILE_NAME_SA0).bin - $(aarch64-oc) -O srec --adjust-vma=$(RCAR_VMA_ADJUST_ADDR) --srec-forceS3 $(OUTPUT_FILE_SA6) $(FILE_NAME_SA6).srec - $(aarch64-oc) -O binary --adjust-vma=$(RCAR_VMA_ADJUST_ADDR) --srec-forceS3 $(OUTPUT_FILE_SA6) $(FILE_NAME_SA6).bin +$(OUTPUT_FILE_SA0): $(MEMORY_DEF_SA0) $(OBJ_FILE_SA0) + $(aarch64-ld) $(OBJ_FILE_SA0) -nostdlib -T $(MEMORY_DEF_SA0) -o $(OUTPUT_FILE_SA0) -Wl,-Map $(FILE_NAME_SA0).map + +$(FILE_NAME_SA6).srec: $(OUTPUT_FILE_SA6) + $(aarch64-oc) -O srec --adjust-vma=$(RCAR_VMA_ADJUST_ADDR) --srec-forceS3 $(OUTPUT_FILE_SA6) $(FILE_NAME_SA6).srec + +$(FILE_NAME_SA6).bin: $(OUTPUT_FILE_SA6) + $(aarch64-oc) -O binary --adjust-vma=$(RCAR_VMA_ADJUST_ADDR) --srec-forceS3 $(OUTPUT_FILE_SA6) $(FILE_NAME_SA6).bin + +$(OUTPUT_FILE_SA6): $(MEMORY_DEF_SA6) $(OBJ_FILE_SA6) + $(aarch64-ld) $(OBJ_FILE_SA6) -nostdlib -T $(MEMORY_DEF_SA6) -o $(OUTPUT_FILE_SA6) -Wl,-Map $(FILE_NAME_SA6).map ################################################### # Compile