From 9d62874193262f7f3953e45e85f87712953528d0 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Tue, 15 May 2018 09:17:03 -0500
Subject: sparc64 BSPs: Hard define configuration required settings

Updates #3425.
---
 c/src/lib/libbsp/sparc64/niagara/configure.ac |  5 +----
 c/src/lib/libbsp/sparc64/usiii/configure.ac   | 11 ++---------
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libbsp/sparc64/niagara/configure.ac b/c/src/lib/libbsp/sparc64/niagara/configure.ac
index f8e9687050..44817bb5d0 100644
--- a/c/src/lib/libbsp/sparc64/niagara/configure.ac
+++ b/c/src/lib/libbsp/sparc64/niagara/configure.ac
@@ -10,10 +10,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
 RTEMS_BSP_CONFIGURE
 
-RTEMS_BSPOPTS_SET([SUN4V],[niagara],[1])
-RTEMS_BSPOPTS_SET([SUN4V],[*],[])
-RTEMS_BSPOPTS_HELP([SUN4V],
-[If defined, enable SUN model optons for the Niagara model.])
+AC_DEFINE(SUN4V, 1, [SUN model option])
 
 RTEMS_BSP_CLEANUP_OPTIONS
 
diff --git a/c/src/lib/libbsp/sparc64/usiii/configure.ac b/c/src/lib/libbsp/sparc64/usiii/configure.ac
index c99d938ba0..48945c2b2f 100644
--- a/c/src/lib/libbsp/sparc64/usiii/configure.ac
+++ b/c/src/lib/libbsp/sparc64/usiii/configure.ac
@@ -16,15 +16,8 @@ RTEMS_BSPOPTS_HELP([SIMSPARC_FAST_IDLE],
 time spent in the idle task is minimized.  This significantly reduces
 the wall time required to execute the RTEMS test suites.])
 
-RTEMS_BSPOPTS_SET([US3],[usiii],[1])
-RTEMS_BSPOPTS_SET([US3],[*],[])
-RTEMS_BSPOPTS_HELP([US3],
-[If defined, enable UltraSPARC optons for the USIII BSP.])
-
-RTEMS_BSPOPTS_SET([SUN4U],[usiii],[1])
-RTEMS_BSPOPTS_SET([SUN4U],[*],[])
-RTEMS_BSPOPTS_HELP([SUN4U],
-[If defined, enable SUN model optons for the USIII BSP.])
+AC_DEFINE(US3, 1, [UltraSPARC model option])
+AC_DEFINE(SUN4U, 1, [SUN model option])
 
 RTEMS_BSP_CLEANUP_OPTIONS
 
-- 
cgit v1.2.3