[rtems commit] bsps: Move zynq-uart to bsps/shared

[Sebastian Huber]

On 03/12/2020 01:51, Joel Sherrill wrote:

> diff --git a/spec/build/bsps/obj.yml b/spec/build/bsps/obj.yml
> index a454783..7ea560b 100644
> --- a/spec/build/bsps/obj.yml
> +++ b/spec/build/bsps/obj.yml
> @@ -52,6 +52,8 @@ install:
>     source:
>     - bsps/include/dev/serial/arm-pl011-regs.h
>     - bsps/include/dev/serial/arm-pl011.h
> +  - bsps/include/dev/serial/zynq-uart-regs.h
> +  - bsps/include/dev/serial/zynq-uart.h
>   - destination: ${BSP_INCLUDEDIR}/rtems/zilog
>     source:
>     - bsps/include/rtems/zilog/z8036.h
> @@ -94,6 +96,8 @@ source:
>   - bsps/shared/dev/serial/ns16550.c
>   - bsps/shared/dev/serial/ns16550-context.c
>   - bsps/shared/dev/serial/serprobe.c
> +- bsps/shared/dev/serial/zynq-uart.c
> +- bsps/shared/dev/serial/zynq-uart-polled.c
>   - bsps/shared/start/bootcard.c
>   - bsps/shared/rtems-version.c
>   type: build

I just realized that the Zynq UART is now built for every BSP. This 
causes new warnings:

[  65/1925] Compiling bsps/shared/dev/serial/zynq-uart-polled.c
[  93/1925] Compiling bsps/shared/dev/serial/zynq-uart.c
In file included from ../../../bsps/arm/xilinx-zynq/include/bsp.h:47,
                  from ../../../bsps/include/dev/irq/arm-gic-irq.h:26,
                  from ../../../bsps/arm/xilinx-zynq/include/bsp/irq.h:43,
                  from ../../../bsps/shared/dev/serial/zynq-uart.c:30:
bsps/include/bspopts.h:11: warning: "ZYNQ_CLOCK_UART" redefined
    11 | #define ZYNQ_CLOCK_UART 50000000
       |
In file included from ../../../bsps/shared/dev/serial/zynq-uart.c:28:
../../../bsps/include/dev/serial/zynq-uart.h:64: note: this is the 
location of the previous definition
    64 | #define ZYNQ_CLOCK_UART 100000000
       |

In file included from ../../../bsps/shared/dev/serial/zynq-uart-polled.c:31:
bsps/include/bspopts.h:11: warning: "ZYNQ_CLOCK_UART" redefined
    11 | #define ZYNQ_CLOCK_UART 50000000
       |
In file included from ../../../bsps/shared/dev/serial/zynq-uart-polled.c:28:
../../../bsps/include/dev/serial/zynq-uart.h:64: note: this is the 
location of the previous definition
    64 | #define ZYNQ_CLOCK_UART 100000000
       |

Please move the Zynq UART into a new build object item, for example 
"spec/build/bsps/objdevserialzynq.yml" and reference it in the grp.yml 
of the BSPs which use it. Remove the:

+#ifndef ZYNQ_CLOCK_UART
+#define ZYNQ_CLOCK_UART 100000000
+#endif
+

-- 
embedded brains GmbH
Herr Sebastian HUBER
Dornierstr. 4
82178 Puchheim
Germany
email: sebastian.hubere at embedded-brains.de
phone: +49-89-18 94 741 - 16
fax:   +49-89-18 94 741 - 08

Registergericht: Amtsgericht München
Registernummer: HRB 157899
Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler
Unsere Datenschutzerklärung finden Sie hier:
https://embedded-brains.de/datenschutzerklaerung/