andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for printing version at runtime 

Print out Trusted Firmware version at runtime at each BL stage.
Message consists of TF version as defined statically in the Makefile
(e.g. v0.4), build mode (debug|release) and a customizable build
string:

  1. By defining BUILD_STRING in command line when building TF
  2. Default string is git commit ID
  3. Empty if git meta-data is not available

Fixes ARM-software/tf-issues#203

Change-Id: I5c5ba438f66ab68810427d76b49c5b9177a957d6
This commit is contained in:
Juan Castillo 2014-06-30 11:41:46 +01:00 committed by Dan Handley
parent 2d4aceaffa
commit aaa3e722c0
6 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -28,6 +28,12 @@
# POSSIBILITY OF SUCH DAMAGE.
#
#
# Trusted Firmware Version
#
VERSION_MAJOR := 0
VERSION_MINOR := 4
#
# Default values for build configurations
#
@ -76,6 +82,13 @@ else
BUILD_TYPE := release
endif
# Default build string (git branch and commit)
ifeq (${BUILD_STRING},)
BUILD_STRING := $(shell git log -n 1 --pretty=format:"%h")
endif
VERSION_STRING := v${VERSION_MAJOR}.${VERSION_MINOR}(${BUILD_TYPE}):${BUILD_STRING}
BL_COMMON_SOURCES := common/bl_common.c \
common/debug.c \
common/tf_printf.c \
@ -377,7 +390,8 @@ $(BUILD_DIR) :
$(ELF) : $(OBJS) $(LINKERFILE)
@echo " LD $$@"
@echo 'const char build_message[] = "Built : "__TIME__", "__DATE__;' | \
@echo 'const char build_message[] = "Built : "__TIME__", "__DATE__; \
const char version_string[] = "${VERSION_STRING}";' | \
$$(CC) $$(CFLAGS) -xc - -o $(BUILD_DIR)/build_message.o
$$(Q)$$(LD) -o $$@ $$(LDFLAGS) -Map=$(MAPFILE) --script $(LINKERFILE) \
$(BUILD_DIR)/build_message.o $(OBJS)

3
bl1/bl1_main.c
View File

@ -130,7 +130,8 @@ void bl1_main(void)
/* Announce our arrival */
tf_printf(FIRMWARE_WELCOME_STR);
tf_printf("%s\n\r", build_message);
tf_printf("%s\n", version_string);
tf_printf("%s\n", build_message);
SET_PARAM_HEAD(&bl2_image_info, PARAM_IMAGE_BINARY, VERSION_1, 0);
SET_PARAM_HEAD(&bl2_ep, PARAM_EP, VERSION_1, 0);

3
bl2/bl2_main.c
View File

@ -195,7 +195,8 @@ void bl2_main(void)
/* Perform platform setup in BL2 */
bl2_platform_setup();
tf_printf("BL2 %s\n\r", build_message);
tf_printf("BL2 %s\n", version_string);
tf_printf("BL2 %s\n", build_message);
/*
* Load the subsequent bootloader images

3
bl31/bl31_main.c
View File

@ -77,7 +77,8 @@ void bl31_main(void)
/* Perform platform setup in BL1 */
bl31_platform_setup();
tf_printf("BL31 %s\n\r", build_message);
tf_printf("BL31 %s\n", version_string);
tf_printf("BL31 %s\n", build_message);
/* Initialise helper libraries */
bl31_lib_init();

3
bl32/tsp/tsp_main.c
View File

@ -120,7 +120,8 @@ uint64_t tsp_main(void)
tsp_stats[linear_id].cpu_on_count++;
spin_lock(&console_lock);
tf_printf("TSP %s\n\r", build_message);
tf_printf("TSP %s\n", version_string);
tf_printf("TSP %s\n", build_message);
INFO("Total memory base : 0x%x\n", (unsigned long)BL32_TOTAL_BASE);
INFO("Total memory size : 0x%x bytes\n",
(unsigned long)(BL32_TOTAL_LIMIT - BL32_TOTAL_BASE));

1
include/common/bl_common.h
View File

@ -210,6 +210,7 @@ int load_image(meminfo_t *mem_layout,
image_info_t *image_data,
entry_point_info_t *entry_point_info);
extern const char build_message[];
extern const char version_string[];
void reserve_mem(uint64_t *free_base, size_t *free_size,
uint64_t addr, size_t size);