9 files changed, 10 insertions, 10 deletions

diff --git a/src/soc/intel/alderlake/uart.c b/src/soc/intel/alderlake/uart.c
index 46f6220ec3..6e64e0faff 100644
--- a/src/soc/intel/alderlake/uart.c
+++ b/src/soc/intel/alderlake/uart.c
@@ -44,4 +44,4 @@ const struct uart_controller_config uart_ctrlr_config[] = {
 	}
 };
 
-const int uart_max_index = ARRAY_SIZE(uart_ctrlr_config);
+const int uart_ctrlr_config_size = ARRAY_SIZE(uart_ctrlr_config);
diff --git a/src/soc/intel/apollolake/uart.c b/src/soc/intel/apollolake/uart.c
index 28ad71a19d..2a2d7a20df 100644
--- a/src/soc/intel/apollolake/uart.c
+++ b/src/soc/intel/apollolake/uart.c
@@ -62,4 +62,4 @@ const struct uart_controller_config uart_ctrlr_config[] = {
 #endif
 };
 
-const int uart_max_index = ARRAY_SIZE(uart_ctrlr_config);
+const int uart_ctrlr_config_size = ARRAY_SIZE(uart_ctrlr_config);
diff --git a/src/soc/intel/cannonlake/uart.c b/src/soc/intel/cannonlake/uart.c
index c0d0e49e54..cc44a61bb5 100644
--- a/src/soc/intel/cannonlake/uart.c
+++ b/src/soc/intel/cannonlake/uart.c
@@ -38,4 +38,4 @@ const struct uart_controller_config uart_ctrlr_config[] = {
 	}
 };
 
-const int uart_max_index = ARRAY_SIZE(uart_ctrlr_config);
+const int uart_ctrlr_config_size = ARRAY_SIZE(uart_ctrlr_config);
diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c
index 69b443c8a2..3a64a16e6f 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -21,7 +21,7 @@
 #define UART_CONSOLE_INVALID_INDEX	0xFF
 
 extern const struct uart_controller_config uart_ctrlr_config[];
-extern const int uart_max_index;
+extern const int uart_ctrlr_config_size;
 
 static void uart_lpss_init(pci_devfn_t dev, uintptr_t baseaddr)
 {
@@ -49,7 +49,7 @@ static int uart_get_valid_index(void)
 {
 	int index;
 
-	for (index = 0; index < uart_max_index; index++) {
+	for (index = 0; index < uart_ctrlr_config_size; index++) {
 		if (uart_ctrlr_config[index].console_index ==
 				CONFIG_UART_FOR_CONSOLE)
 			return index;
diff --git a/src/soc/intel/elkhartlake/uart.c b/src/soc/intel/elkhartlake/uart.c
index c0d0e49e54..cc44a61bb5 100644
--- a/src/soc/intel/elkhartlake/uart.c
+++ b/src/soc/intel/elkhartlake/uart.c
@@ -38,4 +38,4 @@ const struct uart_controller_config uart_ctrlr_config[] = {
 	}
 };
 
-const int uart_max_index = ARRAY_SIZE(uart_ctrlr_config);
+const int uart_ctrlr_config_size = ARRAY_SIZE(uart_ctrlr_config);
diff --git a/src/soc/intel/icelake/uart.c b/src/soc/intel/icelake/uart.c
index c0d0e49e54..cc44a61bb5 100644
--- a/src/soc/intel/icelake/uart.c
+++ b/src/soc/intel/icelake/uart.c
@@ -38,4 +38,4 @@ const struct uart_controller_config uart_ctrlr_config[] = {
 	}
 };
 
-const int uart_max_index = ARRAY_SIZE(uart_ctrlr_config);
+const int uart_ctrlr_config_size = ARRAY_SIZE(uart_ctrlr_config);
diff --git a/src/soc/intel/jasperlake/uart.c b/src/soc/intel/jasperlake/uart.c
index c0d0e49e54..cc44a61bb5 100644
--- a/src/soc/intel/jasperlake/uart.c
+++ b/src/soc/intel/jasperlake/uart.c
@@ -38,4 +38,4 @@ const struct uart_controller_config uart_ctrlr_config[] = {
 	}
 };
 
-const int uart_max_index = ARRAY_SIZE(uart_ctrlr_config);
+const int uart_ctrlr_config_size = ARRAY_SIZE(uart_ctrlr_config);
diff --git a/src/soc/intel/skylake/uart.c b/src/soc/intel/skylake/uart.c
index 9e2dcb3b02..423578847a 100644
--- a/src/soc/intel/skylake/uart.c
+++ b/src/soc/intel/skylake/uart.c
@@ -37,4 +37,4 @@ const struct uart_controller_config uart_ctrlr_config[] = {
 	}
 };
 
-const int uart_max_index = ARRAY_SIZE(uart_ctrlr_config);
+const int uart_ctrlr_config_size = ARRAY_SIZE(uart_ctrlr_config);
diff --git a/src/soc/intel/tigerlake/uart.c b/src/soc/intel/tigerlake/uart.c
index 5ae54d5093..a3aee398c4 100644
--- a/src/soc/intel/tigerlake/uart.c
+++ b/src/soc/intel/tigerlake/uart.c
@@ -44,4 +44,4 @@ const struct uart_controller_config uart_ctrlr_config[] = {
 	}
 };
 
-const int uart_max_index = ARRAY_SIZE(uart_ctrlr_config);
+const int uart_ctrlr_config_size = ARRAY_SIZE(uart_ctrlr_config);