diff options
| author | David Hendricks <dhendrix@chromium.org> | 2013-02-04 20:40:47 -0800 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-02-05 23:30:49 +0100 |
| commit | 4c2aafe586d5214409b4de0affb5f743477d2f1c (patch) | |
| tree | dacb3a9efdf11c184c900f115d16301b399c8c92 | |
| parent | 543a6824580331373a2d77694c23905dc7ca48a7 (diff) | |
exynos: de-duplicate UART header content
Some header content got duplicated during the initial porting
effort. This moves generic UART header stuff to exynos5-common
and leaves exynos5250 #defines in the AP-specific UART header.
Change-Id: Ifb6289d7b9dc26c76ae4dfcf511590b3885715a3
Signed-off-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: http://review.coreboot.org/2285
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | src/cpu/samsung/exynos5-common/uart.h | 2 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5250/uart.h | 41 | ||||
| -rw-r--r-- | src/include/uart.h | 2 |
3 files changed, 5 insertions, 40 deletions
diff --git a/src/cpu/samsung/exynos5-common/uart.h b/src/cpu/samsung/exynos5-common/uart.h index 350e224b86..52da62d55a 100644 --- a/src/cpu/samsung/exynos5-common/uart.h +++ b/src/cpu/samsung/exynos5-common/uart.h @@ -52,4 +52,6 @@ static inline int s5p_uart_divslot(void) return 0; } +void uart_init(void); + #endif diff --git a/src/cpu/samsung/exynos5250/uart.h b/src/cpu/samsung/exynos5250/uart.h index 033d605314..1d872d705f 100644 --- a/src/cpu/samsung/exynos5250/uart.h +++ b/src/cpu/samsung/exynos5250/uart.h @@ -23,50 +23,13 @@ * from u-boot. */ -#ifndef __EXYNOS5_UART_H_ -#define __EXYNOS5_UART_H_ +#ifndef __EXYNOS5250_UART_H_ +#define __EXYNOS5250_UART_H_ -#include <types.h> - -/* FIXME: should these move into a Kconfig file? */ #define EXYNOS5_UART0_BASE 0x12c00000 #define EXYNOS5_UART1_BASE 0x12c10000 #define EXYNOS5_UART2_BASE 0x12c20000 #define EXYNOS5_UART3_BASE 0x12c30000 #define EXYNOS5_ISP_UART_BASE 0x13190000 -#if 0 -/* baudrate rest value */ -union br_rest { - unsigned short slot; /* udivslot */ - unsigned char value; /* ufracval */ -}; -#endif - -struct s5p_uart { - uint32_t ulcon; - uint32_t ucon; - uint32_t ufcon; - uint32_t umcon; - uint32_t utrstat; - uint32_t uerstat; - uint32_t ufstat; - uint32_t umstat; - uint8_t utxh; - uint8_t res1[3]; - uint8_t urxh; - uint8_t res2[3]; - uint32_t ubrdiv; - uint32_t ufracval; - uint32_t uintp; - uint32_t uints; - uint32_t uintm; -}; - -static inline int s5p_uart_divslot(void) -{ - return 0; -} - -void uart_init(void); #endif diff --git a/src/include/uart.h b/src/include/uart.h index 6628314ae2..2a72575871 100644 --- a/src/include/uart.h +++ b/src/include/uart.h @@ -31,7 +31,7 @@ #endif #if CONFIG_CPU_SAMSUNG_EXYNOS5 -#include <cpu/samsung/exynos5250/uart.h> +#include <cpu/samsung/exynos5-common/uart.h> #endif #ifndef __ROMCC__ |