diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-01-10 18:10:59 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-01-10 18:10:59 +0000 |
commit | 362ec23ed72f6fedb1cc78dc867727a75552d9e2 (patch) | |
tree | 7e42e44b17a9bba1644c218cb9a4873c683251e0 /c/src/lib/libbsp/powerpc/motorola_powerpc | |
parent | Removed reference to Radstone PPCN. (diff) | |
download | rtems-362ec23ed72f6fedb1cc78dc867727a75552d9e2.tar.bz2 |
Patch rtems-rc-20000104-12.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
which converts the PowerPC BSPs to configuration and more automake.
* Besides adding partial automake support, rsp converting all powerpc
BSPs to make them compliant to the new configuration scheme, this patch
attempts to fix several configuration bugs in powerpc related Makefiles.
Diffstat (limited to '')
15 files changed, 106 insertions, 35 deletions
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in index 8546f0c6cb..50c4992d94 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in @@ -5,8 +5,12 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = powerpc/mcp750 +top_builddir = . + +ACLOCAL = aclocal +AUTOCONF = autoconf +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ @@ -29,4 +33,12 @@ SUBDIRS = clock console include pci residual openpic irq vectors start \ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + +config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) + cd $(srcdir) && $(AUTOCONF) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in index 86ca29151d..a03db9e1d7 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in @@ -5,13 +5,14 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/bootloader +top_builddir = .. +subdir = bootloader RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ -VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/console:@srcdir@/../../shared/bootloader +VPATH = \ + @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/console:@srcdir@/../../shared/bootloader # C source names, if any, go here -- minus the .c C_PIECES = misc pci zlib mm em86 polled_io lib diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.in index 4490d4b392..0075dce239 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/clock +top_builddir = .. +subdir = clock RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in new file mode 100644 index 0000000000..0b6351347d --- /dev/null +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in @@ -0,0 +1,57 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(bsp_specs) +RTEMS_TOP(../../../../../..) +AC_CONFIG_AUX_DIR(../../../../../..) + +RTEMS_CANONICAL_TARGET_CPU +AC_PROG_MAKE_SET +AC_PROG_INSTALL +AM_MAINTAINER_MODE + +RTEMS_ENABLE_MULTIPROCESSING +RTEMS_ENABLE_NETWORKING +RTEMS_ENABLE_LIBCDIR + +RTEMS_ENV_RTEMSBSP + +RTEMS_CHECK_CPU +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT + +dnl check target cc +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS + +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) +RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) +RTEMS_CHECK_NETWORKING(RTEMS_BSP) + +# find all the Makefiles for the BSPs +RTEMS_CHECK_MAKEFILE(.) + +# HACK: sed out bsp-tools from makefiles +t="tools" +if test -d "$srcdir/$t"; then + bsptools_cfgdirs="$bsptools_cfgdirs $t" + makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"` +fi + +if test "$HAS_MP" = "yes"; then +: +else + # HACK: sed out shmsupp/Makefile from makefiles + t="shmsupp" + makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"` +fi +AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") + +AC_CONFIG_SUBDIRS($bsptools_cfgdirs) + +# try to explicitly list a Makefile here +AC_OUTPUT( +$makefiles) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in index 71ccd2bf98..33f9f9c387 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/console +top_builddir = .. +subdir = console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in index a7d0a6e46e..39692c9cdc 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/include +top_builddir = .. +subdir = include RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ @@ -14,8 +14,8 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ H_FILES = $(srcdir)/../../shared/include/nvram.h \ - $(srcdir)/../../shared/include/bsp.h \ - $(srcdir)/../../../shared/include/coverhd.h + $(srcdir)/../../shared/include/bsp.h \ + $(srcdir)/../../../shared/include/coverhd.h BSP_H_FILES = $(srcdir)/../../shared/console/consoleIo.h \ $(srcdir)/../../shared/console/uart.h $(srcdir)/../../shared/irq/irq.h \ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.in index 2f9bb6ae04..57116c2ab8 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/irq +top_builddir = .. +subdir = irq RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.in index 614960112f..b8ee6f946b 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/motorola +top_builddir = .. +subdir = motorola RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.in index 2f3e2c2c23..d42d217496 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/openpic +top_builddir = .. +subdir = openpic RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.in index b2192fb262..206fcf179f 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/pci +top_builddir = .. +subdir = pci RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in index e94f6fdb6f..fb9fce42fb 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/residual +top_builddir = .. +subdir = residual RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.in index 704bfeb8e8..859b05713e 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/start +top_builddir = .. +subdir = start RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.in index faf523d8c4..8da11b0b61 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.in @@ -5,13 +5,14 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/startup +top_builddir = .. +subdir = startup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ -VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup +VPATH = \ + @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup # C source names, if any, go here -- minus the .c C_PIECES = bootcard main bspstart bsppost bsplibc sbrk bspclean \ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.in index 33e1b3cefa..1a2a51cdce 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/vectors +top_builddir = .. +subdir = vectors RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in index 294ba38a89..babf10ac30 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in @@ -5,8 +5,8 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../.. -subdir = powerpc/mcp750/wrapup +top_builddir = .. +subdir = wrapup RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ @@ -17,8 +17,8 @@ BSP_PIECES = clock console irq openpic pci residual startup vectors motorola GENERIC_PIECES = # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) \ - $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o) +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) $(foreach \ + piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg |