diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2018-11-27 09:05:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-27 09:05:50 +0100 |
| commit | 3b83c957b635e2ec21a7c3fbb28e0410e6e02ad6 (patch) | |
| tree | 26bb21af383235cbf9b753d17b9fb86e3b12f02b /lib | |
| parent | 85397ec4574952de8878ee053e01b1a04b34035f (diff) | |
| parent | 582133a8075b4795e6886c4b711626095f5a80f3 (diff) | |
| download | platform_external_arm-trusted-firmware-3b83c957b635e2ec21a7c3fbb28e0410e6e02ad6.tar.gz platform_external_arm-trusted-firmware-3b83c957b635e2ec21a7c3fbb28e0410e6e02ad6.tar.bz2 platform_external_arm-trusted-firmware-3b83c957b635e2ec21a7c3fbb28e0410e6e02ad6.zip | |
Merge pull request #1695 from satheesbalya-arm/sb1/sb1_2641_romlib_phase2
romlib: Allow patching of romlib functions
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/romlib/Makefile | 3 | ||||
| -rwxr-xr-x | lib/romlib/genwrappers.sh | 2 | ||||
| -rw-r--r-- | lib/romlib/jmptbl.i | 17 |
3 files changed, 14 insertions, 8 deletions
diff --git a/lib/romlib/Makefile b/lib/romlib/Makefile index 46b920682..00dde31cd 100644 --- a/lib/romlib/Makefile +++ b/lib/romlib/Makefile @@ -15,6 +15,7 @@ LIBS = -lmbedtls -lfdt -lc INC = $(INCLUDES:-I%=-I../../%) PPFLAGS = $(INC) $(DEFINES) -P -D__ASSEMBLY__ -D__LINKER__ -MD -MP -MT $(BUILD_DIR)/romlib.ld OBJS = $(BUILD_DIR)/jmptbl.o $(BUILD_DIR)/init.o +MAPFILE = ../../$(BUILD_PLAT)/romlib/romlib.map V ?= 0 ifeq ($(V),0) @@ -25,7 +26,7 @@ endif ifeq ($(DEBUG),1) CFLAGS := -g - LDFLAGS := -g + LDFLAGS := -g --gc-sections -O1 -Map=$(MAPFILE) endif diff --git a/lib/romlib/genwrappers.sh b/lib/romlib/genwrappers.sh index bcf670b98..48ee5a43b 100755 --- a/lib/romlib/genwrappers.sh +++ b/lib/romlib/genwrappers.sh @@ -31,7 +31,7 @@ do done awk '{sub(/[:blank:]*#.*/,"")} -!/^$/ {print $1*4, $2, $3}' "$@" | +!/^$/ && !/\\tpatch$/ {print $1*4, $2, $3}' "$@" | while read idx lib sym do file=$build/${lib}_$sym diff --git a/lib/romlib/jmptbl.i b/lib/romlib/jmptbl.i index 338cd8a71..5eca5aab3 100644 --- a/lib/romlib/jmptbl.i +++ b/lib/romlib/jmptbl.i @@ -3,6 +3,10 @@ # # 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 1 fdt fdt_getprop_namelen @@ -27,9 +31,10 @@ 20 mbedtls mbedtls_pk_init 21 mbedtls mbedtls_pk_parse_subpubkey 22 mbedtls mbedtls_pk_verify_ext -23 mbedtls mbedtls_platform_set_snprintf -24 mbedtls mbedtls_x509_get_rsassa_pss_params -25 mbedtls mbedtls_x509_get_sig_alg -26 mbedtls mbedtls_md_info_from_type -27 c exit -28 c atexit +23 mbedtls mbedtls_platform_set_calloc_free +24 mbedtls mbedtls_platform_set_snprintf +25 mbedtls mbedtls_x509_get_rsassa_pss_params +26 mbedtls mbedtls_x509_get_sig_alg +27 mbedtls mbedtls_md_info_from_type +28 c exit +29 c atexit
\ No newline at end of file |