[src/trunk]: src/sys/arch/arm Add common Makefile for arm ports. Only includ...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a1b9b8f7e82b
branches:  trunk
changeset: 511042:a1b9b8f7e82b
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 11 17:44:38 2001 +0000

description:
Add common Makefile for arm ports.  Only include (for now) machine/io.h
if arm32 is defined.  io.h is RISCPC specific and isn't needed for other
ports.

diffstat:

 sys/arch/arm/conf/Makefile.arm |  237 +++++++++++++++++++++++++++++++++++++++++
 sys/arch/arm/mainbus/mainbus.c |   11 +-
 2 files changed, 245 insertions(+), 3 deletions(-)

diffs (273 lines):

diff -r 6acf39781dd3 -r a1b9b8f7e82b sys/arch/arm/conf/Makefile.arm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/conf/Makefile.arm    Mon Jun 11 17:44:38 2001 +0000
@@ -0,0 +1,237 @@
+#      $NetBSD: Makefile.arm,v 1.1 2001/06/11 17:44:38 matt Exp $
+
+# Makefile for NetBSD
+#
+# This makefile is constructed from a machine description:
+#      config machineid
+# Most changes should be made in the machine description
+#      /sys/arch/<arch>/conf/``machineid''
+# after which you should do
+#      config machineid
+# Machine generic makefile changes should be made in
+#      /sys/arch/arm/conf/Makefile.arm
+# after which config should be rerun for all machines of that type.
+
+# DEBUG is set to -g if debugging.
+# PROF is set to -pg if profiling.
+
+AR?=   ar
+AS?=   as
+CC?=   cc
+CPP?=  cpp
+LD?=   ld
+LORDER?=lorder
+MKDEP?=        mkdep
+NM?=   nm
+RANLIB?=ranlib
+SIZE?= size
+STRIP?=        strip
+TSORT?=        tsort -q
+
+COPTS?=        -O2
+
+ARM32=         $S/arch/arm32
+THISARM=       $S/arch/${TARGET_MACHINE}
+
+HAVE_EGCS!=    ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo 
+INCLUDES=      -I. -I./include -I$S/arch -I$S -nostdinc
+CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} \
+               -D_KERNEL -D_KERNEL_OPT -D${TARGET_MACHINE}
+CWARNFLAGS?=   -Werror -Wall -Wcomment -Wpointer-arith
+# XXX Delete -Wuninitialized for now, since the compiler doesn't
+# XXX always get it right.  --thorpej 
+CWARNFLAGS+=   -Wno-uninitialized
+.if (${HAVE_EGCS} != "")
+CWARNFLAGS+=   -Wno-main
+.endif
+CFLAGS=                ${DEBUG} ${COPTS} ${CWARNFLAGS}
+AFLAGS=                -x assembler-with-cpp -D_LOCORE
+
+.if !defined(LOADADDRESS)
+LOADADDRESS=   0xF0000000
+.endif
+LINKFLAGS=     -Ttext ${LOADADDRESS} -e start ${EXTRA_LINKFLAGS}
+STRIPFLAGS=    -g
+
+.if exists($S/arch/${TARGET_MACHINE}/Makefile.${TARGET_MACHINE}.inc)
+.include       $S/arch/${TARGET_MACHINE}/Makefile.${TARGET_MACHINE}.inc
+.endif
+
+%INCLUDES
+
+HOSTED_CC=     ${CC}
+HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
+HOSTED_CFLAGS= ${CFLAGS}
+
+### find out what to use for libkern
+KERN_AS=       obj
+.include "$S/lib/libkern/Makefile.inc"
+.ifndef PROF
+LIBKERN=       ${KERNLIB}
+.else
+LIBKERN=       ${KERNLIB_PROF}
+.endif
+
+### find out what to use for libcompat
+.include "$S/compat/common/Makefile.inc"
+.ifndef PROF
+LIBCOMPAT=     ${COMPATLIB}
+.else
+LIBCOMPAT=     ${COMPATLIB_PROF}
+.endif
+
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
+
+NORMAL_C=      ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
+NOPROF_C=      ${CC} ${CFLAGS} ${CPPFLAGS} -c $<
+NORMAL_S=      ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
+
+HOSTED_C=      ${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
+
+%OBJS
+
+%CFILES
+
+%SFILES
+
+# load lines for config "xxx" will be emitted as:
+# xxx: ${SYSTEM_DEP} swapxxx.o
+#      ${SYSTEM_LD_HEAD}
+#      ${SYSTEM_LD} swapxxx.o
+#      ${SYSTEM_LD_TAIL}
+SYSTEM_OBJ=    ${SYSTEM_FIRST_OBJ} locore.o \
+               param.o ioconf.o ${OBJS} ${LIBCOMPAT} ${LIBKERN}
+SYSTEM_DEP=    Makefile ${SYSTEM_OBJ}
+SYSTEM_LD_HEAD=        rm -f $@
+SYSTEM_LD=     @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
+               ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD_TAIL=        @${SIZE} $@; chmod 755 $@
+
+DEBUG?=
+.if ${DEBUG} == "-g"
+LINKFLAGS+=    -X
+SYSTEM_LD_TAIL+=; \
+               echo mv -f $@ $@.gdb; mv -f $@ $@.gdb; \
+               echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
+               ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
+.else
+#LINKFLAGS+=   -S
+LINKFLAGS+=    -x
+.endif
+
+%LOAD
+
+assym.h: $S/kern/genassym.sh ${ARM32}/arm32/genassym.cf
+       sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+           < ${ARM32}/arm32/genassym.cf > assym.h.tmp && \
+       mv -f assym.h.tmp assym.h
+
+param.c: $S/conf/param.c
+       rm -f param.c
+       cp $S/conf/param.c .
+
+param.o: param.c Makefile
+       ${NORMAL_C}
+
+ioconf.o: ioconf.c
+       ${NORMAL_C}
+
+newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
+       sh $S/conf/newvers.sh
+       ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
+
+__CLEANKERNEL: .USE
+       @echo "${.TARGET}ing the kernel objects"
+       rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
+           [Ee]rrs linterrs makelinks assym.h.tmp assym.h ${EXTRA_CLEAN}
+
+__CLEANDEPEND: .USE
+       rm -f .depend
+
+clean: __CLEANKERNEL
+
+cleandir distclean: __CLEANKERNEL __CLEANDEPEND
+
+lint:
+       @lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
+           ${ARM32}/arm32/Locore.c ${CFILES}  \
+           ioconf.c param.c | \
+           grep -v 'static function .* unused'
+
+tags:
+       @echo "see $S/kern/Makefile for tags"
+
+links:
+       egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
+         sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
+       echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
+         sort -u | comm -23 - dontlink | \
+         sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
+       sh makelinks && rm -f dontlink
+
+SRCS=  ${ARM32}/arm32/locore.S param.c ioconf.c ${CFILES} ${SFILES} \
+       ${EXTRA_CFILES} ${EXTRA_SFILES} ${SYSTEM_FIRST_SFILE}
+
+depend: .depend
+.depend: ${SRCS} assym.h param.c
+       ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${SYSTEM_FIRST_SFILE} \
+           ${ARM32}/arm32/locore.S ${EXTRA_SFILES}
+       ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} \
+           ${EXTRA_CFILES}
+       test -z "${SFILES}" || ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+       sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
+           ${CPPFLAGS} < ${ARM32}/arm32/genassym.cf
+       @sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend
+       @rm -f assym.dep
+
+dependall: depend all
+
+${OBJS} assym.h .depend: include-dir
+include-dir:
+       @rm -rf include
+       @mkdir -p include/arm
+.if (${S} == "../../../..")
+       @(cd include/arm; ln -s ../../$S/arch/${TARGET_MACHINE}/include ${TARGET_MACHINE})
+       @(cd include; ln -s ../$S/arch/arm/include machine)
+.else
+       @ln -s $S/arch/${TARGET_MACHINE}/include include/arm/${TARGET_MACHINE}
+       @ln -s $S/arch/arm/include include/machine
+.endif
+
+# depend on root or device configuration
+autoconf.o conf.o: Makefile
+ 
+# depend on network
+uipc_proto.o: Makefile 
+
+# depend on maxusers
+assym.h: Makefile
+
+# depend on CPU configuration 
+cpufunc.o cpufunc_asm.o: Makefile
+
+# depend on DIAGNOSTIC etc.
+cpuswitch.o fault.o machdep.o: Makefile
+
+.if defined(SYSTEM_FIRST_OBJ)
+${SYSTEM_FIRST_OBJ}: ${SYSTEM_FIRST_SFILE} assym.h
+       ${NORMAL_S}
+.endif
+
+locore.o: ${ARM32}/arm32/locore.S assym.h
+       ${NORMAL_S}
+
+# The install target can be redefined by putting a
+# install-kernel-${MACHINE_NAME} target into /etc/mk.conf
+MACHINE_NAME!=  uname -n
+install: install-kernel-${MACHINE_NAME}
+.if !target(install-kernel-${MACHINE_NAME}})
+install-kernel-${MACHINE_NAME}:
+       rm -f /onetbsd
+       ln /netbsd /onetbsd
+       cp netbsd /nnetbsd
+       mv /nnetbsd /netbsd
+.endif
+
+%RULES
diff -r 6acf39781dd3 -r a1b9b8f7e82b sys/arch/arm/mainbus/mainbus.c
--- a/sys/arch/arm/mainbus/mainbus.c    Mon Jun 11 15:09:54 2001 +0000
+++ b/sys/arch/arm/mainbus/mainbus.c    Mon Jun 11 17:44:38 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.1 2001/02/24 19:38:02 reinoud Exp $ */
+/* $NetBSD: mainbus.c,v 1.2 2001/06/11 17:44:38 matt Exp $ */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -48,7 +48,9 @@
 #include <sys/malloc.h>
 #include <sys/device.h>
 
-#include <machine/io.h>
+#if defined(arm32)             /* XXX */
+#include <machine/bus.h>
+#endif
 #include <machine/bus.h>
 #include <arm/mainbus/mainbus.h>
 #include "locators.h"
@@ -137,7 +139,10 @@
                        mb.mb_drq = MAINBUSCF_DACK_DEFAULT;
                        mb.mb_irq = MAINBUSCF_IRQ_DEFAULT;
                } else {    
-                       mb.mb_iobase = cf->cf_loc[MAINBUSCF_BASE] + IO_CONF_BASE;
+                       mb.mb_iobase = cf->cf_loc[MAINBUSCF_BASE];
+#if defined(arm32) /* XXX */
+                       mb.mb_iobase += IO_CONF_BASE;
+#endif
                        mb.mb_iosize = 0;
                        mb.mb_drq = cf->cf_loc[MAINBUSCF_DACK];
                        mb.mb_irq = cf->cf_loc[MAINBUSCF_IRQ];