From 1a418189de72278278ba763396f5c58dc08774ee Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 16 May 2018 09:55:14 -0500 Subject: qoriq: Move -Dxxx to configure.ac Updates #3425. --- bsps/powerpc/qoriq/config/qoriq.inc | 3 +-- bsps/powerpc/qoriq/config/qoriq_e6500_32.cfg | 3 +-- bsps/powerpc/qoriq/config/qoriq_e6500_64.cfg | 3 +-- c/src/lib/libbsp/powerpc/qoriq/configure.ac | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bsps/powerpc/qoriq/config/qoriq.inc b/bsps/powerpc/qoriq/config/qoriq.inc index ff9586eec4..ad5c04b679 100644 --- a/bsps/powerpc/qoriq/config/qoriq.inc +++ b/bsps/powerpc/qoriq/config/qoriq.inc @@ -7,8 +7,7 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU = powerpc CPU_CFLAGS = -mcpu=8540 -meabi -msdata=sysv -fno-common -mstrict-align \ - -mspe -mabi=spe -mfloat-gprs=double \ - -D__ppc_generic + -mspe -mabi=spe -mfloat-gprs=double CFLAGS_OPTIMIZE_V = -O2 -g CFLAGS_OPTIMIZE_V += -ffunction-sections -fdata-sections diff --git a/bsps/powerpc/qoriq/config/qoriq_e6500_32.cfg b/bsps/powerpc/qoriq/config/qoriq_e6500_32.cfg index d0f0391384..0c2423677f 100644 --- a/bsps/powerpc/qoriq/config/qoriq_e6500_32.cfg +++ b/bsps/powerpc/qoriq/config/qoriq_e6500_32.cfg @@ -4,8 +4,7 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU = powerpc -CPU_CFLAGS = -mcpu=e6500 -m32 -msdata=sysv -fno-common \ - -D__ppc_generic +CPU_CFLAGS = -mcpu=e6500 -m32 -msdata=sysv -fno-common CFLAGS_OPTIMIZE_V = -O2 -g CFLAGS_OPTIMIZE_V += -ffunction-sections -fdata-sections diff --git a/bsps/powerpc/qoriq/config/qoriq_e6500_64.cfg b/bsps/powerpc/qoriq/config/qoriq_e6500_64.cfg index b766fec8c9..ebc26e43ae 100644 --- a/bsps/powerpc/qoriq/config/qoriq_e6500_64.cfg +++ b/bsps/powerpc/qoriq/config/qoriq_e6500_64.cfg @@ -5,8 +5,7 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU = powerpc -CPU_CFLAGS = -mcpu=e6500 -m64 -fno-common \ - -D__ppc_generic +CPU_CFLAGS = -mcpu=e6500 -m64 -fno-common CFLAGS_OPTIMIZE_V = -O2 -g CFLAGS_OPTIMIZE_V += -ffunction-sections -fdata-sections diff --git a/c/src/lib/libbsp/powerpc/qoriq/configure.ac b/c/src/lib/libbsp/powerpc/qoriq/configure.ac index 7660cb39b8..9c35aa79e4 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/configure.ac +++ b/c/src/lib/libbsp/powerpc/qoriq/configure.ac @@ -159,7 +159,7 @@ RTEMS_BSPOPTS_SET([QORIQ_BUS_CLOCK_DIVIDER],[qoriq_e6500*],[2]) RTEMS_BSPOPTS_SET([QORIQ_BUS_CLOCK_DIVIDER],[*],[1]) RTEMS_BSPOPTS_HELP([QORIQ_BUS_CLOCK_DIVIDER],[divider of the platform clock to get the clock most on-chip peripherals]) - +AC_DEFINE(__ppc_generic, 1, [PowerPC model option]) RTEMS_BSP_CLEANUP_OPTIONS RTEMS_PPC_EXCEPTIONS -- cgit v1.2.3