From 3ed724444352fee193e5177990dd48760ae3cc9d Mon Sep 17 00:00:00 2001 From: Chris Kay Date: Tue, 4 Jun 2024 11:31:06 +0000 Subject: [PATCH] build(rzg-layout): split combined targets This is a small change to split up the generation of the RZ/G 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: I81251ac647b85c5eec8f910ddc841a5a32b49e67 Signed-off-by: Chris Kay --- changelog.yaml | 4 +++ tools/renesas/rzg_layout_create/makefile | 35 ++++++++++++++---------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/changelog.yaml b/changelog.yaml index 302546e01..55fbba4f9 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -1434,6 +1434,10 @@ subsections: subsections: - title: R-Car Layout Tool scope: rcar-layout + + - title: R/ZG Layout Tool + scope: rzg-layout + - title: Dependencies scope: deps diff --git a/tools/renesas/rzg_layout_create/makefile b/tools/renesas/rzg_layout_create/makefile index d2a54ea33..1e8f7ff71 100644 --- a/tools/renesas/rzg_layout_create/makefile +++ b/tools/renesas/rzg_layout_create/makefile @@ -1,4 +1,5 @@ # +# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved. # Copyright (c) 2020, Renesas Electronics Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause @@ -82,27 +83,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