diff options
| author | dfr <dfr@FreeBSD.org> | 1998-09-20 21:46:19 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1998-09-20 21:46:19 +0000 |
| commit | 00428fddff8862c2a884e610cd9d03df7c381c0d (patch) | |
| tree | 98ff0fdcfdfc60406b3f9b81136511b614dc6fe8 /sys/boot/alpha | |
| parent | 48b3e5470102066f456686c366cf49009cf063b3 (diff) | |
| download | FreeBSD-src-00428fddff8862c2a884e610cd9d03df7c381c0d.zip FreeBSD-src-00428fddff8862c2a884e610cd9d03df7c381c0d.tar.gz | |
Make the alpha bootstrap build again, fix some warning and change sdboot to daboot.
Diffstat (limited to 'sys/boot/alpha')
| -rw-r--r-- | sys/boot/alpha/Makefile.inc | 1 | ||||
| -rw-r--r-- | sys/boot/alpha/boot1/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/alpha/libalpha/alpha_copy.c | 6 | ||||
| -rw-r--r-- | sys/boot/alpha/libalpha/libalpha.h | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/sys/boot/alpha/Makefile.inc b/sys/boot/alpha/Makefile.inc index f041076..2d5f87d 100644 --- a/sys/boot/alpha/Makefile.inc +++ b/sys/boot/alpha/Makefile.inc @@ -2,5 +2,6 @@ PRIMARY_LOAD_ADDRESS= 20000000 # "Region 1 start" SECONDARY_LOAD_ADDRESS= 2000c000 # "Region 1 start" + 48k HEAP_LIMIT= 20040000 # "Region 1 start" + 256k +DPADD+= ${DESTDIR}/${LIBDIR}/libstand.a BINDIR= /usr/mdec diff --git a/sys/boot/alpha/boot1/Makefile b/sys/boot/alpha/boot1/Makefile index 1e5a659..9eb9186 100644 --- a/sys/boot/alpha/boot1/Makefile +++ b/sys/boot/alpha/boot1/Makefile @@ -26,7 +26,7 @@ CLEANFILES+= ${PROG}.sym ${PROG}.nosym ${PROG}.list all: ${PROG} afterinstall: - ln -sf boot1 /usr/mdec/sdboot + ln -sf boot1 /usr/mdec/daboot ${PROG}.nosym: ${PROG}.sym cp ${PROG}.sym ${PROG}.nosym diff --git a/sys/boot/alpha/libalpha/alpha_copy.c b/sys/boot/alpha/libalpha/alpha_copy.c index 250c416..196915c 100644 --- a/sys/boot/alpha/libalpha/alpha_copy.c +++ b/sys/boot/alpha/libalpha/alpha_copy.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: alpha_copy.c,v 1.1 1998/08/31 21:10:40 msmith Exp $ + * $Id: alpha_copy.c,v 1.2 1998/09/03 02:10:07 msmith Exp $ */ /* * MD primitives supporting placement of module data @@ -42,7 +42,7 @@ alpha_copyin(void *src, vm_offset_t dest, size_t len) } int -alpha_copyout(void *src, vm_offset_t dest, size_t len) +alpha_copyout(vm_offset_t src, void *dest, size_t len) { bcopy(src, dest, len); return(len); @@ -51,7 +51,7 @@ alpha_copyout(void *src, vm_offset_t dest, size_t len) int alpha_readin(int fd, vm_offset_t dest, size_t len) { - return(read(fd, dest, len)); + return(read(fd, (void *) dest, len)); } diff --git a/sys/boot/alpha/libalpha/libalpha.h b/sys/boot/alpha/libalpha/libalpha.h index 0308ea2..c5a2e17 100644 --- a/sys/boot/alpha/libalpha/libalpha.h +++ b/sys/boot/alpha/libalpha/libalpha.h @@ -1,4 +1,4 @@ -/* $Id: libalpha.h,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $ */ +/* $Id: libalpha.h,v 1.2 1998/08/31 21:10:40 msmith Exp $ */ /* * Copyright (c) 1996 @@ -75,6 +75,7 @@ extern void delay(int); extern void reboot(void); extern int alpha_copyin(void *src, vm_offset_t dest, size_t len); +extern int alpha_copyout(vm_offset_t src, void *dest, size_t len); extern int alpha_readin(int fd, vm_offset_t dest, size_t len); extern int alpha_boot(void); |
