diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2021-12-09 14:13:15 +1100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-12-16 16:20:50 +0000 |
| commit | b83cf2cd34ee3430fa9b5cebc111c43fca811cc1 (patch) | |
| tree | 7ff2229b8f85905f3b58d0921f814a2611f1b9dc | |
| parent | 6c73a1b7c6ddc68c98092036057dad7188ee89c8 (diff) | |
| download | vboot-stabilize-14411.B.tar.gz | |
vboot_reference/Makefile: Work towards a common flashrom pathstabilize-14411.B
There are multiple flashrom calling wrapping code implementations
within vboot_ref. Work towards making a singular canonical
implementation.
BUG=b:207808292
BRANCH=none
TEST=`make`
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Change-Id: I8e133a11b777b4e80bb4e43a64a5349956cef8eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3325329
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
Auto-Submit: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Nikolai Artemiev <nartemiev@google.com>
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
| -rw-r--r-- | Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -438,6 +438,11 @@ FWLIB_OBJS = ${FWLIB_SRCS:%.c=${BUILD}/%.o} TLCL_OBJS = ${TLCL_SRCS:%.c=${BUILD}/%.o} ALL_OBJS += ${FWLIB_OBJS} ${TLCL_OBJS} +COMMONLIB_SRCS = \ + host/lib/fmap.c \ + host/lib/flashrom.c \ + host/lib/subprocess.c + # Intermediate library for the vboot_reference utilities to link against. UTILLIB = ${BUILD}/libvboot_util.a @@ -456,8 +461,7 @@ UTILLIB_SRCS = \ host/lib/crossystem.c \ host/lib/crypto.c \ host/lib/file_keys.c \ - host/lib/flashrom.c \ - host/lib/fmap.c \ + $(COMMONLIB_SRCS) \ host/lib/host_common.c \ host/lib/host_key2.c \ host/lib/host_keyblock.c \ @@ -465,7 +469,6 @@ UTILLIB_SRCS = \ host/lib/host_signature.c \ host/lib/host_signature2.c \ host/lib/signature_digest.c \ - host/lib/subprocess.c \ host/lib/util_misc.c \ host/lib21/host_common.c \ host/lib21/host_key.c \ @@ -516,10 +519,8 @@ HOSTLIB_SRCS = \ host/lib/crossystem.c \ host/lib/crypto.c \ host/lib/extract_vmlinuz.c \ - host/lib/flashrom.c \ - host/lib/fmap.c \ + $(COMMONLIB_SRCS) \ host/lib/host_misc.c \ - host/lib/subprocess.c \ host/lib21/host_misc.c \ ${TLCL_SRCS} |