projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
drivers
/
serial
/
serial_pxa.c
diff --git
a/drivers/serial/serial_pxa.c
b/drivers/serial/serial_pxa.c
index 84bb17c11051b9d7ab33cc350d352defbc85e2ca..a9976d709a7e9f39bb804038a25003186279dee0 100644
(file)
--- a/
drivers/serial/serial_pxa.c
+++ b/
drivers/serial/serial_pxa.c
@@
-49,7
+49,7
@@
DECLARE_GLOBAL_DATA_PTR;
#define BTUART_INDEX 0
#define FFUART_INDEX 1
#define STUART_INDEX 2
#define BTUART_INDEX 0
#define FFUART_INDEX 1
#define STUART_INDEX 2
-#elif CONFIG_
PXA250
+#elif CONFIG_
CPU_PXA25X
#define UART_CLK_BASE (1 << 4) /* HWUART */
#define UART_CLK_REG CKEN
#define HWUART_INDEX 0
#define UART_CLK_BASE (1 << 4) /* HWUART */
#define UART_CLK_REG CKEN
#define HWUART_INDEX 0
@@
-68,7
+68,7
@@
DECLARE_GLOBAL_DATA_PTR;
* Only PXA250 has HWUART, to avoid poluting the code with more macros,
* artificially introduce this.
*/
* Only PXA250 has HWUART, to avoid poluting the code with more macros,
* artificially introduce this.
*/
-#ifndef CONFIG_
PXA250
+#ifndef CONFIG_
CPU_PXA25X
#define HWUART_INDEX 0xff
#endif
#define HWUART_INDEX 0xff
#endif