2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Add preinstallation dirstamp support.
	* bootloader/Makefile.am: Cosmetics.
	* clock/Makefile.am: Cosmetics.
	* console/Makefile.am: Cosmetics.
	* irq/Makefile.am: Add preinstallation dirstamp support.
	* motorola/Makefile.am: Cosmetics.
	* openpic/Makefile.am: Cosmetics.
	* pci/Makefile.am: Cosmetics.
	* residual/Makefile.am: Cosmetics.
	* start/Makefile.am: Cosmetics.
	* startup/Makefile.am: Cosmetics.
	* vectors/Makefile.am: Add preinstallation dirstamp support.
	* vme/Makefile.am: Add preinstallation dirstamp support.
	* wrapup/Makefile.am: Cosmetics.
This commit is contained in:
Ralf Corsepius
2003-12-03 14:37:49 +00:00
parent cc5f43903d
commit f42a789126
15 changed files with 99 additions and 92 deletions

View File

@@ -1,3 +1,20 @@
2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add preinstallation dirstamp support.
* bootloader/Makefile.am: Cosmetics.
* clock/Makefile.am: Cosmetics.
* console/Makefile.am: Cosmetics.
* irq/Makefile.am: Add preinstallation dirstamp support.
* motorola/Makefile.am: Cosmetics.
* openpic/Makefile.am: Cosmetics.
* pci/Makefile.am: Cosmetics.
* residual/Makefile.am: Cosmetics.
* start/Makefile.am: Cosmetics.
* startup/Makefile.am: Cosmetics.
* vectors/Makefile.am: Add preinstallation dirstamp support.
* vme/Makefile.am: Add preinstallation dirstamp support.
* wrapup/Makefile.am: Cosmetics.
2003-12-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am: Remove all-local: $(ARCH).

View File

@@ -25,33 +25,34 @@ all-local: $(PREINSTALL_FILES)
EXTRA_DIST = BOOTING README.MVME2300 README.OTHERBOARDS README.dec21140
EXTRA_DIST += times.mcp750 times.mvme2307
$(PROJECT_INCLUDE)/bsp:
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../shared/console/consoleIo.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.h
$(PROJECT_INCLUDE)/bsp/uart.h: ../shared/console/uart.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
$(PROJECT_INCLUDE)/bsp/irq.h: ../shared/irq/irq.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
$(PROJECT_INCLUDE)/bsp/motorola.h: ../shared/motorola/motorola.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h
$(PROJECT_INCLUDE)/nvram.h: ../shared/include/nvram.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/nvram.h: ../shared/include/nvram.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nvram.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/nvram.h
$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../shared/console/consoleIo.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/consoleIo.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.h
$(PROJECT_INCLUDE)/bsp/uart.h: ../shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
$(PROJECT_INCLUDE)/bsp/irq.h: ../shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
$(PROJECT_INCLUDE)/bsp/motorola.h: ../shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -16,7 +16,6 @@ bootloader_SOURCES = head.S exception.S em86real.S
bootloader_SOURCES += misc.c pci.c zlib.c mm.c em86.c polled_io.c lib.c
bootloader_SOURCES += bootldr.h zlib.h pci.h keyboard.h
NM = @NM@
LD = @LD@
@@ -26,14 +25,11 @@ DEFAULT_INCLUDES =
# Remove references to EABI when compiling bootloader
BOOTLOADER_CPU_FLAGS=$(subst -msdata=eabi,,$(subst -meabi,,$(CPU_CFLAGS)))
AM_CPPFLAGS = -D__BOOT__ -DDEBUG
AM_CFLAGS = \
$(GCC_SPECS) -specs bsp_specs -qrtems -mrelocatable \
-msoft-float -mstrict-align -fno-builtin -Wall -mmultiple \
-mstring -O2 -fomit-frame-pointer -ffixed-r13 -mno-sdata \
$(BOOTLOADER_CPU_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS) \
$(GCC_SPECS) -specs bsp_specs -qrtems -mrelocatable \
-DASM $(BOOTLOADER_CPU_CFLAGS)
AM_CFLAGS = $(GCC_SPECS) -specs bsp_specs -qrtems -mrelocatable -msoft-float \
-mstrict-align -fno-builtin -Wall -mmultiple -mstring -O2 \
-fomit-frame-pointer -ffixed-r13 -mno-sdata $(BOOTLOADER_CPU_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS) $(GCC_SPECS) -specs bsp_specs -qrtems \
-mrelocatable -DASM $(BOOTLOADER_CPU_CFLAGS)
#
# CAUTION :

View File

@@ -2,7 +2,6 @@
## $Id$
##
VPATH = @srcdir@:@srcdir@/../../shared/clock
C_FILES = p_clock.c

