From 7409426d8792168f7d7a8645cae8b0bb22ba7b01 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 14 Nov 2001 18:43:32 +0000 Subject: 2001-11-10 Ralf Corsepius * custom/shsim.cfg: Remove HZ, BSP_CPPFLAGS, make-target-options. * custom/mvme2307.cfg: Fix PPC_USE_SPRG in make-target-options, re-adopt mcp750.cfg's make-exe. --- make/ChangeLog | 6 ++++++ make/custom/mvme2307.cfg | 26 +++++++++++--------------- make/custom/shsim.cfg | 11 ----------- 3 files changed, 17 insertions(+), 26 deletions(-) (limited to 'make') diff --git a/make/ChangeLog b/make/ChangeLog index b2677656cb..5c18252ec0 100644 --- a/make/ChangeLog +++ b/make/ChangeLog @@ -1,4 +1,10 @@ +2001-11-10 Ralf Corsepius + + * custom/shsim.cfg: Remove HZ, BSP_CPPFLAGS, make-target-options. + * custom/mvme2307.cfg: Fix PPC_USE_SPRG in make-target-options, + re-adopt mcp750.cfg's make-exe. + 2001-11-13 Joel Sherrill * custom/helas403.cfg, custom/gen405.cfg: Removed dependency on diff --git a/make/custom/mvme2307.cfg b/make/custom/mvme2307.cfg index 62716fd521..2b54aed370 100644 --- a/make/custom/mvme2307.cfg +++ b/make/custom/mvme2307.cfg @@ -31,7 +31,7 @@ define make-target-options @echo "#define PPCN_60X_USE_NONE 1" >>$@ @echo "#define PPC_USE_DATA_CACHE 1" >>$@ @echo "#define PPC_VECTOR_FILE_BASE 0x0100" >>$@ - @echo "#define PPC_USE_SPRG 1" + @echo "#define PPC_USE_SPRG 1" >>$@ endef # This contains the compiler options necessary to select the CPU model @@ -66,20 +66,16 @@ CFLAGS_PROFILE_V = -O1 # $(LD_LIBS) \ # -Wl,-\( -Wl,-lc -Wl,-lrtemsall -Wl,-lgcc -Wl,-\) define make-exe - $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS) - $(NM) -g -n $@ > $(basename $@).num - $(SIZE) $@ -# The following commands make a bootable image but will not work outside -# the build tree. -# test -d ${PROJECT_RELEASE}/bin || mkdir ${PROJECT_RELEASE}/bin -# cp $@ $(PROJECT_ROOT)/powerpc-rtems/c/mvme2307/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader/$(ARCH); \ -# ( cd $(PROJECT_ROOT)/powerpc-rtems/c/mvme2307/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader; \ -# $(MAKE) bootloader BINARY_LOADED=$@; ) -# f=`basename $@ .exe`; \ -# cp $(PROJECT_ROOT)/powerpc-rtems/c/mvme2307/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader/bootloader \ -# ${PROJECT_RELEASE}/bin/$${f}$(LIB_VARIANT).exe \ -# && chmod 755 \ -# ${PROJECT_RELEASE}/bin/$${f}$(LIB_VARIANT).exe + $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \ + -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS) + $(NM) -g -n $(basename $@).nxe > $(basename $@).num + $(SIZE) $(basename $@).nxe + $(OBJCOPY) $(basename $@).nxe rtems -O binary -R .comment -S + gzip -vf9 rtems + $(LD) -o $@ $(PROJECT_RELEASE)/lib/bootloader.o --just-symbols=$(basename $@).nxe \ + -b binary rtems.gz -T $(PROJECT_RELEASE)/lib/ppcboot.lds \ + -Map $(basename $@).map && chmod 755 $@ + rm -f rtems.gz endef # Miscellaneous additions go here diff --git a/make/custom/shsim.cfg b/make/custom/shsim.cfg index 64ecd7b4f9..a9919c70e5 100644 --- a/make/custom/shsim.cfg +++ b/make/custom/shsim.cfg @@ -4,8 +4,6 @@ # $Id$ # -HZ=20000000 - include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=sh @@ -14,10 +12,6 @@ RTEMS_CPU_MODEL=sh7032 # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=shsim -# BSP specific preprocessor flags. -# These should only be used in BSP dependent directories. -BSP_CPPFLAGS=-DHZ=$(HZ) - # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. # @@ -28,11 +22,6 @@ CPU_CFLAGS=-m1 # CFLAGS_OPTIMIZE_V=-O4 -mleaf-procedures CFLAGS_OPTIMIZE_V=-O2 -g -# This section makes the target dependent options file. - -define make-target-options -endef - # The following are definitions of make-exe which will work using ld as # is currently required. It is expected that as of gcc 2.8, the end user # will be able to override parts of the compilers specs and link using gcc. -- cgit v1.2.3