From be01b9a244a6eeeb4dc3218c8c2092425570821f Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Sat, 20 May 2006 22:38:34 +0000 Subject: Lower load address 128KB, to cope with the PROM data area on 8MB machines. --- sys/arch/aviion/stand/Makefile.inc | 8 ++++---- sys/arch/aviion/stand/netboot/crt.c | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'sys/arch/aviion') diff --git a/sys/arch/aviion/stand/Makefile.inc b/sys/arch/aviion/stand/Makefile.inc index fdeb15aac3b..b90e6070a0b 100644 --- a/sys/arch/aviion/stand/Makefile.inc +++ b/sys/arch/aviion/stand/Makefile.inc @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile.inc,v 1.1 2006/05/16 22:48:16 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2006/05/20 22:38:32 miod Exp $ MDEC_DIR?= /usr/mdec CFLAGS+= -Wall -Werror -fno-stack-protector -mmemcpy # Load addresses for bootstrap code -# This will work on 8MB machines, if each bootstrap code fits in 60KB +# This should work on 8MB machines, if each bootstrap code fits in 60KB # (not 64!) -STAGE1_RELOC=0x7e0000 -STAGE2_RELOC=0x7f0000 +STAGE1_RELOC=0x7c0000 +STAGE2_RELOC=0x7d0000 diff --git a/sys/arch/aviion/stand/netboot/crt.c b/sys/arch/aviion/stand/netboot/crt.c index bf44a1d9661..b933dce0798 100644 --- a/sys/arch/aviion/stand/netboot/crt.c +++ b/sys/arch/aviion/stand/netboot/crt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt.c,v 1.1 2006/05/16 22:48:18 miod Exp $ */ +/* $OpenBSD: crt.c,v 1.2 2006/05/20 22:38:33 miod Exp $ */ #include #include @@ -7,6 +7,12 @@ extern void netboot(const char *, int, int, int); +/* + * This is the boot code entry point. + * Note that we do not bother to set r31, and use the default value supplied + * by the PROM, which is the top of memory, minus the PROM data area (usually + * 128KB). + */ void start(const char *args, int dev, int unit, int part) { -- cgit v1.2.3