diff options
author | dfr <dfr@FreeBSD.org> | 1998-08-22 10:31:01 +0000 |
---|---|---|
committer | dfr <dfr@FreeBSD.org> | 1998-08-22 10:31:01 +0000 |
commit | e2b188b518313be90f07469c70efe961df7fe79d (patch) | |
tree | d9b3226272c51c5361342939cdd134d2c78461fa /sys/boot/alpha | |
parent | 83d0a1cbadb8ba309fe95e6669b3ca3945eac04a (diff) | |
download | FreeBSD-src-e2b188b518313be90f07469c70efe961df7fe79d.zip FreeBSD-src-e2b188b518313be90f07469c70efe961df7fe79d.tar.gz |
Minor tweaks to track a couple of i386 changes and to make it compile.
Diffstat (limited to 'sys/boot/alpha')
-rw-r--r-- | sys/boot/alpha/boot1/Makefile | 4 | ||||
-rw-r--r-- | sys/boot/alpha/boot2/Makefile | 4 | ||||
-rw-r--r-- | sys/boot/alpha/common/main.c | 21 | ||||
-rw-r--r-- | sys/boot/alpha/libalpha/Makefile | 4 | ||||
-rw-r--r-- | sys/boot/alpha/libalpha/devicename.c | 7 | ||||
-rw-r--r-- | sys/boot/alpha/netboot/Makefile | 4 |
6 files changed, 31 insertions, 13 deletions
diff --git a/sys/boot/alpha/boot1/Makefile b/sys/boot/alpha/boot1/Makefile index f97f5fb..1e5a659 100644 --- a/sys/boot/alpha/boot1/Makefile +++ b/sys/boot/alpha/boot1/Makefile @@ -11,9 +11,9 @@ SRCS= start.S boot1.c sys.c CFLAGS+= -mno-fp-regs CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} LIBSTANDDIR= /home/dfr/FreeBSD/alpha/src/lib/libstand -LIBSTAND= ${LIBSTANDDIR}/obj/libstand.a +LIBSTAND= -lstand CFLAGS+= -I${LIBSTANDDIR} -LIBALPHA= ${.CURDIR}/../libalpha/obj/libalpha.a +LIBALPHA= ${.OBJDIR}/../libalpha/libalpha.a CFLAGS+= -I${.CURDIR}/.. CFLAGS+= -DSECONDARY_LOAD_ADDRESS=0x${SECONDARY_LOAD_ADDRESS} -DMINIMAL NOMAN=1 diff --git a/sys/boot/alpha/boot2/Makefile b/sys/boot/alpha/boot2/Makefile index 1d833b1..a3790d3 100644 --- a/sys/boot/alpha/boot2/Makefile +++ b/sys/boot/alpha/boot2/Makefile @@ -26,9 +26,9 @@ CFLAGS+= -Wall # XXX fix to use "standard" versions LIBSTANDDIR= /home/dfr/FreeBSD/alpha/src/lib/libstand -LIBSTAND= ${LIBSTANDDIR}/obj/libstand.a +LIBSTAND= -lstand CFLAGS+= -I${LIBSTANDDIR} -LIBALPHA= ${.CURDIR}/../libalpha/obj/libalpha.a +LIBALPHA= ${.OBJDIR}/../libalpha/libalpha.a CFLAGS+= -I${.CURDIR}/.. CRT= start.o STRIP= diff --git a/sys/boot/alpha/common/main.c b/sys/boot/alpha/common/main.c index c4d8d71..6c0b10f 100644 --- a/sys/boot/alpha/common/main.c +++ b/sys/boot/alpha/common/main.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: main.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $ */ @@ -96,9 +96,9 @@ main(void) (devsw[i]->dv_init)(); printf("\n"); - printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev); - printf(">> (%s, %s)\n", bootprog_maker, bootprog_date); - printf(">> Memory: %ld k\n", memsize() / 1024); + printf("%s, Revision %s\n", bootprog_name, bootprog_rev); + printf("(%s, %s)\n", bootprog_maker, bootprog_date); + printf("Memory: %ld k\n", memsize() / 1024); /* We're booting from an SRM disk, try to spiff this */ currdev.d_dev = devsw[0]; /* XXX presumes that biosdisk is first in devsw */ @@ -120,9 +120,22 @@ main(void) archsw.arch_getdev = alpha_getdev; /* + * SRM firmware takes *ages* to open the disk device. We hold it + * open until the closeall() when we exec the kernel. Note that + * we must close it eventually since otherwise the firmware leaves + * the ncr hardware in a broken state (at least it does on my EB164). + */ + open("/", O_RDONLY); + + /* * XXX should these be in the MI source? */ source("/boot/boot.config"); + printf("\n"); + autoboot(10, NULL); /* try to boot automatically */ + printf("\nType '?' for a list of commands, 'help' for more detailed help.\n"); + /* setenv("prompt", "$currdev>", 1); */ + interact(); /* doesn't return */ } diff --git a/sys/boot/alpha/libalpha/Makefile b/sys/boot/alpha/libalpha/Makefile index 191649f..58bf824 100644 --- a/sys/boot/alpha/libalpha/Makefile +++ b/sys/boot/alpha/libalpha/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $ LIB= alpha NOPIC= true @@ -20,4 +20,6 @@ SRCS= OSFpal.c elf_freebsd.c prom.c prom_disp.S prom_swpal.S start.S \ pal.S reboot.c delay.c time.c alpha_module.c devicename.c \ srmdisk.c srmnet.c getsecs.c +all: libalpha.a + .include <bsd.lib.mk> diff --git a/sys/boot/alpha/libalpha/devicename.c b/sys/boot/alpha/libalpha/devicename.c index 310bb94..5d1f604 100644 --- a/sys/boot/alpha/libalpha/devicename.c +++ b/sys/boot/alpha/libalpha/devicename.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: devicename.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $ */ #include <stand.h> @@ -174,8 +174,11 @@ alpha_parsedev(struct alpha_devdesc **dev, char *devspec, char **path) } idev->d_dev = dv; idev->d_type = dv->dv_type; - if (dev != NULL) + if (dev == NULL) { + free(idev); + } else { *dev = idev; + } return(0); fail: diff --git a/sys/boot/alpha/netboot/Makefile b/sys/boot/alpha/netboot/Makefile index 210a0f0..43f1c4c 100644 --- a/sys/boot/alpha/netboot/Makefile +++ b/sys/boot/alpha/netboot/Makefile @@ -26,9 +26,9 @@ CFLAGS+= -Wall # XXX fix to use "standard" versions LIBSTANDDIR= /home/dfr/FreeBSD/alpha/src/lib/libstand -LIBSTAND= ${LIBSTANDDIR}/obj/libstand.a +LIBSTAND= -lstand CFLAGS+= -I${LIBSTANDDIR} -LIBALPHA= ${.CURDIR}/../libalpha/obj/libalpha.a +LIBALPHA= ${.OBJDIR}/../libalpha/libalpha.a CFLAGS+= -I${.CURDIR}/.. CRT= start.o STRIP= |