diff options
| author | Khoronzhuk, Ivan <ivan.khoronzhuk@ti.com> | 2014-07-16 00:59:25 +0300 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-25 16:26:11 -0400 |
| commit | 7c387646060c6221836b332f5d0e0c9771ab99c1 (patch) | |
| tree | 08c978baf5a77fb85eb5f2e6d9f65c5c812ac44b | |
| parent | 20187fd11c37226fac8661bbac96ddd4fdf507b1 (diff) | |
| download | blackbird-obmc-uboot-7c387646060c6221836b332f5d0e0c9771ab99c1.tar.gz blackbird-obmc-uboot-7c387646060c6221836b332f5d0e0c9771ab99c1.zip | |
keystone2: use CONFIG_SOC_KEYSTONE in common places
Use CONFIG_SOC_KEYSTONE in common places instead of defining
a lot of "if def .. || if def " for different Keystone2 SoC types.
Acked-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
| -rw-r--r-- | common/image-fdt.c | 2 | ||||
| -rw-r--r-- | drivers/serial/ns16550.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/image-fdt.c b/common/image-fdt.c index 9fc7481fd8..7795b80ccf 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -492,7 +492,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, if (!ft_verify_fdt(blob)) return -1; -#ifdef CONFIG_SOC_K2HK +#if defined(CONFIG_SOC_KEYSTONE) if (IMAGE_OF_BOARD_SETUP) ft_board_setup_ex(blob, gd->bd); #endif diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index f26979dbe1..8e7052dda7 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -30,7 +30,7 @@ #define serial_in(y) readb(y) #endif -#if defined(CONFIG_K2HK_EVM) +#if defined(CONFIG_SOC_KEYSTONE) #define UART_REG_VAL_PWREMU_MGMT_UART_DISABLE 0 #define UART_REG_VAL_PWREMU_MGMT_UART_ENABLE ((1 << 14) | (1 << 13) | (1 << 0)) #undef UART_MCRVAL @@ -88,7 +88,7 @@ void NS16550_init(NS16550_t com_port, int baud_divisor) /* /16 is proper to hit 115200 with 48MHz */ serial_out(0, &com_port->mdr1); #endif /* CONFIG_OMAP */ -#if defined(CONFIG_K2HK_EVM) +#if defined(CONFIG_SOC_KEYSTONE) serial_out(UART_REG_VAL_PWREMU_MGMT_UART_ENABLE, &com_port->regC); #endif } |
