From f15845a77700a03ee89fa064b796d95ff5fa5406 Mon Sep 17 00:00:00 2001 From: Hsuan Ting Chen Date: Tue, 21 Jan 2020 14:40:15 +0800 Subject: vboot: Rename legacy UIs According to crbug.com/1033815, rename files and entry point functions for two legacy UIs. Ideally, these UIs will be deprecated after the detachable UI revamp (b:146399181) is done. common: - rename vboot_ui_common.{c,h} to vboot_ui_legacy_common.{c,h} LEGACY_CLAMSHELL_UI: - rename vboot_ui.c to vboot_ui_legacy_clamshell.c - rename vboot_ui_wilco.c to vboot_ui_legacy_wilco.c - rename VbBootRecovery() to VbBootRecoveryLegacyClamshell() - rename VbBootDiagnostic() to VbBootDiagnosticLegacyClamshell() - rename VbBootDeveloper() to VbBootDeveloperLegacyClamshell() LEGACY_MENU_UI: - rename vboot_ui_menu.c to vboot_ui_legacy_menu.c - rename vboot_ui_menu_private.h to vboot_ui_legacy_menu_private.h - rename VbBootRecoveryMenu() to VbBootRecoveryLegacyMenu() - rename VbBootDeveloperMenu() to VbBootDeveloperLegacyMenu() BRANCH=none BUG=b:146399181,chromium:1033815 TEST=USE="legacy_clamshell_ui" emerge-nami vboot_reference TEST=USE="legacy_menu_ui" emerge-nami vboot_reference Change-Id: I70dafbab0070b19ed963d2a4ba63a95f4a0f3224 Signed-off-by: Hsuan Ting Chen Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2008980 Reviewed-by: Yu-Ping Wu Reviewed-by: Joel Kitching --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fa72868a..48729175 100644 --- a/Makefile +++ b/Makefile @@ -377,10 +377,10 @@ FWLIB_SRCS = \ firmware/lib/vboot_audio.c \ firmware/lib/vboot_display.c \ firmware/lib/vboot_kernel.c \ - firmware/lib/vboot_ui.c \ - firmware/lib/vboot_ui_common.c \ - firmware/lib/vboot_ui_menu.c \ - firmware/lib/vboot_ui_wilco.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 \ firmware/lib20/kernel.c \ firmware/lib20/misc.c \ @@ -663,13 +663,13 @@ TEST_NAMES = \ tests/sha_benchmark \ tests/subprocess_tests \ tests/utility_string_tests \ - tests/vboot_api_devmode_tests \ - tests/vboot_api_kernel2_tests \ tests/vboot_api_kernel4_tests \ tests/vboot_api_kernel_tests \ - tests/vboot_detach_menu_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/verify_kernel ifeq (${MOCK_TPM}${TPM2_MODE},) @@ -1186,13 +1186,13 @@ ifeq (${MOCK_TPM}${TPM2_MODE},) ${RUNTEST} ${BUILD_RUN}/tests/tlcl_tests endif ${RUNTEST} ${BUILD_RUN}/tests/utility_string_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_devmode_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel2_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel4_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_detach_menu_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 .PHONY: run2tests run2tests: install_for_test -- cgit v1.2.1