global: Migrate CONFIG_USART_ID to CFG

Perform a simple rename of CONFIG_USART_ID to CFG_USART_ID

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 5665542..9d97bc8 100644 (file)
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -73,7 +73,7 @@ static void atmel_serial_activate(atmel_usart3_t *usart)
 static void atmel_serial_setbrg(void)
 {
        atmel_serial_setbrg_internal((atmel_usart3_t *)CFG_USART_BASE,
-                                    CONFIG_USART_ID, gd->baudrate);
+                                    CFG_USART_ID, gd->baudrate);
 }
 
 static int atmel_serial_init(void)

diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index c9eb75d..f2675e0 100644 (file)
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -29,7 +29,7 @@
 
 /* serial console */
 #define CFG_USART_BASE         ATMEL_BASE_DBGU
-#define CONFIG_USART_ID                        ATMEL_ID_SYS
+#define CFG_USART_ID                   ATMEL_ID_SYS
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE           ATMEL_BASE_CS6

diff --git a/include/configs/sam9x60_curiosity.h b/include/configs/sam9x60_curiosity.h
index 204020d..e79f80f 100644 (file)
--- a/include/configs/sam9x60_curiosity.h
+++ b/include/configs/sam9x60_curiosity.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_AT91_MAIN_CLOCK        24000000        /* 24 MHz crystal */
 
 #define CFG_USART_BASE   ATMEL_BASE_DBGU
-#define CONFIG_USART_ID     0 /* ignored in arm */
+#define CFG_USART_ID     0 /* ignored in arm */
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE             0x20000000

diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h
index 800b98f..2c76182 100644 (file)
--- a/include/configs/sam9x60ek.h
+++ b/include/configs/sam9x60ek.h
@@ -15,7 +15,7 @@
 #define CFG_SYS_AT91_MAIN_CLOCK        24000000        /* 24 MHz crystal */
 
 #define CFG_USART_BASE   ATMEL_BASE_DBGU
-#define CONFIG_USART_ID     0 /* ignored in arm */
+#define CFG_USART_ID     0 /* ignored in arm */
 
 /*
  * define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0)

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index f9a5aa9..75a1670 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -62,7 +62,7 @@
 
 /* serial console */
 #define CFG_USART_BASE         ATMEL_BASE_DBGU
-#define CONFIG_USART_ID                        ATMEL_ID_SYS
+#define CFG_USART_ID                   ATMEL_ID_SYS
 
 /* DFU class support */
 #define DFU_MANIFEST_POLL_TIMEOUT      25000

diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 88870d6..174b848 100644 (file)
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -35,7 +35,7 @@
 /* Misc CPU related */
 
 #define CFG_USART_BASE         ATMEL_BASE_DBGU
-#define CONFIG_USART_ID                        ATMEL_ID_SYS
+#define CFG_USART_ID                   ATMEL_ID_SYS
 
 /*
  * SDRAM: 1 bank, min 32, max 128 MB

diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 3b40323..68c56df 100644 (file)
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -18,7 +18,7 @@
 
 /* serial console */
 #define CFG_USART_BASE         0xfc00c000
-#define CONFIG_USART_ID                        30
+#define CFG_USART_ID                   30
 
 /* Timer */
 #define CFG_SYS_TIMER_COUNTER  0xfc06863c