Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 11:04:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1695 from satheesbalya-arm/sb1/sb1_2641_romlib_phase2

Browse source 
romlib: Allow patching of romlib functions
This commit is contained in:
Antonio Niño Díaz 2018-11-27 09:05:50 +01:00 • committed by GitHub
commit 3b83c957b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/romlib/Makefile
View file

@ -15,6 +15,7 @@ LIBS = -lmbedtls -lfdt -lc
INC = $(INCLUDES:-I%=-I../../%) INC = $(INCLUDES:-I%=-I../../%)
PPFLAGS = $(INC) $(DEFINES) -P -D__ASSEMBLY__ -D__LINKER__ -MD -MP -MT $(BUILD_DIR)/romlib.ld PPFLAGS = $(INC) $(DEFINES) -P -D__ASSEMBLY__ -D__LINKER__ -MD -MP -MT $(BUILD_DIR)/romlib.ld
OBJS = $(BUILD_DIR)/jmptbl.o $(BUILD_DIR)/init.o OBJS = $(BUILD_DIR)/jmptbl.o $(BUILD_DIR)/init.o
MAPFILE = ../../$(BUILD_PLAT)/romlib/romlib.map
V ?= 0 V ?= 0
ifeq ($(V),0) ifeq ($(V),0)
@ -25,7 +26,7 @@ endif
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
CFLAGS := -g CFLAGS := -g
LDFLAGS := -g LDFLAGS := -g --gc-sections -O1 -Map=$(MAPFILE)
endif endif

2
lib/romlib/genwrappers.sh
View file

@ -31,7 +31,7 @@ do
done done
awk '{sub(/[:blank:]*#.*/,"")} awk '{sub(/[:blank:]*#.*/,"")}
!/^$/ {print $1*4, $2, $3}' "$@" | !/^$/ && !/\\tpatch$/ {print $1*4, $2, $3}' "$@" |
while read idx lib sym while read idx lib sym
do do
file=$build/${lib}_$sym file=$build/${lib}_$sym

17
lib/romlib/jmptbl.i
View file

@ -3,6 +3,10 @@
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
# Format:
# index lib function [patch]
# Add "patch" at the end of the line to patch a function. For example:
# 14 mbedtls mbedtls_memory_buffer_alloc_init patch
0 rom rom_lib_init 0 rom rom_lib_init
1 fdt fdt_getprop_namelen 1 fdt fdt_getprop_namelen
@ -27,9 +31,10 @@
20 mbedtls mbedtls_pk_init 20 mbedtls mbedtls_pk_init
21 mbedtls mbedtls_pk_parse_subpubkey 21 mbedtls mbedtls_pk_parse_subpubkey
22 mbedtls mbedtls_pk_verify_ext 22 mbedtls mbedtls_pk_verify_ext
23 mbedtls mbedtls_platform_set_snprintf 23 mbedtls mbedtls_platform_set_calloc_free
24 mbedtls mbedtls_x509_get_rsassa_pss_params 24 mbedtls mbedtls_platform_set_snprintf
25 mbedtls mbedtls_x509_get_sig_alg 25 mbedtls mbedtls_x509_get_rsassa_pss_params
26 mbedtls mbedtls_md_info_from_type 26 mbedtls mbedtls_x509_get_sig_alg
27 c exit 27 mbedtls mbedtls_md_info_from_type
28 c atexit 28 c exit
29 c atexit

4
make_helpers/build_macros.mk
View file

@ -338,7 +338,7 @@ LDPATHS = -L${LIB_DIR}
LDLIBS += -l$(1) LDLIBS += -l$(1)
ifeq ($(USE_ROMLIB),1) ifeq ($(USE_ROMLIB),1)
LDLIBS := -lwrappers -lc LIBWRAPPER = -lwrappers
endif endif
all: ${LIB_DIR}/lib$(1).a all: ${LIB_DIR}/lib$(1).a
@ -402,7 +402,7 @@ else
endif endif
$$(Q)$$(LD) -o $$@ $$(TF_LDFLAGS) $$(LDFLAGS) -Map=$(MAPFILE) \ $$(Q)$$(LD) -o $$@ $$(TF_LDFLAGS) $$(LDFLAGS) -Map=$(MAPFILE) \
--script $(LINKERFILE) $(BUILD_DIR)/build_message.o \ --script $(LINKERFILE) $(BUILD_DIR)/build_message.o \
$(OBJS) $(LDPATHS) $(LDLIBS) $(BL_LIBS) $(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS)
$(DUMP): $(ELF) $(DUMP): $(ELF)
$${ECHO} " OD $$@" $${ECHO} " OD $$@"