drivers/ocp, mb/ocp/deltalake: move get_loglevel_from_vpd function
Move get_loglevel_from_vpd from mb/ocp/deltalake to driver
drivers/ocp/vpd/loglevel_vpd.c.
Change-Id: I70af1051f63c527fd8150f5ecbe4765b4aaacd20
Signed-off-by: Johnny Lin <johnny_lin@wiwynn.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71936
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
diff --git a/src/drivers/ocp/include/vpd.h b/src/drivers/ocp/include/vpd.h
index d58f791..33fece5 100644
--- a/src/drivers/ocp/include/vpd.h
+++ b/src/drivers/ocp/include/vpd.h
@@ -82,4 +82,5 @@
const int max);
bool get_bool_from_vpd(const char *const key, const bool fallback);
int get_cxl_mode_from_vpd(void);
+int get_loglevel_from_vpd(const char *const key, const int fallback);
#endif
diff --git a/src/drivers/ocp/vpd/Makefile.inc b/src/drivers/ocp/vpd/Makefile.inc
index c34866f..8db5afa 100644
--- a/src/drivers/ocp/vpd/Makefile.inc
+++ b/src/drivers/ocp/vpd/Makefile.inc
@@ -1,2 +1,5 @@
romstage-$(CONFIG_OCP_VPD) += vpd_util.c
ramstage-$(CONFIG_OCP_VPD) += vpd_util.c
+ifeq ($(CONFIG_VPD),y)
+all-$(CONFIG_CONSOLE_OVERRIDE_LOGLEVEL) += loglevel_vpd.c
+endif
diff --git a/src/drivers/ocp/vpd/loglevel_vpd.c b/src/drivers/ocp/vpd/loglevel_vpd.c
new file mode 100644
index 0000000..7a6db57
--- /dev/null
+++ b/src/drivers/ocp/vpd/loglevel_vpd.c
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <console/console.h>
+#include <drivers/vpd/vpd.h>
+#include <drivers/ocp/include/vpd.h>
+
+int get_loglevel_from_vpd(const char *const key, const int fallback)
+{
+ int log_level = fallback;
+
+ if (vpd_get_int(key, VPD_RW_THEN_RO, &log_level)) {
+ if (log_level < 0 || log_level >= BIOS_NEVER)
+ log_level = fallback;
+ }
+ return log_level;
+}
+
+int get_console_loglevel(void)
+{
+ return get_loglevel_from_vpd(COREBOOT_LOG_LEVEL, COREBOOT_LOG_LEVEL_DEFAULT);
+}
diff --git a/src/mainboard/ocp/deltalake/Makefile.inc b/src/mainboard/ocp/deltalake/Makefile.inc
index c1dc8d7..1b05344 100644
--- a/src/mainboard/ocp/deltalake/Makefile.inc
+++ b/src/mainboard/ocp/deltalake/Makefile.inc
@@ -7,6 +7,5 @@
ramstage-y += ramstage.c ipmi.c
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c
-all-$(CONFIG_CONSOLE_OVERRIDE_LOGLEVEL) += loglevel_vpd.c
all-y += console.c
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include
diff --git a/src/mainboard/ocp/deltalake/loglevel_vpd.c b/src/mainboard/ocp/deltalake/loglevel_vpd.c
deleted file mode 100644
index aa85cb9..0000000
--- a/src/mainboard/ocp/deltalake/loglevel_vpd.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <console/console.h>
-#include <drivers/vpd/vpd.h>
-
-#include "vpd.h"
-
-int get_console_loglevel(void)
-{
- int log_level = COREBOOT_LOG_LEVEL_DEFAULT;
-
- if (vpd_get_int(COREBOOT_LOG_LEVEL, VPD_RW_THEN_RO, &log_level)) {
- if (log_level < 0 || log_level >= BIOS_NEVER)
- log_level = COREBOOT_LOG_LEVEL_DEFAULT;
- }
- return log_level;
-}