diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-26 20:52:51 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-26 20:52:51 +0000 |
| commit | 5776b98b621ced4e32c210aeecde22695c97f033 (patch) | |
| tree | 2cc92006ca21d15bc946f5086582a0a5e31b7471 | |
| parent | 5d1cabd98bbf51221ac8d35ce4639076ee07f8fc (diff) | |
next unification step: remove bsd.rd test build goop
| -rw-r--r-- | sys/arch/beagle/conf/Makefile.beagle | 12 | ||||
| -rw-r--r-- | sys/arch/gumstix/conf/Makefile.gumstix | 11 | ||||
| -rw-r--r-- | sys/arch/moko/conf/Makefile.moko | 11 |
3 files changed, 3 insertions, 31 deletions
diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle index 48c3f0edc5e..56037ebf76a 100644 --- a/sys/arch/beagle/conf/Makefile.beagle +++ b/sys/arch/beagle/conf/Makefile.beagle @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.beagle,v 1.8 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.beagle,v 1.9 2010/04/26 20:52:50 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -188,16 +188,6 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk # depend on root or device configuration autoconf.o conf.o: Makefile -bsd.rd: bsd - cp bsd bsd.rd - $S/../distrib/${_mach}/ramdisk/rdsetroot < $S/../distrib/${_mach}/ramdisk/mr.fs bsd.rd - -bsd.img: bsd.rd - ${OBJCOPY} -O binary bsd.rd bsd.img - -bsd.umg: bsd.img - mkuboot -a arm -o linux -e ${KERNEL_BASE_PHYS} -l ${KERNEL_BASE_PHYS} bsd.img bsd.umg - # depend on network or filesystem configuration uipc_domain.o uipc_proto.o vfs_conf.o: Makefile if.o if_tun.o if_loop.o if_ethersubr.o: Makefile diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix index 4f003b413c3..955f0bfe5a0 100644 --- a/sys/arch/gumstix/conf/Makefile.gumstix +++ b/sys/arch/gumstix/conf/Makefile.gumstix @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.gumstix,v 1.6 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.gumstix,v 1.7 2010/04/26 20:52:50 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -213,15 +213,6 @@ locore.o: ${_archdir}/arm/locore.S assym.h ${NORMAL_S} -bsd.rd: bsd - cp bsd bsd.rd - $S/../distrib/${BOARDTYPE}/ramdisk/rdsetroot < $S/../distrib/${BOARDTYPE}/ramdisk/mr.fs bsd.rd - -bsd.img: bsd.rd - ${OBJCOPY} -O binary bsd.rd bsd.img - mkimage -C none -A arm -O OpenBSD -e 0xa0200000 -a 0xa0200000 -d bsd.img bsd.umg - sudo mount /dev/sd0i /mnt && sudo cp bsd.umg /mnt && sudo umount /mnt - # The install target can be redefined by putting a # install-kernel-${MACHINE_NAME} target into /etc/mk.conf MACHINE_NAME!= uname -n diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko index e1d06016f47..b2625d7cf89 100644 --- a/sys/arch/moko/conf/Makefile.moko +++ b/sys/arch/moko/conf/Makefile.moko @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.moko,v 1.6 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.moko,v 1.7 2010/04/26 20:52:50 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -209,15 +209,6 @@ ${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h locore.o: ${_archdir}/arm/locore.S assym.h ${NORMAL_S} -bsd.rd: bsd - cp bsd bsd.rd - $S/../distrib/${_mach}/ramdisk/rdsetroot < $S/../distrib/${_mach}/ramdisk/mr.fs bsd.rd - -bsd.img: bsd.rd - ${OBJCOPY} -O binary bsd.rd bsd.i - gzip < bsd.i > bsd.rdi.gz - mkimage -A arm -O openbsd -T kernel -C gzip -a ${KERNEL_BASE_PHYS} -e ${KERNEL_BASE_PHYS} -n "OpenBSD" -d bsd.rdi.gz bsd.img - # The install target can be redefined by putting a # install-kernel-${MACHINE_NAME} target into /etc/mk.conf MACHINE_NAME!= uname -n |