aboutsummaryrefslogtreecommitdiff
path: root/src/soc/amd/picasso/aoac.c
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2020-12-09 16:25:18 +0100
committerFelix Held <felix-coreboot@felixheld.de>2020-12-11 00:42:32 +0000
commit0dfaf33a1331ede41c052be20217abcf2b70e141 (patch)
treeed9b05541a01a7763debb1d63c93c337a2e0c9f9 /src/soc/amd/picasso/aoac.c
parente7a0202ed04db7aa5033e659345ccc75c3bc0773 (diff)
soc/amd/picasso: rename PICASSO_CONSOLE_UART to AMD_SOC_CONSOLE_UART
This allows factoring out the common initialization for the integrated UARTs. Change-Id: I7399a13b9280b732086c6f8e6dfd9f1207d8c8ff Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48508 Reviewed-by: Martin Roth <martinroth@google.com> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/amd/picasso/aoac.c')
-rw-r--r--src/soc/amd/picasso/aoac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/soc/amd/picasso/aoac.c b/src/soc/amd/picasso/aoac.c
index c97700d38f..aed6d7487d 100644
--- a/src/soc/amd/picasso/aoac.c
+++ b/src/soc/amd/picasso/aoac.c
@@ -12,7 +12,7 @@
: CONFIG_UART_FOR_CONSOLE == 2 ? FCH_AOAC_DEV_UART2 \
: CONFIG_UART_FOR_CONSOLE == 3 ? FCH_AOAC_DEV_UART3 \
: -1)
-#if CONFIG(PICASSO_CONSOLE_UART) && FCH_AOAC_UART_FOR_CONSOLE == -1
+#if CONFIG(AMD_SOC_CONSOLE_UART) && FCH_AOAC_UART_FOR_CONSOLE == -1
# error Unsupported UART_FOR_CONSOLE chosen
#endif
@@ -43,13 +43,13 @@ void enable_aoac_devices(void)
for (i = 0; i < ARRAY_SIZE(aoac_devs); i++)
power_on_aoac_device(aoac_devs[i]);
- if (CONFIG(PICASSO_CONSOLE_UART))
+ if (CONFIG(AMD_SOC_CONSOLE_UART))
power_on_aoac_device(FCH_AOAC_UART_FOR_CONSOLE);
/* Wait for AOAC devices to indicate power and clock OK */
for (i = 0; i < ARRAY_SIZE(aoac_devs); i++)
wait_for_aoac_enabled(aoac_devs[i]);
- if (CONFIG(PICASSO_CONSOLE_UART))
+ if (CONFIG(AMD_SOC_CONSOLE_UART))
wait_for_aoac_enabled(FCH_AOAC_UART_FOR_CONSOLE);
}