diff options
| author | Joel Kitching <kitching@google.com> | 2019-12-16 15:21:18 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-11 02:04:11 +0000 |
| commit | 79910141b5474cb9c4c64de2beb390432df150c5 (patch) | |
| tree | 85d0f88302e2806bca4c89746af232cd217a9759 | |
| parent | 166840277a2d4806fa0d89980b3501090441d5ed (diff) | |
| download | vboot-79910141b5474cb9c4c64de2beb390432df150c5.tar.gz | |
vboot: merge different FWLIB_SRC versions into one
Since we are only building one fwlib library now, merge
FWLIB_SRCS, FWLIB2X_SRCS, and FWLIB_20_SRCS into one.
Remove the corresponding OBJS variables appropriately.
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Change-Id: I190f3ca99ca67063fe0013dd490ef8869cd8f57c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1969258
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | Makefile | 45 |
1 files changed, 18 insertions, 27 deletions
@@ -349,21 +349,6 @@ FWLIB = ${BUILD}/vboot_fw.a TLCL = ${BUILD}/tlcl.a FWLIB_SRCS = \ - firmware/lib/cgptlib/cgptlib.c \ - firmware/lib/cgptlib/cgptlib_internal.c \ - firmware/lib/cgptlib/crc32.c \ - firmware/lib/gpt_misc.c \ - firmware/lib/utility_string.c \ - firmware/lib/vboot_api_kernel.c \ - firmware/lib/vboot_audio.c \ - firmware/lib/vboot_display.c \ - firmware/lib/vboot_kernel.c \ - firmware/lib/vboot_ui.c \ - firmware/lib/vboot_ui_common.c \ - firmware/lib/vboot_ui_menu.c \ - firmware/lib/vboot_ui_wilco.c - -FWLIB2X_SRCS = \ firmware/2lib/2api.c \ firmware/2lib/2auxfw_sync.c \ firmware/2lib/2common.c \ @@ -371,6 +356,7 @@ FWLIB2X_SRCS = \ firmware/2lib/2crc8.c \ firmware/2lib/2ec_sync.c \ firmware/2lib/2gbb.c \ + firmware/2lib/2hmac.c \ firmware/2lib/2misc.c \ firmware/2lib/2nvstorage.c \ firmware/2lib/2rsa.c \ @@ -382,9 +368,19 @@ FWLIB2X_SRCS = \ firmware/2lib/2sha512.c \ firmware/2lib/2sha_utility.c \ firmware/2lib/2tpm_bootmode.c \ - firmware/2lib/2hmac.c - -FWLIB20_SRCS = \ + firmware/lib/cgptlib/cgptlib.c \ + firmware/lib/cgptlib/cgptlib_internal.c \ + firmware/lib/cgptlib/crc32.c \ + firmware/lib/gpt_misc.c \ + firmware/lib/utility_string.c \ + firmware/lib/vboot_api_kernel.c \ + firmware/lib/vboot_audio.c \ + firmware/lib/vboot_display.c \ + firmware/lib/vboot_kernel.c \ + firmware/lib/vboot_ui.c \ + firmware/lib/vboot_ui_common.c \ + firmware/lib/vboot_ui_menu.c \ + firmware/lib/vboot_ui_wilco.c \ firmware/lib20/api_kernel.c \ firmware/lib20/kernel.c \ firmware/lib20/misc.c \ @@ -423,17 +419,13 @@ FWLIB_SRCS += \ firmware/stub/vboot_api_stub.c \ firmware/stub/vboot_api_stub_disk.c \ firmware/stub/vboot_api_stub_init.c \ - firmware/stub/vboot_api_stub_stream.c - -FWLIB2X_SRCS += \ + firmware/stub/vboot_api_stub_stream.c \ firmware/2lib/2stub.c endif FWLIB_OBJS = ${FWLIB_SRCS:%.c=${BUILD}/%.o} -FWLIB2X_OBJS = ${FWLIB2X_SRCS:%.c=${BUILD}/%.o} -FWLIB20_OBJS = ${FWLIB20_SRCS:%.c=${BUILD}/%.o} TLCL_OBJS = ${TLCL_SRCS:%.c=${BUILD}/%.o} -ALL_OBJS += ${FWLIB_OBJS} ${FWLIB2X_OBJS} ${FWLIB20_OBJS} ${TLCL_OBJS} +ALL_OBJS += ${FWLIB_OBJS} ${TLCL_OBJS} # Intermediate library for the vboot_reference utilities to link against. UTILLIB = ${BUILD}/libvboot_util.a @@ -836,7 +828,7 @@ endif .PHONY: fwlib fwlib: $(if ${FIRMWARE_ARCH},${FWLIB},) -${FWLIB}: ${FWLIB_OBJS} ${FWLIB2X_OBJS} ${FWLIB20_OBJS} +${FWLIB}: ${FWLIB_OBJS} @${PRINTF} " RM $(subst ${BUILD}/,,$@)\n" ${Q}rm -f $@ @${PRINTF} " AR $(subst ${BUILD}/,,$@)\n" @@ -858,8 +850,7 @@ ${TLCL}: ${TLCL_OBJS} utillib: ${UTILLIB} # TODO: better way to make .a than duplicating this recipe each time? -${UTILLIB}: ${UTILLIB_OBJS} ${FWLIB_OBJS} ${FWLIB2X_OBJS} ${FWLIB20_OBJS} \ - ${TLCL_OBJS} +${UTILLIB}: ${UTILLIB_OBJS} ${FWLIB_OBJS} ${TLCL_OBJS} @${PRINTF} " RM $(subst ${BUILD}/,,$@)\n" ${Q}rm -f $@ @${PRINTF} " AR $(subst ${BUILD}/,,$@)\n" |