diff options
| author | Joel Kitching <kitching@google.com> | 2020-11-02 15:34:21 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-04 13:13:26 +0000 |
| commit | 3b4b439b6450ceacd36d91036e4509b8b6f7880c (patch) | |
| tree | 8325eb39e2f4c2c817ddcf0170966818432021f9 /Makefile | |
| parent | 03d6cc6106bd72503a669c8640335fe858ebeaf2 (diff) | |
| download | vboot-3b4b439b6450ceacd36d91036e4509b8b6f7880c.tar.gz | |
vboot: deprecate and remove legacy UI code
BUG=b:146399181, b:167643628
TEST=make clean && make runtests
TEST=Build and flash to device
BRANCH=none
Cq-Depend: chromium:2512739
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: Ia8d95451d55142fbe9acaa6e49de9b5abe134083
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2512740
Reviewed-by: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Yu-Ping Wu <yupingso@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 38 |
1 files changed, 1 insertions, 37 deletions
@@ -220,22 +220,6 @@ else CFLAGS += -DDETACHABLE=0 endif -# Enable the menu-based user interface. -ifneq ($(filter-out 0,${MENU_UI}),) -CFLAGS += -DMENU_UI=1 -else -CFLAGS += -DMENU_UI=0 -endif - -# LEGACY_MENU_UI controls whether to enable legacy menu UI, which is used with -# devices that don't have a keyboard (detachables). -# Pass LEGACY_MENU_UI= (or =0) to make to disable feature. -ifneq ($(filter-out 0,${LEGACY_MENU_UI}),) -CFLAGS += -DLEGACY_MENU_UI=1 -else -CFLAGS += -DLEGACY_MENU_UI=0 -endif - # pass DIAGNOSTIC_UI= (or =0) to make to disable feature ifneq ($(filter-out 0,${DIAGNOSTIC_UI}),) CFLAGS += -DDIAGNOSTIC_UI=1 @@ -424,11 +408,7 @@ FWLIB_SRCS = \ $(if ${FIRMWARE_ARCH},FWLIB_SRCS,TESTLIB_SRCS) += \ firmware/2lib/2ui.c \ firmware/2lib/2ui_screens.c \ - firmware/lib/vboot_audio.c \ - firmware/lib/vboot_ui_legacy.c \ - firmware/lib/vboot_ui_legacy_clamshell.c \ - firmware/lib/vboot_ui_legacy_menu.c \ - firmware/lib/vboot_ui_legacy_wilco.c + firmware/lib/vboot_audio.c # TPM lightweight command library ifeq (${TPM2_MODE},) @@ -447,14 +427,6 @@ FWLIB_SRCS += \ firmware/lib/tpm_lite/mocked_tlcl.c endif -ifneq (${VENDOR_DATA_LENGTH},) -CFLAGS += -DVENDOR_DATA_LENGTH=${VENDOR_DATA_LENGTH} -else ifeq (${FIRMWARE_ARCH},) -CFLAGS += -DVENDOR_DATA_LENGTH=4 -else -CFLAGS += -DVENDOR_DATA_LENGTH=0 -endif - ifeq (${FIRMWARE_ARCH},) # Include BIOS stubs in the firmware library when compiling for host # TODO: split out other stub funcs too @@ -720,10 +692,6 @@ TEST_NAMES = \ tests/vboot_api_kernel4_tests \ tests/vboot_api_kernel_tests \ tests/vboot_kernel_tests \ - tests/vboot_ui_legacy_clamshell_beep_tests \ - tests/vboot_ui_legacy_clamshell_tests \ - tests/vboot_ui_legacy_menu_tests \ - tests/vboot_ui_legacy_tests \ tests/verify_kernel ifeq (${MOCK_TPM}${TPM2_MODE},) @@ -1268,10 +1236,6 @@ endif ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel4_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_kernel_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_ui_legacy_clamshell_beep_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_ui_legacy_clamshell_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_ui_legacy_menu_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_ui_legacy_tests .PHONY: run2tests run2tests: install_for_test |