diff options
| author | Joel Kitching <kitching@google.com> | 2020-03-20 17:10:33 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-25 11:26:59 +0000 |
| commit | ff2a2f2cf6b77be178b2425bc0c60ef5c6c8cf21 (patch) | |
| tree | 92cc66fd2235152d080af512e9112b3e212284a4 /Makefile | |
| parent | 0b004fe6b1e3dc14ebec45f02d6641f29dba59a4 (diff) | |
| download | vboot-ff2a2f2cf6b77be178b2425bc0c60ef5c6c8cf21.tar.gz | |
vboot: reshuffle legacy UI files
- Use "vboot_ui_legacy" prefix for all legacy UI-related files.
- Merge vboot_display.{c,h} and vboot_ui_legacy_common.c into
vboot_ui_legacy.{c,h}.
- Move VbDisplayScreen and VbDisplayMenu implementation into
their respective vboot_ui_legacy_*.c files.
- Update VbCheckDisplayKey to take |screen| argument to avoid
reading disp_current_screen global variable.
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Change-Id: I777551e4968ca22282901d22a262a8f2ec849702
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:2214615
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2112322
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 |
1 files changed, 10 insertions, 16 deletions
@@ -208,11 +208,6 @@ else CFLAGS += -DLEGACY_MENU_UI=0 endif -# enable all features during local compile (permits testing) -ifeq (${FIRMWARE_ARCH},) -DIAGNOSTIC_UI := 1 -endif - # pass DIAGNOSTIC_UI= (or =0) to make to disable feature ifneq ($(filter-out 0,${DIAGNOSTIC_UI}),) CFLAGS += -DDIAGNOSTIC_UI=1 @@ -386,10 +381,9 @@ FWLIB_SRCS = \ firmware/lib/gpt_misc.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_legacy.c \ firmware/lib/vboot_ui_legacy_clamshell.c \ - firmware/lib/vboot_ui_legacy_common.c \ firmware/lib/vboot_ui_legacy_menu.c \ firmware/lib/vboot_ui_legacy_wilco.c \ firmware/lib20/api_kernel.c \ @@ -676,17 +670,17 @@ TEST_OBJS += ${TESTLIB_OBJS} # And some compiled tests. TEST_NAMES = \ - tests/chromeos_config_tests \ tests/cgptlib_test \ + tests/chromeos_config_tests \ tests/sha_benchmark \ tests/subprocess_tests \ tests/vboot_api_kernel4_tests \ tests/vboot_api_kernel_tests \ - tests/vboot_display_tests \ tests/vboot_kernel_tests \ - tests/vboot_legacy_clamshell_beep_tests \ - tests/vboot_legacy_clamshell_tests \ - tests/vboot_legacy_menu_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},) @@ -1223,11 +1217,11 @@ ifeq (${MOCK_TPM}${TPM2_MODE},) endif ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel4_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_display_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_kernel_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_legacy_clamshell_beep_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_legacy_clamshell_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_legacy_menu_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 |