From d9ece3daa9c9e09a2d4a3e0cdb64eee39eefb014 Mon Sep 17 00:00:00 2001 From: Konrad Adamczyk Date: Mon, 29 May 2023 12:42:39 +0000 Subject: 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) --- src/soc/amd/cezanne/aoac.c | 4 ---- src/soc/amd/cezanne/include/soc/aoac_defs.h | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/soc/amd/cezanne/aoac.c b/src/soc/amd/cezanne/aoac.c index 14758e0da4..e9a7496aff 100644 --- a/src/soc/amd/cezanne/aoac.c +++ b/src/soc/amd/cezanne/aoac.c @@ -7,10 +7,6 @@ #include #include -#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 25311dd3b3..58c67d5a56 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 */ -- cgit v1.2.3