[S] Change in coreboot[master]: mb/google/guybrush: Move helper AOAC for console to AOAC header

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/75491?usp=email )

Change subject: mb/google/guybrush: Move helper AOAC for console to AOAC header
......................................................................

mb/google/guybrush: Move helper AOAC for console to AOAC header

BUG=b:217968734
TEST=Build guybrush firmware

Change-Id: I93dfa50cd1116e0f6652186acb37fd43d638cf84
Signed-off-by: Konrad Adamczyk 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/75491
Reviewed-by: Raul Rangel 
Reviewed-by: Matt DeVillier 
Tested-by: build bot (Jenkins) 
---
M src/soc/amd/cezanne/aoac.c
M src/soc/amd/cezanne/include/soc/aoac_defs.h
2 files changed, 6 insertions(+), 4 deletions(-)

Approvals:
  Matt DeVillier: Looks good to me, approved
  Raul Rangel: Looks good to me, approved
  build bot (Jenkins): Verified

diff --git a/src/soc/amd/cezanne/aoac.c b/src/soc/amd/cezanne/aoac.c
index 14758e0..e9a7496 100644
--- a/src/soc/amd/cezanne/aoac.c
+++ b/src/soc/amd/cezanne/aoac.c
@@ -7,10 +7,6 @@
 #include <soc/southbridge.h>
 #include <delay.h>

-#define FCH_AOAC_UART_FOR_CONSOLE \
-		(CONFIG_UART_FOR_CONSOLE == 0 ? FCH_AOAC_DEV_UART0 \
-		: CONFIG_UART_FOR_CONSOLE == 1 ? FCH_AOAC_DEV_UART1 \
-		: -1)
 #if CONFIG(AMD_SOC_CONSOLE_UART) && FCH_AOAC_UART_FOR_CONSOLE == -1
 # error Unsupported UART_FOR_CONSOLE chosen
 #endif
diff --git a/src/soc/amd/cezanne/include/soc/aoac_defs.h b/src/soc/amd/cezanne/include/soc/aoac_defs.h
index 25311dd..58c67d5 100644
--- a/src/soc/amd/cezanne/include/soc/aoac_defs.h
+++ b/src/soc/amd/cezanne/include/soc/aoac_defs.h
@@ -17,4 +17,10 @@
 #define FCH_AOAC_DEV_ESPI		27
 #define FCH_AOAC_DEV_EMMC		28

+/* FCH helper define to determine UART_FOR_CONSOLE */
+#define FCH_AOAC_UART_FOR_CONSOLE \
+		(CONFIG_UART_FOR_CONSOLE == 0 ? FCH_AOAC_DEV_UART0 \
+		: CONFIG_UART_FOR_CONSOLE == 1 ? FCH_AOAC_DEV_UART1 \
+		: -1)
+
 #endif /* AMD_CEZANNE_AOAC_DEFS_H */