Module Name: src
Committed By: nisimura
Date: Sun Jan 23 07:41:38 UTC 2011
Modified Files:
src/sys/arch/sandpoint/stand/altboot: Makefile main.c version
Removed Files:
src/sys/arch/sandpoint/stand/altboot: newvers.sh
Log Message:
switch to use newvers_stand.sh as suggested by joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sandpoint/stand/altboot/Makefile \
src/sys/arch/sandpoint/stand/altboot/main.c \
src/sys/arch/sandpoint/stand/altboot/version
cvs rdiff -u -r1.1 -r0 src/sys/arch/sandpoint/stand/altboot/newvers.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/stand/altboot/Makefile
diff -u src/sys/arch/sandpoint/stand/altboot/Makefile:1.1 src/sys/arch/sandpoint/stand/altboot/Makefile:1.2
--- src/sys/arch/sandpoint/stand/altboot/Makefile:1.1 Sun Jan 23 01:05:30 2011
+++ src/sys/arch/sandpoint/stand/altboot/Makefile Sun Jan 23 07:41:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/01/23 01:05:30 nisimura Exp $
+# $NetBSD: Makefile,v 1.2 2011/01/23 07:41:38 nisimura Exp $
S= ${.CURDIR}/../../../..
@@ -53,7 +53,7 @@
LIBSA= ${SALIB}
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
- ${HOST_SH} ${.CURDIR}/newvers.sh ${.CURDIR}/version
+ ${HOST_SH} ${S}/conf/newvers_stand.sh -K ${.CURDIR}/version "sandpoint"
${CC} -c vers.c
${LD} -N -Ttext ${RELOC} -Bstatic -e ${ENTRY} -o ${PROG} \
${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBKERN}
Index: src/sys/arch/sandpoint/stand/altboot/main.c
diff -u src/sys/arch/sandpoint/stand/altboot/main.c:1.1 src/sys/arch/sandpoint/stand/altboot/main.c:1.2
--- src/sys/arch/sandpoint/stand/altboot/main.c:1.1 Sun Jan 23 01:05:30 2011
+++ src/sys/arch/sandpoint/stand/altboot/main.c Sun Jan 23 07:41:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.1 2011/01/23 01:05:30 nisimura Exp $ */
+/* $NetBSD: main.c,v 1.2 2011/01/23 07:41:38 nisimura Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
int module_open(struct boot_module *);
void main(int, char **);
-extern char bootprog_rev[], bootprog_maker[], bootprog_date[];
+extern char bootprog_name[], bootprog_rev[], bootprog_maker[], bootprog_date[];
int brdtype;
uint32_t busclock, cpuclock;
@@ -109,7 +109,7 @@
void *dev;
printf("\n");
- printf(">> NetBSD/sandpoint Boot, Revision %s\n", bootprog_rev);
+ printf(">> %s altboot, revision %s\n", bootprog_name, bootprog_rev);
printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
brdprop = brd_lookup(brdtype);
Index: src/sys/arch/sandpoint/stand/altboot/version
diff -u src/sys/arch/sandpoint/stand/altboot/version:1.1 src/sys/arch/sandpoint/stand/altboot/version:1.2
--- src/sys/arch/sandpoint/stand/altboot/version:1.1 Sun Jan 23 01:32:08 2011
+++ src/sys/arch/sandpoint/stand/altboot/version Sun Jan 23 07:41:38 2011
@@ -1,7 +1,7 @@
-1.0 initial version
-1.1 PCI autoconf for multiple NIC device drivers
-1.2 Synology-DS support, Marvell-Yukon driver, fixed aligned alloc
-1.3 allow to have boot options, brdsetup.c cleanup to make brdtype
+1.0: initial version
+1.1: PCI autoconf for multiple NIC device drivers
+1.2: Synology-DS support, Marvell-Yukon driver, fixed aligned alloc
+1.3: allow to have boot options, brdsetup.c cleanup to make brdtype
maintainance more confortable
-1.4 load kernels from local disk
-1.5 altboot is the new name as this is capable of handling net & dsk.
+1.4: load kernels from local disk
+1.5: altboot is the new name as this is capable of handling net & dsk.
