diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2013-04-09 10:15:26 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-04-09 15:55:02 -0700 |
| commit | 20807b6158b6a43baf0974bc763890888ba1f841 (patch) | |
| tree | 3794ef628e125b86ead259cf1daf5f44b33d1f1b /Makefile | |
| parent | 6db8c75021e2edfa400ae707a8544d041e3c415f (diff) | |
| download | vboot-20807b6158b6a43baf0974bc763890888ba1f841.tar.gz | |
Build dump_fmap into futility.
This stops creating dump_fmap as a standalone utility and builds it into
futility. Since it was already invoked as a symlink, no user-visible changes
should be observed.
BUG=chromium:224734
BRANCH=none
TEST=manual, trybots
sudo FEATURES=test emerge vboot_reference
FEATURES=test emerge-$BOARD vboot_reference
Change-Id: I68d1bea0c1867043b2633e15509b95c2717009a7
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/47672
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 17 insertions, 3 deletions
@@ -402,7 +402,6 @@ endif # These utilities should be linked statically. UTIL_NAMES_STATIC = \ utility/crossystem \ - utility/dump_fmap \ utility/gbb_utility UTIL_NAMES = ${UTIL_NAMES_STATIC} \ @@ -455,11 +454,18 @@ FUTIL_BIN = ${BUILD}/futility/futility FUTIL_STATIC_BIN = ${FUTIL_BIN}_s # These are the others it will replace. -FUTIL_OLD = $(notdir ${CGPT} ${UTIL_BINS} ${UTIL_SCRIPTS} \ - ${SIGNING_SCRIPTS} ${SIGNING_SCRIPTS_DEV}) +FUTIL_OLD = bmpblk_font bmpblk_utility cgpt chromeos-tpm-recovery crossystem \ + dev_debug_vboot dev_make_keypair dev_sign_file dumpRSAPublicKey \ + dump_fmap dump_kernel_config eficompress efidecompress \ + enable_dev_usb_boot gbb_utility load_kernel_test \ + make_dev_firmware.sh make_dev_ssd.sh pad_digest_utility \ + resign_firmwarefd.sh set_gbb_flags.sh signature_digest_utility \ + tpm-nvsize tpm_init_temp_fix tpmc vbutil_firmware vbutil_kernel \ + vbutil_key vbutil_keyblock vbutil_what_keys verify_data FUTIL_STATIC_SRCS = \ futility/futility.c \ + futility/cmd_dump_fmap.c \ futility/cmd_foo.c FUTIL_SRCS = \ @@ -779,6 +785,14 @@ futil_install: ${FUTIL_BIN} ${Q}for prog in ${FUTIL_OLD}; do \ ln -sf futility "${F_DIR}/$$prog"; done +# TODO(wfrichar): This will need some refactoring (crbug.com/228932) +${BUILD}/futility/% ${HOSTLIB}: INCLUDES += \ + -Ihost/include \ + -Ihost/arch/${ARCH}/include \ + -Ihost/lib/include +${FUTIL_STATIC_BIN} ${FUTIL_BIN}: ${HOSTLIB} +${FUTIL_STATIC_BIN} ${FUTIL_BIN}: LIBS = ${HOSTLIB} + # ---------------------------------------------------------------------------- # Utility to generate TLCL structure definition header file. |