diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-01-26 11:42:01 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-02-01 20:20:03 +0900 |
| commit | 1dc0714f10e195fe5fe5aed1f12a0a79f4fc0135 (patch) | |
| tree | 9474f6d86e2d31d87839139d1c26ea40f6e8fcf0 /Makefile | |
| parent | 34ec84944c2d71adde30ca7c6601ab97b39b6427 (diff) | |
Build: merge build macros between FIP_ and FWU_FIP_
The build system supports generating two FIP images, fip and fwu_fip.
Accordingly, we have similar build macros.
FIP_ADD_PAYLOAD <--> FWU_FIP_ADD_PAYLOAD
CERT_ADD_CMD_OPT <--> FWU_CERT_ADD_CMD_OPT
FIP_ADD_IMG <--> FWU_FIP_ADD_IMG
The duplicated code increases the maintenance burden. Also, the build
rule of BL2U looks clumsy - we want to call MAKE_BL to compile it from
source files, but we want to put it in fwu_fip. We can not do it in a
single macro call since the current MAKE_BL does not support fwu_fip.
To refactor those in a clean way is to support one more argument to
specify the FIP prefix. If it is empty, the images are targeted to
fip, whereas if the argument is "FWU_", targeted to fwu_fip.
The build macros prefixed with FWU_ go away.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -629,9 +629,8 @@ $(eval $(call FIP_ADD_IMG,BL33,--nt-fw)) endif ifeq (${NEED_BL2U},yes) -BL2U_PATH := $(if ${BL2U},${BL2U},$(call IMG_BIN,2u)) -$(if ${BL2U}, ,$(eval $(call MAKE_BL,2u))) -$(eval $(call FWU_FIP_ADD_PAYLOAD,${BL2U_PATH},--ap-fwu-cfg)) +$(if ${BL2U}, $(eval $(call FIP_ADD_IMG,BL2U,--ap-fwu-cfg,FWU_)),\ + $(eval $(call MAKE_BL,2u,ap-fwu-cfg,FWU_))) endif # Expand build macros for the different images |