vboot: collect UI-related stubs in vboot2 namespace

Collect all UI-related stubs in the vboot2 namespace
within 2lib/2stub.c.

BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none

Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: I64cb44f5e1db25b96a1a4a266b78f02e82110c5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2635674
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2847876
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
Tested-by: Nick Vaccaro <nvaccaro@google.com>
Commit-Queue: Chung-Sheng Wu <chungsheng@chromium.org>

3 files changed, 40 insertions, 37 deletions

diff --git a/firmware/2lib/2stub.c b/firmware/2lib/2stub.c
index 782ad42c..c5f7bbf5 100644
--- a/firmware/2lib/2stub.c
+++ b/firmware/2lib/2stub.c
@@ -74,6 +74,9 @@ void vb2ex_abort(void)
 	abort();
 }
 
+/*****************************************************************************/
+/* UI-related stubs */
+
 __attribute__((weak))
 const char *vb2ex_get_debug_info(struct vb2_context *ctx)
 {
@@ -112,3 +115,40 @@ vb2_error_t vb2ex_diag_memory_full_test(int reset, const char **out)
 	*out = "mock";
 	return VB2_SUCCESS;
 }
+
+__attribute__((weak))
+void vb2ex_msleep(uint32_t msec)
+{
+}
+
+__attribute__((weak))
+void vb2ex_beep(uint32_t msec, uint32_t frequency)
+{
+}
+
+__attribute__((weak))
+uint32_t vb2ex_get_locale_count(void)
+{
+	return 0;
+}
+
+__attribute__((weak))
+uint32_t vb2ex_get_bootloader_count(void)
+{
+	return 0;
+}
+
+__attribute__((weak))
+int vb2ex_physical_presence_pressed(void)
+{
+	return 0;
+}
+
+__attribute__((weak))
+vb2_error_t vb2ex_commit_data(struct vb2_context *ctx)
+{
+	ctx->flags &= ~VB2_CONTEXT_SECDATA_FIRMWARE_CHANGED;
+	ctx->flags &= ~VB2_CONTEXT_SECDATA_KERNEL_CHANGED;
+	ctx->flags &= ~VB2_CONTEXT_NVDATA_CHANGED;
+	return VB2_SUCCESS;
+}
diff --git a/firmware/stub/vboot_api_stub.c b/firmware/stub/vboot_api_stub.c
index f5bc9fc4..521ca4e4 100644
--- a/firmware/stub/vboot_api_stub.c
+++ b/firmware/stub/vboot_api_stub.c
@@ -19,28 +19,6 @@
 #include "vboot_test.h"
 
 __attribute__((weak))
-void vb2ex_msleep(uint32_t msec)
-{
-}
-
-__attribute__((weak))
-void vb2ex_beep(uint32_t msec, uint32_t frequency)
-{
-}
-
-__attribute__((weak))
-uint32_t vb2ex_get_locale_count(void)
-{
-	return 0;
-}
-
-__attribute__((weak))
-uint32_t vb2ex_get_bootloader_count(void)
-{
-	return 0;
-}
-
-__attribute__((weak))
 uint32_t VbExKeyboardRead(void)
 {
 	return 0;
@@ -53,12 +31,6 @@ uint32_t VbExKeyboardReadWithFlags(uint32_t *flags_ptr)
 }
 
 __attribute__((weak))
-int vb2ex_physical_presence_pressed(void)
-{
-	return 0;
-}
-
-__attribute__((weak))
 uint32_t VbExIsShutdownRequested(void)
 {
 	return 0;
diff --git a/firmware/stub/vboot_api_stub_init.c b/firmware/stub/vboot_api_stub_init.c
index 8fffc05f..80684126 100644
--- a/firmware/stub/vboot_api_stub_init.c
+++ b/firmware/stub/vboot_api_stub_init.c
@@ -20,12 +20,3 @@ uint32_t vb2ex_mtime(void)
 	gettimeofday(&tv, NULL);
 	return tv.tv_sec * VB2_MSEC_PER_SEC + tv.tv_usec / VB2_USEC_PER_MSEC;
 }
-
-__attribute__((weak))
-vb2_error_t vb2ex_commit_data(struct vb2_context *ctx)
-{
-	ctx->flags &= ~VB2_CONTEXT_SECDATA_FIRMWARE_CHANGED;
-	ctx->flags &= ~VB2_CONTEXT_SECDATA_KERNEL_CHANGED;
-	ctx->flags &= ~VB2_CONTEXT_NVDATA_CHANGED;
-	return VB2_SUCCESS;
-}