summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2017-12-12 14:05:19 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-01-05 21:14:11 -0800
commitde818cc08fab92ad389dc92f31687f3314a1a03a (patch)
tree88ac00585794cf8be66601ea9cd5f38e34d88d13 /Makefile
parent5142132f44bbee683c830fdb837bbedb00bad8ba (diff)
downloadvboot-de818cc08fab92ad389dc92f31687f3314a1a03a.tar.gz
firmware: simplify audio
Vboot firmware previously supported a rather complex audio looping library. Our original intent was to allow developers to flash a custom beep sequence / tune as an easter egg. We never fully supported that, but the code to allow it lived on. Get rid of that. Vboot also previously made no assumptions about the frequency of VbExGetTimer(), which was only used by the vboot_audio library. So it spent 10ms every boot measuring the frequency. Which is silly now, because depthcharge implements that as a microsecond timer. Get rid of that measurement and define the timer as a microsecond timer. BUG=chromium:611535 BRANCH=none TEST=make -j runtests; build bob firmware and boot it Change-Id: I350246874fb36b00149423696285cfcaca0fc526 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/847311 Reviewed-by: Shelley Chen <shchen@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 1 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 9cbcf264..3c12e79b 100644
--- a/Makefile
+++ b/Makefile
@@ -165,10 +165,6 @@ CC ?= gcc
CFLAGS += -DCHROMEOS_ENVIRONMENT -Wall ${WERROR} ${DEBUG_FLAGS}
endif
-ifneq (${CUSTOM_MUSIC},)
-CFLAGS += -DCUSTOM_MUSIC
-endif
-
ifneq (${DEBUG},)
CFLAGS += -DVBOOT_DEBUG
endif
@@ -739,8 +735,7 @@ TEST_NAMES = \
tests/vboot_api_kernel5_tests \
tests/vboot_api_kernel6_tests \
tests/vboot_detach_menu_tests \
- tests/vboot_audio_tests \
- tests/vboot_common_tests \
+tests/vboot_common_tests \
tests/vboot_display_tests \
tests/vboot_kernel_tests \
tests/verify_kernel
@@ -1313,12 +1308,6 @@ ${BUILD}/tests/tlcl_tests: \
${TLCL_OBJS_FOR_TEST}
TEST_OBJS += ${TLCL_OBJS_FOR_TEST}
-${BUILD}/tests/vboot_audio_tests: OBJS += \
- ${BUILD}/firmware/lib/vboot_audio_for_test.o
-${BUILD}/tests/vboot_audio_tests: \
- ${BUILD}/firmware/lib/vboot_audio_for_test.o
-TEST_OBJS += ${BUILD}/firmware/lib/vboot_audio_for_test.o
-
ifeq (${TPM2_MODE},)
# TODO(apronin): tests for TPM2 case?
TLCL_TEST_BINS = $(addprefix ${BUILD}/,${TLCL_TEST_NAMES})
@@ -1443,7 +1432,6 @@ endif
${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel5_tests
${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel6_tests
${RUNTEST} ${BUILD_RUN}/tests/vboot_detach_menu_tests
- ${RUNTEST} ${BUILD_RUN}/tests/vboot_audio_tests
${RUNTEST} ${BUILD_RUN}/tests/vboot_common_tests
${RUNTEST} ${BUILD_RUN}/tests/vboot_display_tests
${RUNTEST} ${BUILD_RUN}/tests/vboot_kernel_tests