View File

@@ -2,7 +2,6 @@
## $Id$
##
VPATH = @srcdir@:@srcdir@/../../shared/console:@srcdir@/../../../shared
C_FILES = polled_io.c uart.c console.c inch.c reboot.c

View File

@@ -26,12 +26,13 @@ all-local: $(PREINSTALL_FILES) $(OBJS)
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp:
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(PROJECT_INCLUDE)/bsp/irq.h: $(top_srcdir)/../shared/irq/irq.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/bsp/irq.h: $(top_srcdir)/../shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -24,15 +24,18 @@ include $(top_srcdir)/../../../../automake/lib.am
all-local: $(OBJS)
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp:
@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp
$(PROJECT_INCLUDE)/bsp/motorola.h: \
$(top_srcdir)/../shared/motorola/motorola.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(PROJECT_INCLUDE)/bsp/motorola.h: $(top_srcdir)/../shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -18,12 +18,13 @@ all-local: $(PREINSTALL_FILES) $(OBJS)
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp:
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(PROJECT_INCLUDE)/bsp/openpic.h: $(top_srcdir)/../shared/openpic/openpic.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/bsp/openpic.h: $(top_srcdir)/../shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -23,12 +23,13 @@ all-local: $(PREINSTALL_FILES) $(OBJS)
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp:
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(PROJECT_INCLUDE)/bsp/pci.h: $(top_srcdir)/../shared/pci/pci.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/bsp/pci.h: $(top_srcdir)/../shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -2,7 +2,6 @@
## $Id$
##
VPATH = @srcdir@:@srcdir@/../../shared/residual
C_FILES = residual.c
@@ -19,18 +18,7 @@ include $(top_srcdir)/../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using +=
#
$(PROJECT_INCLUDE)/bsp:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/bsp/pnp.h: ../../shared/residual/pnp.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/bsp/residual.h: ../../shared/residual/residual.h
$(INSTALL_DATA) $< $@
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp $(PROJECT_INCLUDE)/bsp/pnp.h \
$(PROJECT_INCLUDE)/bsp/residual.h
all-local: $(PREINSTALL_FILES) $(OBJS)

View File

@@ -15,7 +15,7 @@ include $(top_srcdir)/../../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT)
bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT)
bsplib_DATA += $(PROJECT_RELEASE)/lib/rtems_crti.$(OBJEXT)
$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT)

View File

@@ -2,7 +2,6 @@
## $Id$
##
VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../shared/startup:@srcdir@/../../../shared
C_FILES = bootcard.c main.c bspstart.c bsppost.c bsplibc.c sbrk.c bspclean.c \

View File

@@ -29,12 +29,13 @@ all-local: $(PREINSTALL_FILES) $(OBJS)
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp:
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(PROJECT_INCLUDE)/bsp/vectors.h: $(top_srcdir)/../shared/vectors/vectors.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/bsp/vectors.h: $(top_srcdir)/../shared/vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -8,7 +8,6 @@ H_FILES = ../pci/pci.h ../irq/irq.h ../vme/VME.h ../vme/VMEConfig.h
C_FILES = vmeUniverse.c vmeconfig.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES)
@@ -18,24 +17,6 @@ include_bsp_HEADERS = ../../shared/vme/VMEConfig.h
include_bsp_HEADERS += ../../shared/vme/VME.h
include_bsp_HEADERS += ../../../shared/vmeUniverse/vmeUniverse.h
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/bsp:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: vmeUniverse.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/bsp/VME.h: VME.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/bsp/VMEConfig.h: VMEConfig.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
$(addprefix $(PROJECT_INCLUDE)/bsp/,$(notdir $(include_bsp_HEADERS)))
all-local: $(PREINSTALL_FILES) $(OBJS)
include $(top_srcdir)/../../../../automake/compile.am
@@ -45,4 +26,23 @@ include $(top_srcdir)/../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using +=
#
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(PROJECT_INCLUDE)/bsp/VMEConfig.h: ../../shared/vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h
$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vme/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h
$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -2,14 +2,15 @@
## $Id$
##
BSP_PIECES = clock console irq openpic pci residual startup vectors motorola vme
BSP_PIECES = clock console irq openpic pci residual startup vectors motorola \
vme
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/*/$(ARCH)/*.$(OBJEXT)) \
../@exceptions@/$(ARCH)/rtems-cpu.rel \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.$(OBJEXT))
../@exceptions@/$(ARCH)/rtems-cpu.rel $(wildcard \
../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.$(OBJEXT))
LIB = $(ARCH)/libbsp.a
include $(top_srcdir)/../../../../automake/compile.am