mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-08 05:43:53 +00:00
Merge changes from topic "makefile-cleanup" into integration
* changes: build: improve diagnostics for unrecognized toolchain tools build(rzg): separate BL2 and BL31 SREC generation build(rcar): separate BL2 and BL31 SREC generation build: separate preprocessing from DTB compilation build: remove `MAKE_BUILD_STRINGS` function
This commit is contained in:
Manish V Badarkhe
TrustedFirmware Code Review
commit
ee9cfaccab
24 changed files with 293 additions and 167 deletions
11
Makefile
11
Makefile
|
|
@ -372,6 +372,15 @@ endif
|
|||
################################################################################
|
||||
include lib/compiler-rt/compiler-rt.mk
|
||||
|
||||
# Allow overriding the timestamp, for example for reproducible builds, or to
|
||||
# synchronize timestamps across multiple projects.
|
||||
# This must be set to a C string (including quotes where applicable).
|
||||
BUILD_MESSAGE_TIMESTAMP ?= __TIME__", "__DATE__
|
||||
|
||||
DEFINES += -DBUILD_MESSAGE_TIMESTAMP='$(BUILD_MESSAGE_TIMESTAMP)'
|
||||
DEFINES += -DBUILD_MESSAGE_VERSION_STRING='"$(VERSION_STRING)"'
|
||||
DEFINES += -DBUILD_MESSAGE_VERSION='"$(VERSION)"'
|
||||
|
||||
BL_COMMON_SOURCES += common/bl_common.c \
|
||||
common/tf_log.c \
|
||||
common/${ARCH}/debug.S \
|
||||
|
|
@ -1682,7 +1691,7 @@ else
|
|||
endif #(UNIX_MK)
|
||||
|
||||
romlib.bin: libraries FORCE
|
||||
${Q}${MAKE} PLAT_DIR=${PLAT_DIR} BUILD_PLAT=${BUILD_PLAT} ENABLE_BTI=${ENABLE_BTI} ARM_ARCH_MINOR=${ARM_ARCH_MINOR} INCLUDES='${INCLUDES}' DEFINES='${DEFINES}' --no-print-directory -C ${ROMLIBPATH} all
|
||||
${Q}${MAKE} PLAT_DIR=${PLAT_DIR} BUILD_PLAT=${BUILD_PLAT} ENABLE_BTI=${ENABLE_BTI} ARM_ARCH_MINOR=${ARM_ARCH_MINOR} INCLUDES=$(call escape-shell,$(INCLUDES)) DEFINES=$(call escape-shell,$(DEFINES)) --no-print-directory -C ${ROMLIBPATH} all
|
||||
|
||||
memmap: all
|
||||
ifdef UNIX_MK
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#include <arch_helpers.h>
|
||||
#include <bl1/bl1.h>
|
||||
#include <common/bl_common.h>
|
||||
#include <common/build_message.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/auth/auth_mod.h>
|
||||
#include <drivers/auth/crypto_mod.h>
|
||||
|
|
@ -73,7 +74,7 @@ void bl1_main(void)
|
|||
|
||||
/* Announce our arrival */
|
||||
NOTICE(FIRMWARE_WELCOME_STR);
|
||||
NOTICE("BL1: %s\n", version_string);
|
||||
NOTICE("BL1: %s\n", build_version_string);
|
||||
NOTICE("BL1: %s\n", build_message);
|
||||
|
||||
INFO("BL1: RAM %p - %p\n", (void *)BL1_RAM_BASE, (void *)BL1_RAM_LIMIT);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2013-2023, Arm Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2013-2024, Arm Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -11,6 +11,7 @@
|
|||
#include <bl1/bl1.h>
|
||||
#include <bl2/bl2.h>
|
||||
#include <common/bl_common.h>
|
||||
#include <common/build_message.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/auth/auth_mod.h>
|
||||
#include <drivers/auth/crypto_mod.h>
|
||||
|
|
@ -92,7 +93,7 @@ void bl2_main(void)
|
|||
PMF_CAPTURE_TIMESTAMP(bl_svc, BL2_ENTRY, PMF_CACHE_MAINT);
|
||||
#endif
|
||||
|
||||
NOTICE("BL2: %s\n", version_string);
|
||||
NOTICE("BL2: %s\n", build_version_string);
|
||||
NOTICE("BL2: %s\n", build_message);
|
||||
|
||||
/* Perform remaining generic architectural setup in S-EL1 */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2024, Arm Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -14,6 +14,7 @@
|
|||
#include <bl1/bl1.h>
|
||||
#include <bl2u/bl2u.h>
|
||||
#include <common/bl_common.h>
|
||||
#include <common/build_message.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/auth/auth_mod.h>
|
||||
#include <drivers/console.h>
|
||||
|
|
@ -27,7 +28,7 @@
|
|||
******************************************************************************/
|
||||
void bl2u_main(void)
|
||||
{
|
||||
NOTICE("BL2U: %s\n", version_string);
|
||||
NOTICE("BL2U: %s\n", build_version_string);
|
||||
NOTICE("BL2U: %s\n", build_message);
|
||||
|
||||
#if SCP_BL2U_BASE
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2013-2023, Arm Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2013-2024, Arm Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
#include <bl31/bl31.h>
|
||||
#include <bl31/ehf.h>
|
||||
#include <common/bl_common.h>
|
||||
#include <common/build_message.h>
|
||||
#include <common/debug.h>
|
||||
#include <common/feat_detect.h>
|
||||
#include <common/runtime_svc.h>
|
||||
|
|
@ -128,7 +129,7 @@ void bl31_main(void)
|
|||
/* Init per-world context registers for non-secure world */
|
||||
manage_extensions_nonsecure_per_world();
|
||||
|
||||
NOTICE("BL31: %s\n", version_string);
|
||||
NOTICE("BL31: %s\n", build_version_string);
|
||||
NOTICE("BL31: %s\n", build_message);
|
||||
|
||||
#if FEATURE_DETECTION
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2023, Arm Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2016-2024, Arm Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -14,6 +14,7 @@
|
|||
#include <arch.h>
|
||||
#include <arch_helpers.h>
|
||||
#include <common/bl_common.h>
|
||||
#include <common/build_message.h>
|
||||
#include <common/debug.h>
|
||||
#include <common/runtime_svc.h>
|
||||
#include <context.h>
|
||||
|
|
@ -175,7 +176,7 @@ uintptr_t get_arm_std_svc_args(unsigned int svc_mask)
|
|||
*****************************************************************************/
|
||||
void sp_min_main(void)
|
||||
{
|
||||
NOTICE("SP_MIN: %s\n", version_string);
|
||||
NOTICE("SP_MIN: %s\n", build_version_string);
|
||||
NOTICE("SP_MIN: %s\n", build_message);
|
||||
|
||||
/* Perform the SP_MIN platform setup */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2013-2022, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2013-2024, Arm Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -14,6 +14,7 @@
|
|||
#include <arch_helpers.h>
|
||||
#include <bl32/tsp/tsp.h>
|
||||
#include <common/bl_common.h>
|
||||
#include <common/build_message.h>
|
||||
#include <common/debug.h>
|
||||
#include "ffa_helpers.h"
|
||||
#include <lib/psci/psci.h>
|
||||
|
|
@ -554,7 +555,7 @@ uint64_t tsp_main(void)
|
|||
{
|
||||
smc_args_t smc_args = {0};
|
||||
|
||||
NOTICE("TSP: %s\n", version_string);
|
||||
NOTICE("TSP: %s\n", build_version_string);
|
||||
NOTICE("TSP: %s\n", build_message);
|
||||
INFO("TSP: Total memory base : 0x%lx\n", (unsigned long) BL32_BASE);
|
||||
INFO("TSP: Total memory size : 0x%lx bytes\n", BL32_TOTAL_SIZE);
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
#include <arch_helpers.h>
|
||||
#include <bl32/tsp/tsp.h>
|
||||
#include <common/bl_common.h>
|
||||
#include <common/build_message.h>
|
||||
#include <common/debug.h>
|
||||
#include <lib/spinlock.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
|
@ -27,7 +28,7 @@
|
|||
******************************************************************************/
|
||||
uint64_t tsp_main(void)
|
||||
{
|
||||
NOTICE("TSP: %s\n", version_string);
|
||||
NOTICE("TSP: %s\n", build_version_string);
|
||||
NOTICE("TSP: %s\n", build_message);
|
||||
INFO("TSP: Total memory base : 0x%lx\n", (unsigned long) BL32_BASE);
|
||||
INFO("TSP: Total memory size : 0x%lx bytes\n", BL32_TOTAL_SIZE);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2013-2022, Arm Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2013-2024, Arm Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -12,6 +12,7 @@
|
|||
#include <arch_features.h>
|
||||
#include <arch_helpers.h>
|
||||
#include <common/bl_common.h>
|
||||
#include <common/build_message.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/auth/auth_mod.h>
|
||||
#include <drivers/io/io_storage.h>
|
||||
|
|
@ -275,6 +276,5 @@ void print_entry_point_info(const entry_point_info_t *ep_info)
|
|||
*/
|
||||
const char *get_version(void)
|
||||
{
|
||||
extern const char version[];
|
||||
return version;
|
||||
return build_version;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2013-2022, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2013-2024, Arm Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -180,8 +180,6 @@ int load_auth_image(unsigned int image_id, image_info_t *image_data);
|
|||
void dyn_disable_auth(void);
|
||||
#endif
|
||||
|
||||
extern const char build_message[];
|
||||
extern const char version_string[];
|
||||
const char *get_version(void);
|
||||
|
||||
void print_entry_point_info(const entry_point_info_t *ep_info);
|
||||
|
|
|
|||
14
include/common/build_message.h
Normal file
14
include/common/build_message.h
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
/*
|
||||
* Copyright (c) 2024, Arm Limited. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#ifndef BUILD_MESSAGE_H
|
||||
#define BUILD_MESSAGE_H
|
||||
|
||||
static const char build_message[] = "Built : " BUILD_MESSAGE_TIMESTAMP;
|
||||
static const char build_version_string[] = BUILD_MESSAGE_VERSION_STRING;
|
||||
static const char build_version[] = BUILD_MESSAGE_VERSION;
|
||||
|
||||
#endif /* BUILD_MESSAGE_H */
|
||||
|
|
@ -438,11 +438,6 @@ define SOURCES_TO_OBJS
|
|||
$(notdir $(patsubst %.S,%.o,$(filter %.S,$(1))))
|
||||
endef
|
||||
|
||||
# Allow overriding the timestamp, for example for reproducible builds, or to
|
||||
# synchronize timestamps across multiple projects.
|
||||
# This must be set to a C string (including quotes where applicable).
|
||||
BUILD_MESSAGE_TIMESTAMP ?= __TIME__", "__DATE__
|
||||
|
||||
.PHONY: libraries
|
||||
|
||||
# MAKE_LIB_DIRS macro defines the target for the directory where
|
||||
|
|
@ -562,30 +557,19 @@ $(eval OBJS += $(MODULE_OBJS))
|
|||
|
||||
$(ELF): $(OBJS) $(DEFAULT_LINKER_SCRIPT) $(LINKER_SCRIPTS) | $(1)_dirs libraries $(BL_LIBS)
|
||||
$$(ECHO) " LD $$@"
|
||||
ifdef MAKE_BUILD_STRINGS
|
||||
$(call MAKE_BUILD_STRINGS,$(BUILD_DIR)/build_message.o)
|
||||
else
|
||||
@echo 'const char build_message[] = "Built : "$(BUILD_MESSAGE_TIMESTAMP); \
|
||||
const char version_string[] = "${VERSION_STRING}"; \
|
||||
const char version[] = "${VERSION}";' | \
|
||||
$($(ARCH)-cc) $$(TF_CFLAGS) $$(CFLAGS) -xc -c - -o $(BUILD_DIR)/build_message.o
|
||||
endif
|
||||
ifeq ($($(ARCH)-ld-id),arm-link)
|
||||
$$(Q)$($(ARCH)-ld) -o $$@ $$(TF_LDFLAGS) $$(LDFLAGS) $(BL_LDFLAGS) --entry=${1}_entrypoint \
|
||||
--predefine="-D__LINKER__=$(__LINKER__)" \
|
||||
--predefine="-DTF_CFLAGS=$(TF_CFLAGS)" \
|
||||
--map --list="$(MAPFILE)" --scatter=${PLAT_DIR}/scat/${1}.scat \
|
||||
$(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS) \
|
||||
$(BUILD_DIR)/build_message.o $(OBJS)
|
||||
$(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS) $(OBJS)
|
||||
else ifeq ($($(ARCH)-ld-id),gnu-gcc)
|
||||
$$(Q)$($(ARCH)-ld) -o $$@ $$(TF_LDFLAGS) $$(LDFLAGS) $(BL_LDFLAGS) -Wl,-Map=$(MAPFILE) \
|
||||
$(addprefix -Wl$(comma)--script$(comma),$(LINKER_SCRIPTS)) -Wl,--script,$(DEFAULT_LINKER_SCRIPT) \
|
||||
$(BUILD_DIR)/build_message.o \
|
||||
$(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS)
|
||||
else
|
||||
$$(Q)$($(ARCH)-ld) -o $$@ $$(TF_LDFLAGS) $$(LDFLAGS) $(BL_LDFLAGS) -Map=$(MAPFILE) \
|
||||
$(addprefix -T ,$(LINKER_SCRIPTS)) --script $(DEFAULT_LINKER_SCRIPT) \
|
||||
$(BUILD_DIR)/build_message.o \
|
||||
$(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS)
|
||||
endif
|
||||
ifeq ($(DISABLE_BIN_GENERATION),1)
|
||||
|
|
@ -660,12 +644,14 @@ $(eval DTSDEP := $(patsubst %.dtb,%.o.d,$(DOBJ)))
|
|||
# Dependencies of the DT compilation on its pre-compiled DTS
|
||||
$(eval DTBDEP := $(patsubst %.dtb,%.d,$(DOBJ)))
|
||||
|
||||
$(DOBJ): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | fdt_dirs
|
||||
$(DPRE): $(2) | fdt_dirs
|
||||
$${ECHO} " CPP $$<"
|
||||
$(eval DTBS := $(addprefix $(1)/,$(call SOURCES_TO_DTBS,$(2))))
|
||||
$$(Q)$($(ARCH)-cpp) -E $$(TF_CFLAGS_$(ARCH)) $$(DTC_CPPFLAGS) -MT $(DTBS) -MMD -MF $(DTSDEP) -o $(DPRE) $$<
|
||||
|
||||
$(DOBJ): $(DPRE) $(filter-out %.d,$(MAKEFILE_LIST)) | fdt_dirs
|
||||
$${ECHO} " DTC $$<"
|
||||
$$(Q)$($(ARCH)-dtc) $$(DTC_FLAGS) -d $(DTBDEP) -o $$@ $(DPRE)
|
||||
$$(Q)$($(ARCH)-dtc) $$(DTC_FLAGS) -d $(DTBDEP) -o $$@ $$<
|
||||
|
||||
-include $(DTBDEP)
|
||||
-include $(DTSDEP)
|
||||
|
|
|
|||
|
|
@ -17,48 +17,6 @@
|
|||
|
||||
toolchains ?= host $(ARCH)
|
||||
|
||||
ifneq ($(filter host,$(toolchains)),)
|
||||
host-cc := $(HOSTCC)
|
||||
host-cpp := $(HOSTCPP)
|
||||
|
||||
host-as := $(HOSTAS)
|
||||
|
||||
host-ld := $(HOSTLD)
|
||||
host-oc := $(HOSTOC)
|
||||
host-od := $(HOSTOD)
|
||||
host-ar := $(HOSTAR)
|
||||
|
||||
host-dtc := $(HOSTDTC)
|
||||
endif
|
||||
|
||||
ifneq ($(filter aarch32,$(toolchains)),)
|
||||
aarch32-cc := $(if $(filter-out default,$(origin CC)),$(CC))
|
||||
aarch32-cpp := $(if $(filter-out default,$(origin CPP)),$(CPP))
|
||||
|
||||
aarch32-as := $(if $(filter-out default,$(origin AS)),$(AS))
|
||||
|
||||
aarch32-ld := $(if $(filter-out default,$(origin LD)),$(LD))
|
||||
aarch32-oc := $(if $(filter-out default,$(origin OC)),$(OC))
|
||||
aarch32-od := $(if $(filter-out default,$(origin OD)),$(OD))
|
||||
aarch32-ar := $(if $(filter-out default,$(origin AR)),$(AR))
|
||||
|
||||
aarch32-dtc := $(if $(filter-out default,$(origin DTC)),$(DTC))
|
||||
endif
|
||||
|
||||
ifneq ($(filter aarch64,$(toolchains)),)
|
||||
aarch64-cc := $(if $(filter-out default,$(origin CC)),$(CC))
|
||||
aarch64-cpp := $(if $(filter-out default,$(origin CPP)),$(CPP))
|
||||
|
||||
aarch64-as := $(if $(filter-out default,$(origin AS)),$(AS))
|
||||
|
||||
aarch64-ld := $(if $(filter-out default,$(origin LD)),$(LD))
|
||||
aarch64-oc := $(if $(filter-out default,$(origin OC)),$(OC))
|
||||
aarch64-od := $(if $(filter-out default,$(origin OD)),$(OD))
|
||||
aarch64-ar := $(if $(filter-out default,$(origin AR)),$(AR))
|
||||
|
||||
aarch64-dtc := $(if $(filter-out default,$(origin DTC)),$(DTC))
|
||||
endif
|
||||
|
||||
include $(dir $(lastword $(MAKEFILE_LIST)))build_env.mk
|
||||
include $(dir $(lastword $(MAKEFILE_LIST)))utilities.mk
|
||||
|
||||
|
|
@ -72,21 +30,29 @@ include $(addprefix $(dir $(lastword $(MAKEFILE_LIST)))toolchains/, \
|
|||
# or type of tool in the toolchain.
|
||||
#
|
||||
|
||||
# C-related tools
|
||||
tool-classes := cc # C compilers
|
||||
tool-classes += cpp # C preprocessors
|
||||
tool-classes := cc
|
||||
tool-class-name-cc := C compiler
|
||||
|
||||
# Assembly-related tools
|
||||
tool-classes += as # Assemblers
|
||||
tool-classes += cpp
|
||||
tool-class-name-cpp := C preprocessor
|
||||
|
||||
# Linking and object-handling tools
|
||||
tool-classes += ld # Linkers
|
||||
tool-classes += oc # Object copiers
|
||||
tool-classes += od # Object dumpers
|
||||
tool-classes += ar # Archivers
|
||||
tool-classes += as
|
||||
tool-class-name-as := assembler
|
||||
|
||||
# Other tools
|
||||
tool-classes += dtc # Device tree compilers
|
||||
tool-classes += ld
|
||||
tool-class-name-ld := linker
|
||||
|
||||
tool-classes += oc
|
||||
tool-class-name-oc := object copier
|
||||
|
||||
tool-classes += od
|
||||
tool-class-name-od := object dumper
|
||||
|
||||
tool-classes += ar
|
||||
tool-class-name-ar := archiver
|
||||
|
||||
tool-classes += dtc
|
||||
tool-class-name-dtc := device tree compiler
|
||||
|
||||
#
|
||||
# Configure tools that we recognize.
|
||||
|
|
@ -96,28 +62,54 @@ tool-classes += dtc # Device tree compilers
|
|||
# further down.
|
||||
#
|
||||
|
||||
# Arm Compiler for Embedded
|
||||
tools := arm-clang # armclang
|
||||
tools += arm-link # armlink
|
||||
tools += arm-ar # armar
|
||||
tools += arm-fromelf # fromelf
|
||||
# Arm® Compiler for Embedded
|
||||
tools := arm-clang
|
||||
tool-name-arm-clang := Arm® Compiler for Embedded `armclang`
|
||||
|
||||
tools += arm-link
|
||||
tool-name-arm-link := Arm® Compiler for Embedded `armlink`
|
||||
|
||||
tools += arm-ar
|
||||
tool-name-arm-ar := Arm® Compiler for Embedded `armar`
|
||||
|
||||
tools += arm-fromelf
|
||||
tool-name-arm-fromelf := Arm® Compiler for Embedded `fromelf`
|
||||
|
||||
# LLVM Project
|
||||
tools += llvm-clang # clang
|
||||
tools += llvm-lld # lld
|
||||
tools += llvm-objcopy # llvm-objcopy
|
||||
tools += llvm-objdump # llvm-objdump
|
||||
tools += llvm-ar # llvm-ar
|
||||
tools += llvm-clang
|
||||
tool-name-llvm-clang := LLVM Clang (`clang`)
|
||||
|
||||
tools += llvm-lld
|
||||
tool-name-llvm-lld := LLVM LLD (`lld`)
|
||||
|
||||
tools += llvm-objcopy
|
||||
tool-name-llvm-objcopy := LLVM `llvm-objcopy`
|
||||
|
||||
tools += llvm-objdump
|
||||
tool-name-llvm-objdump := LLVM `llvm-objdump`
|
||||
|
||||
tools += llvm-ar
|
||||
tool-name-llvm-ar := LLVM `llvm-ar`
|
||||
|
||||
# GNU Compiler Collection & GNU Binary Utilities
|
||||
tools += gnu-gcc # gcc
|
||||
tools += gnu-ld # ld
|
||||
tools += gnu-objcopy # objcopy
|
||||
tools += gnu-objdump # objdump
|
||||
tools += gnu-ar # gcc-ar
|
||||
tools += gnu-gcc
|
||||
tool-name-gnu-gcc := GNU GCC (`gcc`)
|
||||
|
||||
tools += gnu-ld
|
||||
tool-name-gnu-ld := GNU LD (`ld.bfd`)
|
||||
|
||||
tools += gnu-objcopy
|
||||
tool-name-gnu-objcopy := GNU `objcopy`
|
||||
|
||||
tools += gnu-objdump
|
||||
tool-name-gnu-objdump := GNU `objdump`
|
||||
|
||||
tools += gnu-ar
|
||||
tool-name-gnu-ar := GNU `ar`
|
||||
|
||||
# Other tools
|
||||
tools += dtc # Device Tree Compiler
|
||||
tools += generic-dtc
|
||||
tool-name-generic-dtc := Device Tree Compiler (`dtc`)
|
||||
|
||||
#
|
||||
# Assign tools to tool classes.
|
||||
|
|
@ -142,7 +134,7 @@ tools-od := arm-fromelf llvm-objdump gnu-objdump # Object dumpers
|
|||
tools-ar := arm-ar llvm-ar gnu-ar # Archivers
|
||||
|
||||
# Other tools
|
||||
tools-dtc := dtc # Device tree compilers
|
||||
tools-dtc := generic-dtc # Device tree compilers
|
||||
|
||||
define check-tool-class-tools
|
||||
$(eval tool-class := $(1))
|
||||
|
|
@ -224,27 +216,27 @@ $(foreach toolchain,$(toolchains), \
|
|||
#
|
||||
|
||||
# Arm Compiler for Embedded
|
||||
guess-tool-arm-clang = $(shell $(call escape-shell,$(1)) --version 2>&1 <$(nul) | grep -o "Tool: armclang")
|
||||
guess-tool-arm-link = $(shell $(call escape-shell,$(1)) --help 2>&1 <$(nul) | grep -o "Tool: armlink")
|
||||
guess-tool-arm-fromelf = $(shell $(call escape-shell,$(1)) --help 2>&1 <$(nul) | grep -o "Tool: fromelf")
|
||||
guess-tool-arm-ar = $(shell $(call escape-shell,$(1)) --version 2>&1 <$(nul) | grep -o "Tool: armar")
|
||||
guess-tool-arm-clang = $(shell $(call escape-shell,$(1)) --version 2>&1 <$(nul) | grep -o "Tool: armclang")
|
||||
guess-tool-arm-link = $(shell $(call escape-shell,$(1)) --help 2>&1 <$(nul) | grep -o "Tool: armlink")
|
||||
guess-tool-arm-fromelf = $(shell $(call escape-shell,$(1)) --help 2>&1 <$(nul) | grep -o "Tool: fromelf")
|
||||
guess-tool-arm-ar = $(shell $(call escape-shell,$(1)) --version 2>&1 <$(nul) | grep -o "Tool: armar")
|
||||
|
||||
# LLVM Project
|
||||
guess-tool-llvm-clang = $(shell $(call escape-shell,$(1)) -v 2>&1 <$(nul) | grep -o "clang version")
|
||||
guess-tool-llvm-lld = $(shell $(call escape-shell,$(1)) --help 2>&1 <$(nul) | grep -o "OVERVIEW: lld")
|
||||
guess-tool-llvm-objcopy = $(shell $(call escape-shell,$(1)) --help 2>&1 <$(nul) | grep -o "llvm-objcopy tool")
|
||||
guess-tool-llvm-objdump = $(shell $(call escape-shell,$(1)) --help 2>&1 <$(nul) | grep -o "llvm object file dumper")
|
||||
guess-tool-llvm-ar = $(shell $(call escape-shell,$(1)) --help 2>&1 <$(nul) | grep -o "LLVM Archiver")
|
||||
guess-tool-llvm-clang = $(shell $(call escape-shell,$(1)) -v 2>&1 <$(nul) | grep -o "clang version")
|
||||
guess-tool-llvm-lld = $(shell $(call escape-shell,$(1)) --help 2>&1 <$(nul) | grep -o "OVERVIEW: lld")
|
||||
guess-tool-llvm-objcopy = $(shell $(call escape-shell,$(1)) --help 2>&1 <$(nul) | grep -o "llvm-objcopy tool")
|
||||
guess-tool-llvm-objdump = $(shell $(call escape-shell,$(1)) --help 2>&1 <$(nul) | grep -o "llvm object file dumper")
|
||||
guess-tool-llvm-ar = $(shell $(call escape-shell,$(1)) --help 2>&1 <$(nul) | grep -o "LLVM Archiver")
|
||||
|
||||
# GNU Compiler Collection & GNU Binary Utilities
|
||||
guess-tool-gnu-gcc = $(shell $(call escape-shell,$(1)) -v 2>&1 <$(nul) | grep -o "gcc version")
|
||||
guess-tool-gnu-ld = $(shell $(call escape-shell,$(1)) -v 2>&1 <$(nul) | grep -o "GNU ld")
|
||||
guess-tool-gnu-objcopy = $(shell $(call escape-shell,$(1)) --version 2>&1 <$(nul) | grep -o "GNU objcopy")
|
||||
guess-tool-gnu-objdump = $(shell $(call escape-shell,$(1)) --version 2>&1 <$(nul) | grep -o "GNU objdump")
|
||||
guess-tool-gnu-ar = $(shell $(call escape-shell,$(1)) --version 2>&1 <$(nul) | grep -o "GNU ar")
|
||||
guess-tool-gnu-gcc = $(shell $(call escape-shell,$(1)) -v 2>&1 <$(nul) | grep -o "gcc version")
|
||||
guess-tool-gnu-ld = $(shell $(call escape-shell,$(1)) -v 2>&1 <$(nul) | grep -o "GNU ld")
|
||||
guess-tool-gnu-objcopy = $(shell $(call escape-shell,$(1)) --version 2>&1 <$(nul) | grep -o "GNU objcopy")
|
||||
guess-tool-gnu-objdump = $(shell $(call escape-shell,$(1)) --version 2>&1 <$(nul) | grep -o "GNU objdump")
|
||||
guess-tool-gnu-ar = $(shell $(call escape-shell,$(1)) --version 2>&1 <$(nul) | grep -o "GNU ar")
|
||||
|
||||
# Other tools
|
||||
guess-tool-dtc = $(shell $(call escape-shell,$(1)) --version 2>&1 <$(nul) | grep -o "Version: DTC")
|
||||
guess-tool-generic-dtc = $(shell $(call escape-shell,$(1)) --version 2>&1 <$(nul) | grep -o "Version: DTC")
|
||||
|
||||
guess-tool = $(firstword $(foreach candidate,$(1), \
|
||||
$(if $(call guess-tool-$(candidate),$(2)),$(candidate))))
|
||||
|
|
@ -294,11 +286,44 @@ guess-gnu-gcc-oc = $(shell $(call escape-shell,$(1)) --print-prog-name objcopy 2
|
|||
guess-gnu-gcc-od = $(shell $(call escape-shell,$(1)) --print-prog-name objdump 2>$(nul))
|
||||
guess-gnu-gcc-ar = $(call which,$(call decompat-path,$(patsubst %$(call file-name,$(1)),%$(subst gcc,gcc-ar,$(call file-name,$(1))),$(call compat-path,$(1)))))
|
||||
|
||||
define warn-unrecognized-tool
|
||||
$(eval toolchain := $(1))
|
||||
$(eval tool-class := $(2))
|
||||
|
||||
$$(warning )
|
||||
$$(warning The configured $$($(toolchain)-name) $$(tool-class-name-$(tool-class)) could not be identified and may not be supported:)
|
||||
$$(warning )
|
||||
$$(warning $$(space) $$($(toolchain)-$(tool-class)))
|
||||
$$(warning )
|
||||
$$(warning The default $$($(toolchain)-name) $$(tool-class-name-$(tool-class)) is:)
|
||||
$$(warning )
|
||||
$$(warning $$(space) $$($(toolchain)-$(tool-class)-default))
|
||||
$$(warning )
|
||||
$$(warning The following tools are supported:)
|
||||
$$(warning )
|
||||
|
||||
$$(foreach tool,$$(tools-$(tool-class)), \
|
||||
$$(warning $$(space) - $$(tool-name-$$(tool))))
|
||||
|
||||
$$(warning )
|
||||
$$(warning The build system will treat this $$(tool-class-name-$(tool-class)) as $$(tool-name-$$($(toolchain)-$(tool-class)-id-default)).)
|
||||
$$(warning )
|
||||
endef
|
||||
|
||||
define locate-toolchain-tool-cc
|
||||
$(eval toolchain := $(1))
|
||||
|
||||
$(toolchain)-cc := $$(or $$($(toolchain)-cc),$$($(toolchain)-cc-default))
|
||||
$(toolchain)-cc-id := $$(call guess-tool,$$(tools-cc),$$($(toolchain)-cc))
|
||||
|
||||
ifndef $(toolchain)-cc-id
|
||||
$(toolchain)-cc-id := $$($(toolchain)-cc-id-default)
|
||||
|
||||
$$(eval $$(call warn-unrecognized-tool,$(toolchain),cc))
|
||||
endif
|
||||
|
||||
$(toolchain)-cc-path := $$($(toolchain)-cc)
|
||||
$(toolchain)-cc := $$(call escape-shell,$$($(toolchain)-cc))
|
||||
endef
|
||||
|
||||
define locate-toolchain-tool
|
||||
|
|
@ -308,33 +333,29 @@ define locate-toolchain-tool
|
|||
ifndef $(toolchain)-$(tool-class)
|
||||
$(toolchain)-$(tool-class) := $$(call guess-$$($(toolchain)-cc-id)-$(tool-class),$$($(toolchain)-cc-path))
|
||||
|
||||
ifeq ($$($(toolchain)-$(tool-class)),)
|
||||
ifndef $(toolchain)-$(tool-class)
|
||||
$(toolchain)-$(tool-class) := $$($(toolchain)-$(tool-class)-default)
|
||||
endif
|
||||
endif
|
||||
|
||||
$(toolchain)-$(tool-class)-id := $$(call guess-tool,$$(tools-$(tool-class)),$$($$(toolchain)-$(tool-class)))
|
||||
endef
|
||||
$(toolchain)-$(tool-class)-id := $$(call guess-tool,$$(tools-$(tool-class)),$$($(toolchain)-$(tool-class)))
|
||||
|
||||
define canonicalize-toolchain-tool-path
|
||||
$(eval toolchain := $(1))
|
||||
$(eval tool-class := $(2))
|
||||
ifndef $(toolchain)-$(tool-class)-id
|
||||
$(toolchain)-$(tool-class)-id := $$($(toolchain)-$(tool-class)-id-default)
|
||||
|
||||
$(toolchain)-$(tool-class)-path := $$(call absolute-path,$$(call which,$$($(toolchain)-$(tool-class))))
|
||||
$(toolchain)-$(tool-class)-path := $$(or $$($(toolchain)-$(tool-class)-path),$$($(toolchain)-$(tool-class)))
|
||||
$$(eval $$(call warn-unrecognized-tool,$(toolchain),$(tool-class)))
|
||||
endif
|
||||
|
||||
$(toolchain)-$(tool-class) := $(call escape-shell,$$($(toolchain)-$(tool-class)-path))
|
||||
$(toolchain)-$(tool-class) := $$(call escape-shell,$$($(toolchain)-$(tool-class)))
|
||||
endef
|
||||
|
||||
define locate-toolchain
|
||||
$(eval toolchain := $(1))
|
||||
|
||||
$$(eval $$(call locate-toolchain-tool-cc,$(toolchain)))
|
||||
$$(eval $$(call canonicalize-toolchain-tool-path,$(toolchain),cc))
|
||||
|
||||
$$(foreach tool-class,$$(filter-out cc,$$(tool-classes)), \
|
||||
$$(eval $$(call locate-toolchain-tool,$(toolchain),$$(tool-class))) \
|
||||
$$(eval $$(call canonicalize-toolchain-tool-path,$(toolchain),$$(tool-class))))
|
||||
$$(eval $$(call locate-toolchain-tool,$(toolchain),$$(tool-class))))
|
||||
endef
|
||||
|
||||
$(foreach toolchain,$(toolchains), \
|
||||
|
|
|
|||
|
|
@ -4,11 +4,36 @@
|
|||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
aarch32-name := AArch32
|
||||
|
||||
aarch32-cc := $(if $(filter-out default,$(origin CC)),$(CC))
|
||||
aarch32-cc-default := $(or $(CROSS_COMPILE),arm-none-eabi-)gcc
|
||||
aarch32-cc-id-default := gnu-gcc
|
||||
|
||||
aarch32-cpp := $(if $(filter-out default,$(origin CPP)),$(CPP))
|
||||
aarch32-cpp-default := $(or $(CROSS_COMPILE),arm-none-eabi-)gcc
|
||||
aarch32-cpp-id-default := gnu-gcc
|
||||
|
||||
aarch32-as := $(if $(filter-out default,$(origin AS)),$(AS))
|
||||
aarch32-as-default := $(or $(CROSS_COMPILE),arm-none-eabi-)gcc
|
||||
aarch32-as-id-default := gnu-gcc
|
||||
|
||||
aarch32-ld := $(if $(filter-out default,$(origin LD)),$(LD))
|
||||
aarch32-ld-default := $(or $(CROSS_COMPILE),arm-none-eabi-)gcc
|
||||
aarch32-ld-id-default := gnu-gcc
|
||||
|
||||
aarch32-oc := $(if $(filter-out default,$(origin OC)),$(OC))
|
||||
aarch32-oc-default := $(or $(CROSS_COMPILE),arm-none-eabi-)objcopy
|
||||
aarch32-oc-id-default := gnu-objcopy
|
||||
|
||||
aarch32-od := $(if $(filter-out default,$(origin OD)),$(OD))
|
||||
aarch32-od-default := $(or $(CROSS_COMPILE),arm-none-eabi-)objdump
|
||||
aarch32-od-id-default := gnu-objdump
|
||||
|
||||
aarch32-ar := $(if $(filter-out default,$(origin AR)),$(AR))
|
||||
aarch32-ar-default := $(or $(CROSS_COMPILE),arm-none-eabi-)gcc-ar
|
||||
aarch32-ar-id-default := gnu-ar
|
||||
|
||||
aarch32-dtc := $(if $(filter-out default,$(origin DTC)),$(DTC))
|
||||
aarch32-dtc-default := dtc
|
||||
aarch32-dtc-id-default := generic-dtc
|
||||
|
|
|
|||
|
|
@ -4,11 +4,36 @@
|
|||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
aarch64-name := AArch64
|
||||
|
||||
aarch64-cc := $(if $(filter-out default,$(origin CC)),$(CC))
|
||||
aarch64-cc-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)gcc
|
||||
aarch64-cc-id-default := gnu-gcc
|
||||
|
||||
aarch64-cpp := $(if $(filter-out default,$(origin CPP)),$(CPP))
|
||||
aarch64-cpp-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)gcc
|
||||
aarch64-cpp-id-default := gnu-gcc
|
||||
|
||||
aarch64-as := $(if $(filter-out default,$(origin AS)),$(AS))
|
||||
aarch64-as-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)gcc
|
||||
aarch64-as-id-default := gnu-gcc
|
||||
|
||||
aarch64-ld := $(if $(filter-out default,$(origin LD)),$(LD))
|
||||
aarch64-ld-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)gcc
|
||||
aarch64-ld-id-default := gnu-gcc
|
||||
|
||||
aarch64-oc := $(if $(filter-out default,$(origin OC)),$(OC))
|
||||
aarch64-oc-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)objcopy
|
||||
aarch64-oc-id-default := gnu-objcopy
|
||||
|
||||
aarch64-od := $(if $(filter-out default,$(origin OD)),$(OD))
|
||||
aarch64-od-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)objdump
|
||||
aarch64-od-id-default := gnu-objdump
|
||||
|
||||
aarch64-ar := $(if $(filter-out default,$(origin AR)),$(AR))
|
||||
aarch64-ar-default := $(or $(CROSS_COMPILE),aarch64-none-elf-)gcc-ar
|
||||
aarch64-ar-id-default := gnu-ar
|
||||
|
||||
aarch64-dtc := $(if $(filter-out default,$(origin DTC)),$(DTC))
|
||||
aarch64-dtc-default := dtc
|
||||
aarch64-dtc-id-default := generic-dtc
|
||||
|
|
|
|||
|
|
@ -1,14 +1,39 @@
|
|||
#
|
||||
# Copyright (c) 2023, Arm Limited and Contributors. All rights reserved.
|
||||
# Copyright (c) 2023-2024, Arm Limited and Contributors. All rights reserved.
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
host-name := host
|
||||
|
||||
host-cc := $(HOSTCC)
|
||||
host-cc-default := gcc
|
||||
host-cc-id-default := gnu-gcc
|
||||
|
||||
host-cpp := $(HOSTCPP)
|
||||
host-cpp-default := gcc
|
||||
host-cpp-id-default := gnu-gcc
|
||||
|
||||
host-as := $(HOSTAS)
|
||||
host-as-default := gcc
|
||||
host-as-id-default := gnu-gcc
|
||||
|
||||
host-ld := $(HOSTLD)
|
||||
host-ld-default := gcc
|
||||
host-ld-id-default := gnu-gcc
|
||||
|
||||
host-oc := $(HOSTOC)
|
||||
host-oc-default := objcopy
|
||||
host-oc-id-default := gnu-objcopy
|
||||
|
||||
host-od := $(HOSTOD)
|
||||
host-od-default := objdump
|
||||
host-od-id-default := gnu-objdump
|
||||
|
||||
host-ar := $(HOSTAR)
|
||||
host-ar-default := gcc-ar
|
||||
host-ar-id-default := gnu-ar
|
||||
|
||||
host-dtc := $(HOSTDTC)
|
||||
host-dtc-default := dtc
|
||||
host-dtc-id-default := generic-dtc
|
||||
|
|
|
|||
|
|
@ -4,11 +4,28 @@
|
|||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
rk3399-m0-name := RK3399 M0
|
||||
|
||||
rk3399-m0-cc-default := $(or $(M0_CROSS_COMPILE),arm-none-eabi-)gcc
|
||||
rk3399-m0-cc-id-default := gnu-gcc
|
||||
|
||||
rk3399-m0-cpp-default := $(or $(M0_CROSS_COMPILE),arm-none-eabi-)gcc
|
||||
rk3399-m0-cpp-id-default := gnu-gcc
|
||||
|
||||
rk3399-m0-as-default := $(or $(M0_CROSS_COMPILE),arm-none-eabi-)gcc
|
||||
rk3399-m0-as-id-default := gnu-gcc
|
||||
|
||||
rk3399-m0-ld-default := $(or $(M0_CROSS_COMPILE),arm-none-eabi-)gcc
|
||||
rk3399-m0-ld-id-default := gnu-gcc
|
||||
|
||||
rk3399-m0-oc-default := $(or $(M0_CROSS_COMPILE),arm-none-eabi-)objcopy
|
||||
rk3399-m0-oc-id-default := gnu-objcopy
|
||||
|
||||
rk3399-m0-od-default := $(or $(M0_CROSS_COMPILE),arm-none-eabi-)objdump
|
||||
rk3399-m0-od-id-default := gnu-objdump
|
||||
|
||||
rk3399-m0-ar-default := $(or $(M0_CROSS_COMPILE),arm-none-eabi-)gcc-ar
|
||||
rk3399-m0-ar-id-default := gnu-ar
|
||||
|
||||
rk3399-m0-dtc-default := dtc
|
||||
rk3399-m0-dtc-id-default := generic-dtc
|
||||
|
|
|
|||
|
|
@ -79,16 +79,4 @@ endif
|
|||
# This can be overridden from the command line or environment.
|
||||
BUILD_STRING ?= development build
|
||||
|
||||
# The DOS echo shell command does not strip ' characters from the command
|
||||
# parameters before printing. We therefore use an alternative method invoked
|
||||
# by defining the MAKE_BUILD_STRINGS macro.
|
||||
BUILT_TIME_DATE_STRING = const char build_message[] = "Built : "${BUILD_MESSAGE_TIMESTAMP};
|
||||
VERSION_STRING_MESSAGE = const char version_string[] = "${VERSION_STRING}";
|
||||
VERSION_MESSAGE = const char version[] = "${VERSION}";
|
||||
define MAKE_BUILD_STRINGS
|
||||
$$(file >$1.in,$$(TF_CFLAGS) $$(CFLAGS))
|
||||
@echo $$(BUILT_TIME_DATE_STRING) $$(VERSION_STRING_MESSAGE) $$(VERSION_MESSAGE) | \
|
||||
$($(ARCH)-cc) @$1.in -x c -c - -o $1
|
||||
endef
|
||||
|
||||
MSVC_NMAKE := nmake.exe
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2021, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2021-2024, Arm Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -12,6 +12,7 @@
|
|||
#include <arch_helpers.h>
|
||||
#include <bl1/bl1.h>
|
||||
#include <common/bl_common.h>
|
||||
#include <common/build_message.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/auth/auth_mod.h>
|
||||
#include <drivers/console.h>
|
||||
|
|
@ -161,7 +162,7 @@ void bl1_main(void)
|
|||
|
||||
/* Announce our arrival */
|
||||
NOTICE(FIRMWARE_WELCOME_STR);
|
||||
NOTICE("BL1: %s\n", version_string);
|
||||
NOTICE("BL1: %s\n", build_version_string);
|
||||
NOTICE("BL1: %s\n", build_message);
|
||||
|
||||
INFO("BL1: RAM %p - %p\n", (void *)BL1_RAM_BASE, (void *)BL1_RAM_LIMIT);
|
||||
|
|
@ -244,4 +245,3 @@ void print_debug_loop_message(void)
|
|||
NOTICE("BL1: Please connect the debugger to continue\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/build_message.h>
|
||||
#include <common/debug.h>
|
||||
#include <common/desc_image_load.h>
|
||||
#include <drivers/arm/css/sds.h>
|
||||
|
|
@ -142,7 +143,7 @@ static int plat_morello_append_config_node(struct morello_plat_info *plat_info,
|
|||
return -1;
|
||||
}
|
||||
|
||||
err = fdt_setprop_string(fdt, nodeoffset_fw, "tfa-fw-version", version_string);
|
||||
err = fdt_setprop_string(fdt, nodeoffset_fw, "tfa-fw-version", build_version_string);
|
||||
if (err < 0) {
|
||||
WARN("NT_FW_CONFIG: Unable to set tfa-fw-version\n");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,10 @@
|
|||
#include <stdint.h>
|
||||
#include <services/std_svc.h>
|
||||
#include <string.h>
|
||||
#include <platform_def.h>
|
||||
#include <common/build_message.h>
|
||||
#include <common/debug.h>
|
||||
#include <common/runtime_svc.h>
|
||||
#include <platform_def.h>
|
||||
#include <imx_sip_svc.h>
|
||||
#include <lib/el3_runtime/context_mgmt.h>
|
||||
#include <lib/mmio.h>
|
||||
|
|
@ -261,7 +262,7 @@ static uint64_t imx_get_commit_hash(u_register_t x2,
|
|||
u_register_t x4)
|
||||
{
|
||||
/* Parse the version_string */
|
||||
char *parse = (char *)version_string;
|
||||
char *parse = (char *)build_version_string;
|
||||
uint64_t hash = 0;
|
||||
|
||||
do {
|
||||
|
|
|
|||
|
|
@ -368,9 +368,13 @@ clean_srecord:
|
|||
@echo "clean bl2 and bl31 srecs"
|
||||
rm -f ${SREC_PATH}/bl2.srec ${SREC_PATH}/bl31.srec
|
||||
|
||||
$(SREC_PATH)/bl2.srec: $(BL2_ELF_SRC)
|
||||
@echo "generating srec: $(SREC_PATH)/bl2.srec"
|
||||
$(Q)$($(ARCH)-oc) -O srec --srec-forceS3 $(BL2_ELF_SRC) $(SREC_PATH)/bl2.srec
|
||||
|
||||
$(SREC_PATH)/bl31.srec: $(BL31_ELF_SRC)
|
||||
@echo "generating srec: $(SREC_PATH)/bl31.srec"
|
||||
$(Q)$($(ARCH)-oc) -O srec --srec-forceS3 $(BL31_ELF_SRC) $(SREC_PATH)/bl31.srec
|
||||
|
||||
.PHONY: rcar_srecord
|
||||
rcar_srecord: $(BL2_ELF_SRC) $(BL31_ELF_SRC)
|
||||
@echo "generating srec: ${SREC_PATH}/bl2.srec"
|
||||
$(Q)$($(ARCH)-oc) -O srec --srec-forceS3 ${BL2_ELF_SRC} ${SREC_PATH}/bl2.srec
|
||||
@echo "generating srec: ${SREC_PATH}/bl31.srec"
|
||||
$(Q)$($(ARCH)-oc) -O srec --srec-forceS3 ${BL31_ELF_SRC} ${SREC_PATH}/bl31.srec
|
||||
rcar_srecord: $(SREC_PATH)/bl2.srec $(SREC_PATH)/bl31.srec
|
||||
|
|
|
|||
|
|
@ -266,9 +266,13 @@ clean_srecord:
|
|||
@echo "clean bl2 and bl31 srecs"
|
||||
rm -f ${SREC_PATH}/bl2.srec ${SREC_PATH}/bl31.srec
|
||||
|
||||
$(SREC_PATH)/bl2.srec: $(BL2_ELF_SRC)
|
||||
@echo "generating srec: $(SREC_PATH)/bl2.srec"
|
||||
$(Q)$($(ARCH)-oc) -O srec --srec-forceS3 $(BL2_ELF_SRC) $(SREC_PATH)/bl2.srec
|
||||
|
||||
$(SREC_PATH)/bl31.srec: $(BL31_ELF_SRC)
|
||||
@echo "generating srec: $(SREC_PATH)/bl31.srec"
|
||||
$(Q)$($(ARCH)-oc) -O srec --srec-forceS3 $(BL31_ELF_SRC) $(SREC_PATH)/bl31.srec
|
||||
|
||||
.PHONY: rzg_srecord
|
||||
rzg_srecord: $(BL2_ELF_SRC) $(BL31_ELF_SRC)
|
||||
@echo "generating srec: ${SREC_PATH}/bl2.srec"
|
||||
$(Q)$($(ARCH)-oc) -O srec --srec-forceS3 ${BL2_ELF_SRC} ${SREC_PATH}/bl2.srec
|
||||
@echo "generating srec: ${SREC_PATH}/bl31.srec"
|
||||
$(Q)$($(ARCH)-oc) -O srec --srec-forceS3 ${BL31_ELF_SRC} ${SREC_PATH}/bl31.srec
|
||||
rzg_srecord: $(SREC_PATH)/bl2.srec $(SREC_PATH)/bl31.srec
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
/*
|
||||
* Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2021-2024, Arm Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <common/build_message.h>
|
||||
#include <common/debug.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <services/rmm_core_manifest.h>
|
||||
|
|
@ -86,7 +87,7 @@ int trp_validate_warmboot_args(uint64_t x0, uint64_t x1,
|
|||
/* Main function for TRP */
|
||||
void trp_main(void)
|
||||
{
|
||||
NOTICE("TRP: %s\n", version_string);
|
||||
NOTICE("TRP: %s\n", build_version_string);
|
||||
NOTICE("TRP: %s\n", build_message);
|
||||
NOTICE("TRP: Supported RMM-EL3 Interface ABI: v.%u.%u\n",
|
||||
TRP_RMM_EL3_ABI_VERS_MAJOR, TRP_RMM_EL3_ABI_VERS_MINOR);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue