diff options
author | Soby Mathew <soby.mathew@arm.com> | 2019-05-02 11:25:26 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-05-02 11:25:26 +0000 |
commit | 8917380a1eba4f7a499a4a51b75a0488a683d2c0 (patch) | |
tree | 1f6570d5a6b930097a243c8098fe52fa3d0e5a86 | |
parent | b3c8ac135447ddb4eb0d4dcd224ffa961f349e33 (diff) | |
parent | 33218d2a8143ef54684db529f1a8a5182e5a52f7 (diff) |
Merge changes from topic "rk3399q7" into integrationmaster
* changes:
rockchip: Disable binary generation for all SoCs.
build_macros: Add mechanism to prevent bin generation.
-rw-r--r-- | docs/user-guide.rst | 4 | ||||
-rw-r--r-- | make_helpers/build_macros.mk | 9 | ||||
-rw-r--r-- | make_helpers/defaults.mk | 3 | ||||
-rw-r--r-- | plat/rockchip/rk3288/platform.mk | 2 | ||||
-rw-r--r-- | plat/rockchip/rk3328/platform.mk | 2 | ||||
-rw-r--r-- | plat/rockchip/rk3368/platform.mk | 2 | ||||
-rw-r--r-- | plat/rockchip/rk3399/platform.mk | 2 |
7 files changed, 24 insertions, 0 deletions
diff --git a/docs/user-guide.rst b/docs/user-guide.rst index 01cf17a2..2a21bd21 100644 --- a/docs/user-guide.rst +++ b/docs/user-guide.rst @@ -369,6 +369,10 @@ Common build options - ``DEBUG``: Chooses between a debug and release build. It can take either 0 (release) or 1 (debug) as values. 0 is the default. +- ``DISABLE_BIN_GENERATION``: Boolean option to disable the generation + of the binary image. If set to 1, then only the ELF image is built. + 0 is the default. + - ``DYN_DISABLE_AUTH``: Provides the capability to dynamically disable Trusted Board Boot authentication at runtime. This option is meant to be enabled only for development platforms. ``TRUSTED_BOARD_BOOT`` flag must be set if this diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 5d33954a..2d41b2db 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -438,6 +438,11 @@ else --script $(LINKERFILE) $(BUILD_DIR)/build_message.o \ $(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS) endif +ifeq ($(DISABLE_BIN_GENERATION),1) + @${ECHO_BLANK_LINE} + @echo "Built $$@ successfully" + @${ECHO_BLANK_LINE} +endif $(DUMP): $(ELF) $${ECHO} " OD $$@" @@ -451,7 +456,11 @@ $(BIN): $(ELF) @${ECHO_BLANK_LINE} .PHONY: bl$(1) +ifeq ($(DISABLE_BIN_GENERATION),1) +bl$(1): $(ELF) $(DUMP) +else bl$(1): $(BIN) $(DUMP) +endif all: bl$(1) diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk index be84f779..dc797ed1 100644 --- a/make_helpers/defaults.mk +++ b/make_helpers/defaults.mk @@ -62,6 +62,9 @@ DEBUG := 0 # Build platform DEFAULT_PLAT := fvp +# Disable the generation of the binary image (ELF only). +DISABLE_BIN_GENERATION := 0 + # Enable capability to disable authentication dynamically. Only meant for # development platforms. DYN_DISABLE_AUTH := 0 diff --git a/plat/rockchip/rk3288/platform.mk b/plat/rockchip/rk3288/platform.mk index d2035815..1811b3af 100644 --- a/plat/rockchip/rk3288/platform.mk +++ b/plat/rockchip/rk3288/platform.mk @@ -11,6 +11,8 @@ RK_PLAT := plat/rockchip RK_PLAT_SOC := ${RK_PLAT}/${PLAT} RK_PLAT_COMMON := ${RK_PLAT}/common +DISABLE_BIN_GENERATION := 1 + PLAT_INCLUDES := -I${RK_PLAT_COMMON}/ \ -I${RK_PLAT_COMMON}/include/ \ -I${RK_PLAT_COMMON}/aarch32/ \ diff --git a/plat/rockchip/rk3328/platform.mk b/plat/rockchip/rk3328/platform.mk index 98654a54..3e703304 100644 --- a/plat/rockchip/rk3328/platform.mk +++ b/plat/rockchip/rk3328/platform.mk @@ -8,6 +8,8 @@ RK_PLAT := plat/rockchip RK_PLAT_SOC := ${RK_PLAT}/${PLAT} RK_PLAT_COMMON := ${RK_PLAT}/common +DISABLE_BIN_GENERATION := 1 + PLAT_INCLUDES := -Idrivers/arm/gic/common/ \ -Idrivers/arm/gic/v2/ \ -I${RK_PLAT_COMMON}/ \ diff --git a/plat/rockchip/rk3368/platform.mk b/plat/rockchip/rk3368/platform.mk index 0495a161..51368dea 100644 --- a/plat/rockchip/rk3368/platform.mk +++ b/plat/rockchip/rk3368/platform.mk @@ -8,6 +8,8 @@ RK_PLAT := plat/rockchip RK_PLAT_SOC := ${RK_PLAT}/${PLAT} RK_PLAT_COMMON := ${RK_PLAT}/common +DISABLE_BIN_GENERATION := 1 + PLAT_INCLUDES := -I${RK_PLAT_COMMON}/ \ -I${RK_PLAT_COMMON}/include/ \ -I${RK_PLAT_COMMON}/aarch64/ \ diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk index c73df6d7..f917f61b 100644 --- a/plat/rockchip/rk3399/platform.mk +++ b/plat/rockchip/rk3399/platform.mk @@ -8,6 +8,8 @@ RK_PLAT := plat/rockchip RK_PLAT_SOC := ${RK_PLAT}/${PLAT} RK_PLAT_COMMON := ${RK_PLAT}/common +DISABLE_BIN_GENERATION := 1 + PLAT_INCLUDES := -I${RK_PLAT_COMMON}/ \ -I${RK_PLAT_COMMON}/include/ \ -I${RK_PLAT_COMMON}/aarch64/ \ |