CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src
Committed By: christos
Date: Fri Feb 9 16:12:02 UTC 2024
Modified Files:
src/sys/arch/sandpoint/stand/altboot: Makefile
Log Message:
PR/57915: Jan-Benedict Glaw: Use $MKREPRO_TIMESTAMP for repro builds in uBoot
images
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/stand/altboot/Makefile
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.18 src/sys/arch/sandpoint/stand/altboot/Makefile:1.19
--- src/sys/arch/sandpoint/stand/altboot/Makefile:1.18 Tue Mar 23 22:53:16 2021
+++ src/sys/arch/sandpoint/stand/altboot/Makefile Fri Feb 9 11:12:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/03/24 02:53:16 rin Exp $
+# $NetBSD: Makefile,v 1.19 2024/02/09 16:12:02 christos Exp $
S= ${.CURDIR}/../../../..
@@ -56,13 +56,19 @@ cleandir distclean: .WAIT cleanlibdir
cleanlibdir:
-rm -rf lib
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGE_TIMESTAMP=-t "${MKREPRO_TIMESTAMP}"
+.endif
+
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${_MKTARGET_LINK}
${LD} -N -Ttext ${RELOC} -Bstatic -e ${ENTRY} -o ${PROG} \
${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${OBJCOPY} -S -O binary ${PROG} ${PROG}.bin
${TOOL_MKUBOOTIMAGE} -A powerpc -T kernel -C none -O linux \
- -a 0x${RELOC} -n ${PROG} ${PROG}.bin ${PROG}.img
+ -a 0x${RELOC} ${MKUBOOTIMAGE_TIMESTAMP} -n ${PROG} \
+ ${PROG}.bin ${PROG}.img
+
VERSIONFLAGS+=-k
.include "${S}/conf/newvers_stand.mk"
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: christos Date: Fri Feb 9 16:12:02 UTC 2024 Modified Files: src/sys/arch/sandpoint/stand/altboot: Makefile Log Message: PR/57915: Jan-Benedict Glaw: Use $MKREPRO_TIMESTAMP for repro builds in uBoot images To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/stand/altboot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src
Committed By: riastradh
Date: Thu Sep 22 14:27:02 UTC 2022
Modified Files:
src/sys/arch/sandpoint/stand/altboot: main.c
Log Message:
sandpoint: Teach altboot to handle 9.99.100 modules.
Not tested, but something here will be necessary to make it work, and
the same change does work in x86 efiboot.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sandpoint/stand/altboot/main.c
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/main.c
diff -u src/sys/arch/sandpoint/stand/altboot/main.c:1.33 src/sys/arch/sandpoint/stand/altboot/main.c:1.34
--- src/sys/arch/sandpoint/stand/altboot/main.c:1.33 Tue Mar 23 07:21:40 2021
+++ src/sys/arch/sandpoint/stand/altboot/main.c Thu Sep 22 14:27:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.33 2021/03/23 07:21:40 rin Exp $ */
+/* $NetBSD: main.c,v 1.34 2022/09/22 14:27:02 riastradh Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -516,7 +516,7 @@ module_load(const char *kernel_path)
"/stand/sandpoint/%d.%d.%d/modules",
netbsd_version / 1,
netbsd_version / 100 % 100,
- netbsd_version / 100 % 100);
+ netbsd_version / 100 % 1);
}
else if (netbsd_version != 0) {
/* release */
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: riastradh Date: Thu Sep 22 14:27:02 UTC 2022 Modified Files: src/sys/arch/sandpoint/stand/altboot: main.c Log Message: sandpoint: Teach altboot to handle 9.99.100 modules. Not tested, but something here will be necessary to make it work, and the same change does work in x86 efiboot. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sandpoint/stand/altboot/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: rin Date: Sat Apr 30 03:52:41 UTC 2022 Modified Files: src/sys/arch/sandpoint/stand/altboot: dsk.c Log Message: Fix fallout from libsa change; stand.h includes now. Do not use NULL for integer 0. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/stand/altboot/dsk.c 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/dsk.c diff -u src/sys/arch/sandpoint/stand/altboot/dsk.c:1.18 src/sys/arch/sandpoint/stand/altboot/dsk.c:1.19 --- src/sys/arch/sandpoint/stand/altboot/dsk.c:1.18 Tue Sep 29 15:12:52 2015 +++ src/sys/arch/sandpoint/stand/altboot/dsk.c Sat Apr 30 03:52:41 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dsk.c,v 1.18 2015/09/29 15:12:52 phx Exp $ */ +/* $NetBSD: dsk.c,v 1.19 2022/04/30 03:52:41 rin Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -473,7 +473,7 @@ dlabel_valid(int unit) dsk = lookup_disk(unit); if (dsk == NULL) - return NULL; + return 0; return dsk->dlabel != NULL; }
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: rin Date: Sat Apr 30 03:52:41 UTC 2022 Modified Files: src/sys/arch/sandpoint/stand/altboot: dsk.c Log Message: Fix fallout from libsa change; stand.h includes now. Do not use NULL for integer 0. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/stand/altboot/dsk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: andvar Date: Tue Apr 5 06:43:54 UTC 2022 Modified Files: src/sys/arch/sandpoint/stand/altboot: version Log Message: s/confortable/comfortable/ To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sandpoint/stand/altboot/version 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/version diff -u src/sys/arch/sandpoint/stand/altboot/version:1.10 src/sys/arch/sandpoint/stand/altboot/version:1.11 --- src/sys/arch/sandpoint/stand/altboot/version:1.10 Mon Apr 4 19:33:45 2022 +++ src/sys/arch/sandpoint/stand/altboot/version Tue Apr 5 06:43:54 2022 @@ -2,7 +2,7 @@ 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 - maintenance more confortable + maintenance more comfortable 1.4: load kernels from local disk 1.5: altboot is the new name as this is capable of handling net & dsk. 1.6: build altboot.img to fake a Linux kernel module, supports bootargs
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: andvar Date: Tue Apr 5 06:43:54 UTC 2022 Modified Files: src/sys/arch/sandpoint/stand/altboot: version Log Message: s/confortable/comfortable/ To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sandpoint/stand/altboot/version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: christos Date: Wed Jun 26 22:04:12 UTC 2019 Modified Files: src/sys/arch/sandpoint/stand/altboot: main.c Log Message: make this compile again To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sandpoint/stand/altboot/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src
Committed By: christos
Date: Wed Jun 26 22:04:12 UTC 2019
Modified Files:
src/sys/arch/sandpoint/stand/altboot: main.c
Log Message:
make this compile again
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sandpoint/stand/altboot/main.c
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/main.c
diff -u src/sys/arch/sandpoint/stand/altboot/main.c:1.30 src/sys/arch/sandpoint/stand/altboot/main.c:1.31
--- src/sys/arch/sandpoint/stand/altboot/main.c:1.30 Tue Jun 25 20:54:04 2019
+++ src/sys/arch/sandpoint/stand/altboot/main.c Wed Jun 26 18:04:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.30 2019/06/26 00:54:04 pgoyette Exp $ */
+/* $NetBSD: main.c,v 1.31 2019/06/26 22:04:12 christos Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -89,6 +89,7 @@ char module_base[80];
uint32_t kmodloadp;
int modules_enabled = 0;
+#define MAXMODNAME 32
void module_add(const char *);
void module_add_split(const char *);
void module_load(const char *);
@@ -427,7 +428,7 @@ bi_add(void *new, int type, int size)
/*
* Add a /-separated list of module names to the boot list
*/
-static void
+void
module_add_split(const char *name)
{
char mod_name[MAXMODNAME];
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: pgoyette Date: Wed Jun 26 00:54:04 UTC 2019 Modified Files: src/sys/arch/sandpoint/stand/altboot: main.c Log Message: Similar to changes made for x86, allow for the boot-loader to auto-push a list of modules for file-system support. This allows, for example, booting from an ext2fs file-system when the kernel has no built-in ufs or ext2fs modules. XXX Untested, as I have no sandpoint hardware. I'd appreciate it if XXX someone with hardware can build and test. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sandpoint/stand/altboot/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src
Committed By: pgoyette
Date: Wed Jun 26 00:54:04 UTC 2019
Modified Files:
src/sys/arch/sandpoint/stand/altboot: main.c
Log Message:
Similar to changes made for x86, allow for the boot-loader to auto-push
a list of modules for file-system support. This allows, for example,
booting from an ext2fs file-system when the kernel has no built-in ufs
or ext2fs modules.
XXX Untested, as I have no sandpoint hardware. I'd appreciate it if
XXX someone with hardware can build and test.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sandpoint/stand/altboot/main.c
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/main.c
diff -u src/sys/arch/sandpoint/stand/altboot/main.c:1.29 src/sys/arch/sandpoint/stand/altboot/main.c:1.30
--- src/sys/arch/sandpoint/stand/altboot/main.c:1.29 Thu Feb 8 09:05:18 2018
+++ src/sys/arch/sandpoint/stand/altboot/main.c Wed Jun 26 00:54:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.29 2018/02/08 09:05:18 dholland Exp $ */
+/* $NetBSD: main.c,v 1.30 2019/06/26 00:54:04 pgoyette Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -90,6 +90,7 @@ uint32_t kmodloadp;
int modules_enabled = 0;
void module_add(const char *);
+void module_add_split(const char *);
void module_load(const char *);
int module_open(struct boot_module *);
@@ -367,7 +368,7 @@ main(int argc, char *argv[], char *boota
if (modules_enabled) {
if (fsmod != NULL)
-module_add(fsmod);
+module_add_split(fsmod);
kmodloadp = marks[MARK_END];
btinfo_modulelist = NULL;
module_load(bname);
@@ -423,6 +424,42 @@ bi_add(void *new, int type, int size)
bi_next += size;
}
+/*
+ * Add a /-separated list of module names to the boot list
+ */
+static void
+module_add_split(const char *name)
+{
+ char mod_name[MAXMODNAME];
+ int i;
+ const char *mp = name;
+ char *ep;
+
+ while (*mp) {/* scan list of module names */
+ i = MAXMODNAME;
+ ep = mod_name;
+ while (--i) { /* scan for end of first name */
+ *ep = *mp;
+ if (*ep == '/') /* NUL-terminate the name */
+*ep = '\0';
+
+ if (*ep == 0 ) { /* add non-empty name */
+if (ep != mod_name)
+ module_add(mod_name);
+break;
+ }
+ ep++; mp++;
+ }
+ if (*ep != 0) {
+ printf("module name too long\n");
+ return;
+ }
+ if (*mp == '/') { /* skip separator if more */
+ mp++;
+ }
+ }
+}
+
void
module_add(const char *name)
{
Re: CVS commit: src/sys/arch/sandpoint/stand/altboot
David Laight wrote: > This isn't really an ideal solution, I've have to fight membar > instructions embedded into byteswapping accesses on ppc linux. > Drivers may want to do several accesses that can be reordered > before/after one that matters - so need greater control than > enforcing specific membars. Hm. What would you suggest? Is it better to revert this change? If it is only a matter of performance, I would prefer a slower driver with increased stability. This is just the boot loader, which reads from disks with PIO0. -- Frank Wille
Re: CVS commit: src/sys/arch/sandpoint/stand/altboot
On Sun, Oct 30, 2011 at 09:08:33PM +, Frank Wille wrote: > Module Name: src > Committed By: phx > Date: Sun Oct 30 21:08:33 UTC 2011 > > Modified Files: > src/sys/arch/sandpoint/stand/altboot: brdsetup.c dsk.c entry.S fxp.c > globals.h nvt.c rge.c skg.c stg.c vge.c > > Log Message: > Added in8() and out8() to access a byte with reorder-protection. > Use it in all drivers instead of (volatile uint8_t *). This isn't really an ideal solution, I've have to fight membar instructions embedded into byteswapping accesses on ppc linux. Drivers may want to do several accesses that can be reordered before/after one that matters - so need greater control than enforcing specific membars. David -- David Laight: da...@l8s.co.uk
Re: CVS commit: src/sys/arch/sandpoint/stand/altboot
David Laight wrote: > Can anything be done with the 'initrd' image - either as an image file > or something in the tar archive (IIRC it is likely to be one these days)? Altboot could theoretically use information from the initrd image. For example I thought about passing the bootargs in it. But I guess you would never need that. For installation you have to connect a serial console anyway, where you can use the interactive mode of altboot to load the netbsd-INSTALL kernel via TFTP. -- Frank Wille
Re: CVS commit: src/sys/arch/sandpoint/stand/altboot
On Sun, Mar 20, 2011 at 02:07:05AM +, Frank Wille wrote: > > Log Message: > The DSM-G600 U-Boot is so restricted that there is no possibility to pass > any bootargs. So we will just do the default multiuser boot from wd0: when > altboot was started together with a Linux initrd image. Can anything be done with the 'initrd' image - either as an image file or something in the tar archive (IIRC it is likely to be one these days)? David -- David Laight: da...@l8s.co.uk
