[PATCH] bsps/powerpc: Include <bspopts.h> to fix the build

[Joel Sherrill]

It was dependent on the CFLAGS including a -D. Or some cases, the -mcpu
option provided the CPU define expected. But virtex and ss555 provide -mcpu
and -D options (now in bspopts.h) which are contradictory.

This fixes (or covers up) most of an issue but those two BSPs need their
CPU flags adjusted.

On Fri, May 25, 2018, 7:35 AM Sebastian Huber <
sebastian.huber at embedded-brains.de> wrote:

> This is a hack.  The cpukit <rtems/asm.h> header file depends on defines
> provided by the BSP.
>
> Update #3425.
> ---
>  bsps/powerpc/shared/start/bsp-start-zero.S | 2 +-
>  bsps/powerpc/ss555/start/irq_asm.S         | 1 +
>  bsps/powerpc/ss555/start/vectors.S         | 1 +
>  3 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/bsps/powerpc/shared/start/bsp-start-zero.S
> b/bsps/powerpc/shared/start/bsp-start-zero.S
> index e87efff8c3..2df0241d71 100644
> --- a/bsps/powerpc/shared/start/bsp-start-zero.S
> +++ b/bsps/powerpc/shared/start/bsp-start-zero.S
> @@ -20,9 +20,9 @@
>   * http://www.rtems.org/license/LICENSE.
>   */
>
> +#include <bspopts.h>
>  #include <rtems/asm.h>
>  #include <rtems/powerpc/powerpc.h>
> -#include <bspopts.h>
>
>         .globl bsp_start_zero
>         .globl bsp_start_zero_begin
> diff --git a/bsps/powerpc/ss555/start/irq_asm.S
> b/bsps/powerpc/ss555/start/irq_asm.S
> index 52911c48e3..a78d7c35a5 100644
> --- a/bsps/powerpc/ss555/start/irq_asm.S
> +++ b/bsps/powerpc/ss555/start/irq_asm.S
> @@ -22,6 +22,7 @@
>   *      SPRG0 - RTEMS relies on that variable.
>   */
>
> +#include <bspopts.h>
>  #include <rtems/asm.h>
>  #include <rtems/score/cpu.h>
>  #include <rtems/score/percpu.h>
> diff --git a/bsps/powerpc/ss555/start/vectors.S
> b/bsps/powerpc/ss555/start/vectors.S
> index 35d2f23a30..0722b92892 100644
> --- a/bsps/powerpc/ss555/start/vectors.S
> +++ b/bsps/powerpc/ss555/start/vectors.S
> @@ -13,6 +13,7 @@
>   *  (c) 1999, Eric Valette valette at crf.canon.fr
>   */
>
> +#include <bspopts.h>
>  #include <rtems/asm.h>
>  #include <rtems/score/cpu.h>
>  #include <libcpu/vectors.h>
> --
> 2.13.6
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20180525/5e47dc2b/attachment-0002.html>