[PATCH 131/149] global: Migrate CONFIG_USART_BASE to CFG

Tom Rini
2022-12-04T15:31:16Z

Perform a simple rename of CONFIG_USART_BASE to CFG_USART_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
drivers/serial/atmel_usart.c | 10 +++++-----
include/configs/corvus.h | 2 +-
include/configs/sam9x60_curiosity.h | 2 +-
include/configs/sam9x60ek.h | 2 +-
include/configs/smartweb.h | 2 +-
include/configs/taurus.h | 2 +-
include/configs/vinco.h | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 90ccdf6b2945..56655427b06b 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -72,13 +72,13 @@ static void atmel_serial_activate(atmel_usart3_t *usart)

static void atmel_serial_setbrg(void)
{
- atmel_serial_setbrg_internal((atmel_usart3_t *)CONFIG_USART_BASE,
+ atmel_serial_setbrg_internal((atmel_usart3_t *)CFG_USART_BASE,
CONFIG_USART_ID, gd->baudrate);
}

static int atmel_serial_init(void)
{
- atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+ atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;

atmel_serial_init_internal(usart);
serial_setbrg();
@@ -89,7 +89,7 @@ static int atmel_serial_init(void)

static void atmel_serial_putc(char c)
{
- atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+ atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;

if (c == '\n')
serial_putc('\r');
@@ -100,7 +100,7 @@ static void atmel_serial_putc(char c)

static int atmel_serial_getc(void)
{
- atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+ atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;

while (!(readl(&usart->csr) & USART3_BIT(RXRDY)))
schedule();
@@ -109,7 +109,7 @@ static int atmel_serial_getc(void)

static int atmel_serial_tstc(void)
{
- atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+ atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
return (readl(&usart->csr) & USART3_BIT(RXRDY)) != 0;
}

diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 8a61086ecc15..c9eb75d93088 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -28,7 +28,7 @@
#define CFG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */

/* serial console */
-#define CONFIG_USART_BASE ATMEL_BASE_DBGU
+#define CFG_USART_BASE ATMEL_BASE_DBGU
#define CONFIG_USART_ID ATMEL_ID_SYS

/* SDRAM */
diff --git a/include/configs/sam9x60_curiosity.h b/include/configs/sam9x60_curiosity.h
index f44ce909b918..204020d5ee74 100644
--- a/include/configs/sam9x60_curiosity.h
+++ b/include/configs/sam9x60_curiosity.h
@@ -13,7 +13,7 @@
#define CFG_SYS_AT91_SLOW_CLOCK 32768
#define CFG_SYS_AT91_MAIN_CLOCK 24000000 /* 24 MHz crystal */

-#define CONFIG_USART_BASE ATMEL_BASE_DBGU
+#define CFG_USART_BASE ATMEL_BASE_DBGU
#define CONFIG_USART_ID 0 /* ignored in arm */

/* SDRAM */
diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h
index 27b39ebf4174..800b98ff98af 100644
--- a/include/configs/sam9x60ek.h
+++ b/include/configs/sam9x60ek.h
@@ -14,7 +14,7 @@
#define CFG_SYS_AT91_SLOW_CLOCK 32768
#define CFG_SYS_AT91_MAIN_CLOCK 24000000 /* 24 MHz crystal */

-#define CONFIG_USART_BASE ATMEL_BASE_DBGU
+#define CFG_USART_BASE ATMEL_BASE_DBGU
#define CONFIG_USART_ID 0 /* ignored in arm */

/*
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 762f61470b15..f9a5aa9e32d0 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -61,7 +61,7 @@
#define CFG_SYS_NAND_READY_PIN AT91_PIN_PC13

/* serial console */
-#define CONFIG_USART_BASE ATMEL_BASE_DBGU
+#define CFG_USART_BASE ATMEL_BASE_DBGU
#define CONFIG_USART_ID ATMEL_ID_SYS

/* DFU class support */
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 855218a8901e..88870d6fdf69 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -34,7 +34,7 @@

/* Misc CPU related */

-#define CONFIG_USART_BASE ATMEL_BASE_DBGU
+#define CFG_USART_BASE ATMEL_BASE_DBGU
#define CONFIG_USART_ID ATMEL_ID_SYS

/*
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 0698ae1d1c6e..3b4032301f6e 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -17,7 +17,7 @@
/* The value in the common file is too far away for the VInCo platform */

/* serial console */
-#define CONFIG_USART_BASE 0xfc00c000
+#define CFG_USART_BASE 0xfc00c000
#define CONFIG_USART_ID 30

/* Timer */
--
2.25.1