<div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr">On Sun, May 13, 2018, 10:20 AM Gedare Bloom <<a href="mailto:gedare@rtems.org">gedare@rtems.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Wed, May 9, 2018 at 4:23 PM, Joel Sherrill <<a href="mailto:joel@rtems.org" target="_blank" rel="noreferrer">joel@rtems.org</a>> wrote:<br>
> Updates #3425.<br>
> ---<br>
>  bsps/sparc64/include/arch/arch.h              |  4 ++++<br>
>  bsps/sparc64/include/arch/mm/frame.h          |  4 ++++<br>
>  bsps/sparc64/include/arch/mm/mmu.h            |  4 ++++<br>
>  bsps/sparc64/include/arch/mm/tlb.h            |  3 +++<br>
>  bsps/sparc64/include/arch/mm/tte.h            |  4 ++++<br>
>  bsps/sparc64/niagara/config/niagara.cfg       |  2 +-<br>
>  bsps/sparc64/usiii/config/usiii.cfg           |  2 +-<br>
>  c/src/lib/libbsp/sparc64/niagara/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a> |  4 ++++<br>
>  c/src/lib/libbsp/sparc64/usiii/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a>   | 10 +++++++++-<br>
>  9 files changed, 34 insertions(+), 3 deletions(-)<br>
><br>
> diff --git a/bsps/sparc64/include/arch/arch.h b/bsps/sparc64/include/arch/arch.h<br>
> index 5fdd4a2..36aa922 100644<br>
> --- a/bsps/sparc64/include/arch/arch.h<br>
> +++ b/bsps/sparc64/include/arch/arch.h<br>
> @@ -37,10 +37,14 @@<br>
>  #ifndef KERN_sparc64_ARCH_H_<br>
>  #define KERN_sparc64_ARCH_H_<br>
><br>
> +#include <bspopts.h><br>
> +<br>
>  #if defined (SUN4U)<br>
>  #include <arch/sun4u/arch.h><br>
>  #elif defined (SUN4V)<br>
>  #include <arch/sun4v/arch.h><br>
> +#else<br>
> +#error "No SUN model defined"<br>
>  #endif<br>
><br>
>  #define ASI_AIUP               0x10    /** Access to primary context with user privileges. */<br>
> diff --git a/bsps/sparc64/include/arch/mm/frame.h b/bsps/sparc64/include/arch/mm/frame.h<br>
> index fb66e54..2fc17cc 100644<br>
> --- a/bsps/sparc64/include/arch/mm/frame.h<br>
> +++ b/bsps/sparc64/include/arch/mm/frame.h<br>
> @@ -35,10 +35,14 @@<br>
>  #ifndef KERN_sparc64_FRAME_H_<br>
>  #define KERN_sparc64_FRAME_H_<br>
><br>
> +#include <bspopts.h><br>
> +<br>
>  #if defined (SUN4U)<br>
>  #include <arch/mm/sun4u/frame.h><br>
>  #elif defined (SUN4V)<br>
>  #include <arch/mm/sun4v/frame.h><br>
> +#else<br>
> +#error "No SUN model defined"<br>
>  #endif<br>
><br>
>  #endif<br>
> diff --git a/bsps/sparc64/include/arch/mm/mmu.h b/bsps/sparc64/include/arch/mm/mmu.h<br>
> index 1d445f2..aab143f 100644<br>
> --- a/bsps/sparc64/include/arch/mm/mmu.h<br>
> +++ b/bsps/sparc64/include/arch/mm/mmu.h<br>
> @@ -35,10 +35,14 @@<br>
>  #ifndef KERN_sparc64_MMU_H_<br>
>  #define KERN_sparc64_MMU_H_<br>
><br>
> +#include <bspopts.h><br>
> +<br>
>  #if defined (SUN4U)<br>
>  #include <arch/mm/sun4u/mmu.h><br>
>  #elif defined (SUN4V)<br>
>  #include <arch/mm/sun4v/mmu.h><br>
> +#else<br>
> +#error "No SUN model defined"<br>
>  #endif<br>
><br>
><br>
> diff --git a/bsps/sparc64/include/arch/mm/tlb.h b/bsps/sparc64/include/arch/mm/tlb.h<br>
> index 4adf26c..7a6b85d 100644<br>
> --- a/bsps/sparc64/include/arch/mm/tlb.h<br>
> +++ b/bsps/sparc64/include/arch/mm/tlb.h<br>
> @@ -35,11 +35,14 @@<br>
>  #ifndef KERN_sparc64_TLB_H_<br>
>  #define KERN_sparc64_TLB_H_<br>
><br>
> +#include <bspopts.h><br>
><br>
>  #if defined (SUN4U)<br>
>  #include <arch/mm/sun4u/tlb.h><br>
>  #elif defined (SUN4V)<br>
>  #include <arch/mm/sun4v/tlb.h><br>
> +#else<br>
> +#error "No SUN model defined"<br>
>  #endif<br>
><br>
>  #endif<br>
> diff --git a/bsps/sparc64/include/arch/mm/tte.h b/bsps/sparc64/include/arch/mm/tte.h<br>
> index f0b746e..10a672b 100644<br>
> --- a/bsps/sparc64/include/arch/mm/tte.h<br>
> +++ b/bsps/sparc64/include/arch/mm/tte.h<br>
> @@ -35,10 +35,14 @@<br>
>  #ifndef KERN_sparc64_TTE_H_<br>
>  #define KERN_sparc64_TTE_H_<br>
><br>
> +#include <bspopts.h><br>
> +<br>
>  #if defined (SUN4U)<br>
>  #include <arch/mm/sun4u/tte.h><br>
>  #elif defined (SUN4V)<br>
>  #include <arch/mm/sun4v/tte.h><br>
> +#else<br>
> +#error "No SUN model defined"<br>
>  #endif<br>
><br>
>  #endif<br>
> diff --git a/bsps/sparc64/niagara/config/niagara.cfg b/bsps/sparc64/niagara/config/niagara.cfg<br>
> index 2fd8973..bfa73aa 100644<br>
> --- a/bsps/sparc64/niagara/config/niagara.cfg<br>
> +++ b/bsps/sparc64/niagara/config/niagara.cfg<br>
> @@ -7,7 +7,7 @@ RTEMS_CPU=sparc64<br>
><br>
>  #  This contains the compiler options necessary to select the CPU model<br>
>  #  and (hopefully) optimize for it.<br>
> -CPU_CFLAGS = -mcpu=niagara -DSUN4V<br>
> +CPU_CFLAGS = -mcpu=niagara<br>
><br>
>  # optimize flag: typically -g -O2<br>
>  CFLAGS_OPTIMIZE_V = -g -O2<br>
> diff --git a/bsps/sparc64/usiii/config/usiii.cfg b/bsps/sparc64/usiii/config/usiii.cfg<br>
> index b9fad21..ee1c508 100644<br>
> --- a/bsps/sparc64/usiii/config/usiii.cfg<br>
> +++ b/bsps/sparc64/usiii/config/usiii.cfg<br>
> @@ -7,7 +7,7 @@ RTEMS_CPU=sparc64<br>
><br>
>  #  This contains the compiler options necessary to select the CPU model<br>
>  #  and (hopefully) optimize for it.<br>
> -CPU_CFLAGS = -mcpu=ultrasparc3 -DUS3 -DSUN4U<br>
> +CPU_CFLAGS = -mcpu=ultrasparc3<br>
><br>
>  # optimize flag: typically -g -O2<br>
>  CFLAGS_OPTIMIZE_V = -g -O2<br>
> diff --git a/c/src/lib/libbsp/sparc64/niagara/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a> b/c/src/lib/libbsp/sparc64/niagara/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a><br>
> index ced7e12..f8e9687 100644<br>
> --- a/c/src/lib/libbsp/sparc64/niagara/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a><br>
> +++ b/c/src/lib/libbsp/sparc64/niagara/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a><br>
> @@ -10,6 +10,10 @@ RTEMS_CANONICAL_TARGET_CPU<br>
>  AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])<br>
>  RTEMS_BSP_CONFIGURE<br>
><br>
> +RTEMS_BSPOPTS_SET([SUN4V],[niagara],[1])<br>
> +RTEMS_BSPOPTS_SET([SUN4V],[*],[])<br>
> +RTEMS_BSPOPTS_HELP([SUN4V],<br>
> +[If defined, enable SUN model optons for the Niagara model.])<br>
><br>
>  RTEMS_BSP_CLEANUP_OPTIONS<br>
><br>
> diff --git a/c/src/lib/libbsp/sparc64/usiii/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a> b/c/src/lib/libbsp/sparc64/usiii/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a><br>
> index 4244055..c99d938 100644<br>
> --- a/c/src/lib/libbsp/sparc64/usiii/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a><br>
> +++ b/c/src/lib/libbsp/sparc64/usiii/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a><br>
> @@ -10,13 +10,21 @@ RTEMS_CANONICAL_TARGET_CPU<br>
>  AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])<br>
>  RTEMS_BSP_CONFIGURE<br>
><br>
> -<br>
>  RTEMS_BSPOPTS_SET([SIMSPARC_FAST_IDLE],[*],[])<br>
>  RTEMS_BSPOPTS_HELP([SIMSPARC_FAST_IDLE],<br>
>  [If defined, speed up the clock ticks while the idle task is running so<br>
>  time spent in the idle task is minimized.  This significantly reduces<br>
>  the wall time required to execute the RTEMS test suites.])<br>
><br>
> +RTEMS_BSPOPTS_SET([US3],[usiii],[1])<br>
> +RTEMS_BSPOPTS_SET([US3],[*],[])<br>
> +RTEMS_BSPOPTS_HELP([US3],<br>
> +[If defined, enable UltraSPARC optons for the USIII BSP.])<br>
> +<br>
> +RTEMS_BSPOPTS_SET([SUN4U],[usiii],[1])<br>
> +RTEMS_BSPOPTS_SET([SUN4U],[*],[])<br>
> +RTEMS_BSPOPTS_HELP([SUN4U],<br>
> +[If defined, enable SUN model optons for the USIII BSP.])<br>
><br>
>  RTEMS_BSP_CLEANUP_OPTIONS<br>
><br>
<br>
These are not really "optional" defines. It doesn't make sense for<br>
example to compile an ultrasparc3 BSP without the SUN4U define. I<br>
don't really know if this matters.<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Feel free to change it to whatever autoconf magic forces the setting without providing an override option.</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
> --<br>
> 1.8.3.1<br>
><br>
> _______________________________________________<br>
> devel mailing list<br>
> <a href="mailto:devel@rtems.org" target="_blank" rel="noreferrer">devel@rtems.org</a><br>
> <a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
</blockquote></div></div></div>