From 234d5c408cece5dead72d95240519158d9b82975 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 13 Nov 2014 10:15:41 +0100 Subject: bsp/xilinx-zynq: Rename BSP_ARM_A9MPCORE_UARTCLK Rename BSP_ARM_A9MPCORE_UARTCLK to ZYNQ_CLOCK_UART since this clock has nothing to do with the Cortex-A9 MPCore. --- c/src/lib/libbsp/arm/xilinx-zynq/configure.ac | 8 ++++---- c/src/lib/libbsp/arm/xilinx-zynq/console/zynq-uart.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'c/src/lib/libbsp/arm/xilinx-zynq') diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac index cc95850260..a6f16cc502 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac +++ b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac @@ -29,10 +29,10 @@ RTEMS_BSPOPTS_SET([BSP_ARM_A9MPCORE_PERIPHCLK],[xilinx_zynq_zedboard*],[66666666 RTEMS_BSPOPTS_SET([BSP_ARM_A9MPCORE_PERIPHCLK],[*],[100000000U]) RTEMS_BSPOPTS_HELP([BSP_ARM_A9MPCORE_PERIPHCLK],[ARM Cortex-A9 MPCore PERIPHCLK clock frequency in Hz]) -RTEMS_BSPOPTS_SET([BSP_ARM_A9MPCORE_UARTCLK],[xilinx_zynq_zc702*],[50000000UL]) -RTEMS_BSPOPTS_SET([BSP_ARM_A9MPCORE_UARTCLK],[xilinx_zynq_zedboard*],[50000000UL]) -RTEMS_BSPOPTS_SET([BSP_ARM_A9MPCORE_UARTCLK],[*],[50000000UL]) -RTEMS_BSPOPTS_HELP([BSP_ARM_A9MPCORE_UARTCLK],[ARM Cortex-A9 MPCore UART 0 clock frequency in Hz]) +RTEMS_BSPOPTS_SET([ZYNQ_CLOCK_UART],[xilinx_zynq_zc702*],[50000000UL]) +RTEMS_BSPOPTS_SET([ZYNQ_CLOCK_UART],[xilinx_zynq_zedboard*],[50000000UL]) +RTEMS_BSPOPTS_SET([ZYNQ_CLOCK_UART],[*],[50000000UL]) +RTEMS_BSPOPTS_HELP([ZYNQ_CLOCK_UART],[Zynq UART clock frequency in Hz]) USE_FAST_IDLE=0 AS_IF([test "x${RTEMS_BSP}" == xxilinx_zynq_a9_qemu], [USE_FAST_IDLE=1]) diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/console/zynq-uart.c b/c/src/lib/libbsp/arm/xilinx-zynq/console/zynq-uart.c index 92c9b21ae1..aa96eba375 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/console/zynq-uart.c +++ b/c/src/lib/libbsp/arm/xilinx-zynq/console/zynq-uart.c @@ -34,7 +34,7 @@ uint32_t zynq_uart_input_clock(void) __attribute__ ((weak)); uint32_t zynq_uart_input_clock(void) { - return BSP_ARM_A9MPCORE_UARTCLK; + return ZYNQ_CLOCK_UART; } static int zynq_cal_baud_rate(uint32_t baudrate, -- cgit v1.2.3