Signed-off-by: Tom Rini trini@konsulko.com --- drivers/serial/atmel_usart.c | 2 +- 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 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index 56655427b06b..9d97bc865445 100644 --- 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 c9eb75d93088..f2675e0ec864 100644 --- 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 204020d5ee74..e79f80f17f61 100644 --- 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 800b98ff98af..2c761821efb1 100644 --- 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 f9a5aa9e32d0..75a1670e3317 100644 --- 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 88870d6fdf69..174b848e2595 100644 --- 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 9d6abbf7b342..1d7a3a1562a0 100644 --- 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 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1b89145261ce..96532633226f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -239,7 +239,7 @@ CFG_UBOOT_SECTOR_COUNT CFG_UBOOT_SECTOR_START CFG_UEC_ETH CFG_USART_BASE -CONFIG_USART_ID +CFG_USART_ID CONFIG_USBD_HS CONFIG_USB_BOOTING CONFIG_USB_EXT2_BOOT