From 2eddd4d61beacf907e82c51aa4d322134bca4512 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 9 Dec 2011 16:12:46 +0000 Subject: 2011-12-09 Joel Sherrill * make/custom/gen68360.cfg, make/custom/gen68360_040.cfg, make/custom/pgh360.cfg: Simplify and clean up. --- c/src/lib/libbsp/m68k/gen68360/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360.cfg | 12 ------------ c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360_040.cfg | 12 ++++++------ c/src/lib/libbsp/m68k/gen68360/make/custom/pgh360.cfg | 3 --- 4 files changed, 11 insertions(+), 21 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index 92a56e880a..949d482e50 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,8 @@ +2011-12-09 Joel Sherrill + + * make/custom/gen68360.cfg, make/custom/gen68360_040.cfg, + make/custom/pgh360.cfg: Simplify and clean up. + 2011-02-11 Ralf Corsépius * include/bsp.h: diff --git a/c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360.cfg b/c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360.cfg index b9606b0c7e..cc6e431866 100644 --- a/c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360.cfg +++ b/c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360.cfg @@ -5,22 +5,10 @@ # RTEMS_CPU=m68k - -ifeq ($(RTEMS_GEN68360_COMPANION_MODE),yes) -RTEMS_CPU_MODEL=m68040 -else RTEMS_CPU_MODEL=m68360 -endif include $(RTEMS_ROOT)/make/custom/default.cfg -# This contains the compiler options necessary to select the CPU model -# and (hopefully) optimize for it. -ifeq ($(RTEMS_GEN68360_COMPANION_MODE),yes) -CPU_CFLAGS = -mcpu=68040 -else CPU_CFLAGS = -mcpu=cpu32 -endif -# optimize flag: typically -O2 CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer diff --git a/c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360_040.cfg b/c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360_040.cfg index e39c6d7350..a8f6fd92f5 100644 --- a/c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360_040.cfg +++ b/c/src/lib/libbsp/m68k/gen68360/make/custom/gen68360_040.cfg @@ -4,11 +4,11 @@ # $Id$ # -# -# All gen68360 configurations share the same base file, only the cpu model -# differs. -# +RTEMS_CPU=m68k +RTEMS_CPU_MODEL=m68040 + +CPU_CFLAGS = -mcpu=68040 -RTEMS_GEN68360_COMPANION_MODE=yes +include $(RTEMS_ROOT)/make/custom/default.cfg -include $(RTEMS_ROOT)/make/custom/gen68360.cfg +CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer diff --git a/c/src/lib/libbsp/m68k/gen68360/make/custom/pgh360.cfg b/c/src/lib/libbsp/m68k/gen68360/make/custom/pgh360.cfg index 1c3e7734dd..ba6e860edf 100644 --- a/c/src/lib/libbsp/m68k/gen68360/make/custom/pgh360.cfg +++ b/c/src/lib/libbsp/m68k/gen68360/make/custom/pgh360.cfg @@ -9,9 +9,6 @@ RTEMS_CPU_MODEL=m68360 include $(RTEMS_ROOT)/make/custom/default.cfg -# This contains the compiler options necessary to select the CPU model -# and (hopefully) optimize for it. CPU_CFLAGS = -mcpu32 -# optimize flag: typically -O2 CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer -- cgit v1.2.3