4 files changed, 12 insertions, 3 deletions

diff --git a/src/soc/amd/common/block/include/amdblocks/uart.h b/src/soc/amd/common/block/include/amdblocks/uart.h
new file mode 100644
index 0000000000..95d73237f7
--- /dev/null
+++ b/src/soc/amd/common/block/include/amdblocks/uart.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef AMD_BLOCK_UART_H
+#define AMD_BLOCK_UART_H
+
+#include <types.h>
+
+uintptr_t get_uart_base(unsigned int idx); /* get MMIO base address of FCH UART */
+
+#endif /* AMD_BLOCK_UART_H */
diff --git a/src/soc/amd/common/block/uart/uart_console.c b/src/soc/amd/common/block/uart/uart_console.c
index ff9122fbe4..9f37190d24 100644
--- a/src/soc/amd/common/block/uart/uart_console.c
+++ b/src/soc/amd/common/block/uart/uart_console.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <amdblocks/uart.h>
 #include <console/uart.h>
-#include <soc/uart.h>
 
 /*
  * uart_platform_base and uart_platform_refclk are used by the console UART driver and need to
diff --git a/src/soc/amd/picasso/include/soc/uart.h b/src/soc/amd/picasso/include/soc/uart.h
index 051c8bf4d5..9b99cd4b24 100644
--- a/src/soc/amd/picasso/include/soc/uart.h
+++ b/src/soc/amd/picasso/include/soc/uart.h
@@ -8,6 +8,4 @@
 void set_uart_config(unsigned int idx); /* configure hardware of FCH UART selected by idx */
 void clear_uart_legacy_config(void); /* disable legacy I/O decode for FCH UART */
 
-uintptr_t get_uart_base(unsigned int idx); /* get MMIO base address of FCH UART */
-
 #endif /* AMD_PICASSO_UART_H */
diff --git a/src/soc/amd/picasso/uart.c b/src/soc/amd/picasso/uart.c
index 472a0be7d5..f46daed4c2 100644
--- a/src/soc/amd/picasso/uart.c
+++ b/src/soc/amd/picasso/uart.c
@@ -6,6 +6,7 @@
 #include <device/mmio.h>
 #include <amdblocks/gpio_banks.h>
 #include <amdblocks/aoac.h>
+#include <amdblocks/uart.h>
 #include <soc/southbridge.h>
 #include <soc/gpio.h>
 #include <soc/uart.h>