[coreboot-gerrit] Change in coreboot[master]: soc/amd/picasso: move UART console code to common folder

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48515 )

Change subject: soc/amd/picasso: move UART console code to common folder
......................................................................

soc/amd/picasso: move UART console code to common folder

Change-Id: Ibc9a4c05bdfc7cd3cd0eada67563386c95d2b50e
Signed-off-by: Felix Held 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48515
Tested-by: build bot (Jenkins) 
Reviewed-by: Marshall Dawson 
---
A src/soc/amd/common/block/uart/Makefile.inc
R src/soc/amd/common/block/uart/uart_console.c
M src/soc/amd/picasso/Makefile.inc
3 files changed, 15 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Marshall Dawson: Looks good to me, approved

diff --git a/src/soc/amd/common/block/uart/Makefile.inc b/src/soc/amd/common/block/uart/Makefile.inc
new file mode 100644
index 0000000..9d96845
--- /dev/null
+++ b/src/soc/amd/common/block/uart/Makefile.inc
@@ -0,0 +1,15 @@
+ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_UART),y)
+
+bootblock-$(CONFIG_AMD_SOC_CONSOLE_UART) += uart_console.c
+
+romstage-$(CONFIG_AMD_SOC_CONSOLE_UART) += uart_console.c
+
+verstage_x86-$(CONFIG_AMD_SOC_CONSOLE_UART) += uart_console.c
+
+ramstage-$(CONFIG_AMD_SOC_CONSOLE_UART) += uart_console.c
+
+ifeq ($(CONFIG_DEBUG_SMI),y)
+smm-$(CONFIG_AMD_SOC_CONSOLE_UART) += uart_console.c
+endif
+
+endif # CONFIG_SOC_AMD_COMMON_BLOCK_UART
diff --git a/src/soc/amd/picasso/uart_console.c b/src/soc/amd/common/block/uart/uart_console.c
similarity index 100%
rename from src/soc/amd/picasso/uart_console.c
rename to src/soc/amd/common/block/uart/uart_console.c
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 53b8c8d..42f1ef5 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -17,7 +17,6 @@
 bootblock-y += early_fch.c
 bootblock-y += i2c.c
 bootblock-y += uart.c
-bootblock-$(CONFIG_AMD_SOC_CONSOLE_UART) += uart_console.c
 bootblock-y += gpio.c
 bootblock-y += reset.c

@@ -27,14 +26,12 @@
 romstage-y += reset.c
 romstage-y += memmap.c
 romstage-y += uart.c
-romstage-$(CONFIG_AMD_SOC_CONSOLE_UART) += uart_console.c
 romstage-y += psp.c
 romstage-y += mrc_cache.c

verstage-y += i2c.c
 verstage_x86-y += gpio.c
 verstage_x86-y += uart.c
-verstage_x86-$(CONFIG_AMD_SOC_CONSOLE_UART) += uart_console.c
 verstage_x86-y += reset.c

ramstage-y += i2c.c
@@ -53,7 +50,6 @@
 ramstage-y += memmap.c
 ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c
 ramstage-y += uart.c
-ramstage-$(CONFIG_AMD_SOC_CONSOLE_UART) += uart_console.c
 ramstage-y += finalize.c
 ramstage-y += soc_util.c
 ramstage-y += psp.c
@@ -67,7 +63,6 @@
 smm-y += smihandler.c
 ifeq ($(CONFIG_DEBUG_SMI),y)
 smm-y += uart.c
-smm-$(CONFIG_AMD_SOC_CONSOLE_UART) += uart_console.c
 endif
 smm-y += gpio.c
 smm-y += psp.c