[PATCH 11/16] ss555: Move -Dxxx to configure.ac

[Joel Sherrill]

Updates #3425.
---
 bsps/powerpc/ss555/config/ss555.cfg         | 3 +--
 c/src/lib/libbsp/powerpc/ss555/configure.ac | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bsps/powerpc/ss555/config/ss555.cfg b/bsps/powerpc/ss555/config/ss555.cfg
index 1745bb5..7054eaa 100644
--- a/bsps/powerpc/ss555/config/ss555.cfg
+++ b/bsps/powerpc/ss555/config/ss555.cfg
@@ -10,12 +10,11 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=powerpc
-GCC_CPU_MODEL=505
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
 #
-CPU_CFLAGS = -mcpu=$(GCC_CPU_MODEL) -Dmpc555
+CPU_CFLAGS = -mcpu=505
 
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
diff --git a/c/src/lib/libbsp/powerpc/ss555/configure.ac b/c/src/lib/libbsp/powerpc/ss555/configure.ac
index 4cb98f5..33bd536 100644
--- a/c/src/lib/libbsp/powerpc/ss555/configure.ac
+++ b/c/src/lib/libbsp/powerpc/ss555/configure.ac
@@ -39,6 +39,8 @@ RTEMS_BSPOPTS_HELP([PRINTK_MINOR],
  I/O.  Don't open the printk port from RTEMS unless also using polled I/O
  for the SCI ports.])
 
+AC_DEFINE(mpc555, 1, [PowerPC model option])
+
 RTEMS_BSP_CLEANUP_OPTIONS
 
 # Explicitly list a Makefile here
-- 
1.8.3.1