 @@ -1,14 +1,14 @@
-/*	$NetBSD: boot2.c,v 1.74 2020/07/15 12:36:30 kim Exp $	*/
+/*	$NetBSD: boot2.c,v 1.75 2021/05/30 05:59:22 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -73,26 +73,29 @@
 #include <lib/libsa/stand.h>
 #include <lib/libsa/bootcfg.h>
 #include <lib/libsa/ufs.h>
 #include <lib/libkern/libkern.h>
 #include <libi386.h>
 #include <bootmod.h>
 #include <bootmenu.h>
 #include <biosdisk.h>
 #include <vbe.h>
 #include "devopen.h"
 #ifdef _STANDALONE
 #include <bootinfo.h>
 #endif
 #ifdef SUPPORT_PS2
 #include <biosmca.h>
 #endif
 extern struct x86_boot_params boot_params;
 extern	const char bootprog_name[], bootprog_rev[], bootprog_kernrev[];
 int errno;
 int boot_biosdev;
 daddr_t boot_biossector;
 @@ -120,43 +123,45 @@ char *sprint_bootsel(const char *);
 static void bootit(const char *, int);
 void print_banner(void);
 void boot2(int, uint64_t);
 void	command_help(char *);
 #if LIBSA_ENABLE_LS_OP
 void	command_ls(char *);
 #endif
 void	command_quit(char *);
 void	command_boot(char *);
 void	command_pkboot(char *);
 void	command_dev(char *);
 void	command_consdev(char *);
 void	command_root(char *);
 #ifndef SMALL
 void	command_menu(char *);
 #endif
 void	command_modules(char *);
 void	command_multiboot(char *);
 const struct bootblk_command commands[] = {
 	{ "help",	command_help },
 	{ "?",		command_help },
 #if LIBSA_ENABLE_LS_OP
 	{ "ls",		command_ls },
 #endif
 	{ "quit",	command_quit },
 	{ "boot",	command_boot },
 	{ "pkboot",	command_pkboot },
 	{ "dev",	command_dev },
 	{ "consdev",	command_consdev },
 	{ "root",	command_root },
 #ifndef SMALL
 	{ "menu",	command_menu },
 #endif
 	{ "modules",	command_modules },
 	{ "load",	module_add },
 	{ "multiboot",	command_multiboot },
 	{ "vesa",	command_vesa },
 	{ "splash",	splash_add },
 	{ "rndseed",	rnd_add },
 	{ "fs",		fs_add },
 	{ "userconf",	userconf_add },
 	{ NULL,		NULL },
 };
 @@ -440,26 +445,29 @@ command_help(char *arg)
 #else
 	       "     dev syntax is (hd|fd|cd)[N[x]]n"
 #endif
 #ifndef NO_GPT
 	       "                or NAME=gpt_label\n"
 #endif
 	       "     (ex. \"hd0a:netbsd.old -s\")\n"
 	       "pkboot [dev:][filename] [-12acdqsvxz]\n"
 #if LIBSA_ENABLE_LS_OP
 	       "ls [dev:][path]\n"
 #endif
 	       "dev [dev:]\n"
 	       "consdev {pc|{com[0123]|com[0123]kbd|auto}[,{speed}]}\n"
 	       "root    {spec}\n"
 	       "     spec can be disk, e.g. wd0, sd0\n"
 	       "     or string like wedge:name\n"
 	       "vesa {modenum|on|off|enabled|disabled|list}\n"
 #ifndef SMALL
 	       "menu (reenters boot menu, if defined in boot.cfg)\n"
 #endif
 	       "modules {on|off|enabled|disabled}\n"
 	       "load {path_to_module}\n"
 	       "multiboot [dev:][filename] [<args>]\n"
 	       "splash {path_to_image_file}\n"
 	       "userconf {command}\n"
 	       "rndseed {path_to_rndseed_file}\n"
 	       "help|?\n"
 	       "quit\n");
+}
 @@ -600,26 +608,38 @@ command_consdev(char *arg)
 			if (speed < 0)
 				goto error;
 			boot_params.bp_conspeed = speed;
+		}
 		initio(cdp->tag);
 		print_banner();
 		return;
+	}
 error:
 	printf("invalid console device.\n");
+}
 void
 command_root(char *arg)
+{
 	struct btinfo_rootdevice *biv = &bi_root;
 	strncpy(biv->devname, arg, sizeof(biv->devname));
 	if (biv->devname[sizeof(biv->devname)-1] != '\0') {
 		biv->devname[sizeof(biv->devname)-1] = '\0';
 		printf("truncated to %s\n",biv->devname);
+	}
+}
 #ifndef SMALL
 /* ARGSUSED */
 void
 command_menu(char *arg)
+{
 	if (bootcfg_info.nummenu > 0) {
 		/* Does not return */
 		doboottypemenu();
 	} else {
 		printf("No menu defined in boot.cfg\n");
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: boot.c,v 1.17 2019/09/26 12:21:03 nonaka Exp $	*/
+/*	$NetBSD: boot.c,v 1.18 2021/05/30 05:59:22 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka@netbsd.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -28,26 +28,30 @@
 #include "efiboot.h"
 #include <sys/bootblock.h>
 #include <sys/boot_flag.h>
 #include <machine/limits.h>
 #include "bootcfg.h"
 #include "bootmod.h"
 #include "bootmenu.h"
 #include "biosdisk.h"
 #include "devopen.h"
 #ifdef _STANDALONE
 #include <bootinfo.h>
 #endif
 int errno;
 int boot_biosdev;
 daddr_t boot_biossector;
 extern const char bootprog_name[], bootprog_rev[], bootprog_kernrev[];
 extern struct x86_boot_params boot_params;
 extern char twiddle_toggle;
 static const char * const names[][2] = {
 	{ "netbsd", "netbsd.gz" },
 	{ "onetbsd", "onetbsd.gz" },
 	{ "netbsd.old", "netbsd.old.gz" },
 @@ -55,49 +59,51 @@ static const char * const names[][2] = {
 #define NUMNAMES	__arraycount(names)
 #define DEFFILENAME	names[0][0]
 #ifndef	EFIBOOTCFG_FILENAME
 #define	EFIBOOTCFG_FILENAME	"esp:/EFI/NetBSD/boot.cfg"
 #endif
 void	command_help(char *);
 void	command_quit(char *);
 void	command_boot(char *);
 void	command_pkboot(char *);
 void	command_consdev(char *);
 void	command_root(char *);
 void	command_dev(char *);
 void	command_devpath(char *);
 void	command_efivar(char *);
 void	command_gop(char *);
 #if LIBSA_ENABLE_LS_OP
 void	command_ls(char *);
 #endif
 void	command_memmap(char *);
 #ifndef SMALL
 void	command_menu(char *);
 #endif
 void	command_modules(char *);
 void	command_multiboot(char *);
 void	command_text(char *);
 void	command_version(char *);
 const struct bootblk_command commands[] = {
 	{ "help",	command_help },
 	{ "?",		command_help },
 	{ "quit",	command_quit },
 	{ "boot",	command_boot },
 	{ "pkboot",	command_pkboot },
 	{ "consdev",	command_consdev },
 	{ "root",	command_root },
 	{ "dev",	command_dev },
 	{ "devpath",	command_devpath },
 	{ "efivar",	command_efivar },
 	{ "fs",		fs_add },
 	{ "gop",	command_gop },
 	{ "load",	module_add },
 #if LIBSA_ENABLE_LS_OP
 	{ "ls",		command_ls },
 #endif
 	{ "memmap",	command_memmap },
 #ifndef SMALL
 	{ "menu",	command_menu },
 #endif
 @@ -386,26 +392,29 @@ command_help(char *arg)
 	       "boot [dev:][filename] [-12acdqsvxz]\n"
 #ifndef NO_RAIDFRAME
 	       "     dev syntax is (hd|fd|cd|raid)[N[x]]\n"
 #else
 	       "     dev syntax is (hd|fd|cd)[N[x]]\n"
 #endif
 #ifndef NO_GPT
 	       "                or NAME=gpt_label\n"
 #endif
 	       "     (ex. \"hd0a:netbsd.old -s\")\n"
 	       "pkboot [dev:][filename] [-12acdqsvxz]\n"
 	       "dev [dev:]\n"
 	       "consdev {pc|com[0123][,{speed}]|com,{ioport}[,{speed}]}\n"
 	       "root    {spec}\n"
 	       "     spec can be disk, e.g. wd0, sd0\n"
 	       "     or string like wedge:name\n"
 	       "devpath\n"
 	       "efivar\n"
 	       "gop [{modenum|list}]\n"
 	       "load {path_to_module}\n"
 #if LIBSA_ENABLE_LS_OP
 	       "ls [dev:][path]\n"
 #endif
 	       "memmap [{sorted|unsorted|compact}]\n"
 #ifndef SMALL
 	       "menu (reenters boot menu, if defined in boot.cfg)\n"
 #endif
 	       "modules {on|off|enabled|disabled}\n"
 	       "multiboot [dev:][filename] [<args>]\n"
 @@ -580,26 +589,39 @@ command_consdev(char *arg)
 					if (sep2 != NULL)
 						goto error;
+				}
+			}
 			efi_consinit(cdp->tag, ioport, speed);
 			print_banner();
 			return;
+		}
+	}
 error:
 	printf("invalid console device.\n");
+}
 void
 command_root(char *arg)
+{
 	struct btinfo_rootdevice *biv = &bi_root;
 	strncpy(biv->devname, arg, sizeof(biv->devname));
 	if (biv->devname[sizeof(biv->devname)-1] != '\0') {
 		biv->devname[sizeof(biv->devname)-1] = '\0';
 		printf("truncated to %s\n",biv->devname);
+	}
+}
 #ifndef SMALL
 /* ARGSUSED */
 void
 command_menu(char *arg)
+{
 	if (bootcfg_info.nummenu > 0) {
 		/* Does not return */
 		doboottypemenu();
 	} else
 		printf("No menu defined in boot.cfg\n");
+}
 #endif /* !SMALL */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: biosdisk.c,v 1.54 2019/12/17 01:37:53 manu Exp $	*/
+/*	$NetBSD: biosdisk.c,v 1.55 2021/05/30 05:59:23 mlelstv Exp $	*/
 /*
  * Copyright (c) 1996, 1998
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -176,26 +176,27 @@ const struct gpt_part gpt_parts[] = {
 	{ &GET_ms_ldm_data,	"Microsoft LDM data" },
 	{ &GET_linux_data,	"Linux data" },
 	{ &GET_linux_raid,	"Linux RAID" },
 	{ &GET_linux_swap,	"Linux Swap" },
 	{ &GET_linux_lvm,	"Linux LVM" },
 	{ &GET_apple_hfs,	"Apple HFS" },
 	{ &GET_apple_ufs,	"Apple UFS" },
 	{ &GET_bios,		"BIOS Boot (GRUB)" },
 };
 #endif /* NO_GPT */
 struct btinfo_bootdisk bi_disk;
 struct btinfo_bootwedge bi_wedge;
 struct btinfo_rootdevice bi_root;
 #define MBR_PARTS(buf) ((char *)(buf) + offsetof(struct mbr_sector, mbr_parts))
 #ifndef	devb2cdb
 #define	devb2cdb(bno)	(((bno) * DEV_BSIZE) / ISO_DEFAULT_BLOCK_SIZE)
 #endif
 static void
 dealloc_biosdisk(struct biosdisk *d)
+{
 #ifndef NO_GPT
 	int i;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: biosdisk.h,v 1.12 2019/09/13 02:19:46 manu Exp $	*/
+/*	$NetBSD: biosdisk.h,v 1.13 2021/05/30 05:59:23 mlelstv Exp $	*/
 /*
  * Copyright (c) 1996
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -33,26 +33,27 @@ struct biosdisk_partition {
 	int     fstype;
 #ifndef NO_GPT
 	const struct gpt_part {
 		const struct uuid *guid;
 		const char *name;
 	} *guid;
 	uint64_t attr;
 	char *part_name; /* maximum BIOSDISK_PART_NAME_LEN */
 #endif
 };
 extern struct btinfo_bootdisk bi_disk;
 extern struct btinfo_bootwedge bi_wedge;
 extern struct btinfo_rootdevice bi_root;
 int biosdisk_strategy(void *, int, daddr_t, size_t, void *, size_t *);
 int biosdisk_open(struct open_file *, ...);
 int biosdisk_open_name(struct open_file *, const char *);
 int biosdisk_close(struct open_file *);
 int biosdisk_ioctl(struct open_file *, u_long, void *);
 int biosdisk_findpartition(int, daddr_t, int *, const char **);
 int biosdisk_readpartition(int, daddr_t, daddr_t,
      struct biosdisk_partition **, int *);
 struct RF_ComponentLabel_s;
 int biosdisk_read_raidframe(int, daddr_t, struct RF_ComponentLabel_s *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: exec.c,v 1.76 2020/04/04 19:50:54 christos Exp $	 */
+/*	$NetBSD: exec.c,v 1.77 2021/05/30 05:59:23 mlelstv Exp $	 */
 /*
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -112,26 +112,27 @@
 #endif
 #define BOOT_NARGS	6
 #ifndef	PAGE_SIZE
 #define	PAGE_SIZE	4096
 #endif
 #define MODULE_WARNING_SEC	5
 #define MAXMODNAME	32	/* from <sys/module.h> */
 extern struct btinfo_console btinfo_console;
 extern struct btinfo_rootdevice bi_root;
 boot_module_t *boot_modules;
 bool boot_modules_enabled = true;
 bool kernel_loaded;
 typedef struct userconf_command {
 	char *uc_text;
 	size_t uc_len;
 	struct userconf_command *uc_next;
 } userconf_command_t;
 userconf_command_t *userconf_commands = NULL;
 struct btinfo_framebuffer btinfo_framebuffer;
 @@ -467,26 +468,28 @@ exec_netbsd(const char *file, physaddr_t
 	int error;
 #ifdef EFIBOOT
 	int i;
 #endif
 #ifdef	DEBUG
 	printf("exec: file=%s loadaddr=0x%lx\n", file ? file : "NULL",
 	    loadaddr);
 #endif
 	BI_ALLOC(BTINFO_MAX);
 	BI_ADD(&btinfo_console, BTINFO_CONSOLE, sizeof(struct btinfo_console));
 	if (bi_root.devname[0])
 		BI_ADD(&bi_root, BTINFO_ROOTDEVICE, sizeof(struct btinfo_rootdevice));
 	howto = boothowto;
 	memset(marks, 0, sizeof(marks));
 	if (has_prekern) {
 		error = common_load_prekern(file, &basemem, &extmem, loadaddr,
 		    floppy, marks);
 	} else {
 		error = common_load_kernel(file, &basemem, &extmem, loadaddr,
 		    floppy, marks);
+	}
 	if (error) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bootcfg.c,v 1.5 2020/06/27 17:22:12 jmcneill Exp $	*/
+/*	$NetBSD: bootcfg.c,v 1.6 2021/05/30 05:59:23 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -70,26 +70,27 @@ bootcfg_do_noop(const char *cmd, char *a
  * 		- If maxsz is < 0 boot.cfg will not be processed.
  * 		- If maxsz is = 0 no limit will be imposed but parsing may
  *		  fail due to platform or other constraints e.g. maximum
  *		  segment size.
  *		- If 0 < maxsz and boot.cfg exceeds maxsz it will not be
  *		  parsed, otherwise it will be parsed.
+ *
  * The recognised keywords are:
  * banner: text displayed instead of the normal welcome text
  * menu: Descriptive text:command to use
  * timeout: Timeout in seconds (overrides that set by installboot)
  * default: the default menu option to use if Return is pressed
  * consdev: the console device to use
  * root: the root device to use
  * format: how menu choices are displayed: (a)utomatic, (n)umbers or (l)etters
  * clear: whether to clear the screen or not
+ *
  * Example boot.cfg file:
  * banner=Welcome to NetBSD
  * banner=Please choose the boot type from the following menu
  * menu=Boot NetBSD:boot netbsd
  * menu=Boot into single user mode:boot netbsd -s
  * menu=:boot hd1a:netbsd -cs
  * menu=Goto boot comand line:prompt
  * timeout=10
  * consdev=com0
  * default=1
 @@ -212,26 +213,28 @@ perform_bootcfg(const char *conf, bootcf
+			}
 		} else if (!strncmp(key, "banner", 6)) {
 			if (cbanner < BOOTCFG_MAXBANNER)
 				bootcfg_info.banner[cbanner++] = value;
 		} else if (!strncmp(key, "timeout", 7)) {
 			if (!isdigit(*value))
 				bootcfg_info.timeout = -1;
 			else
 				bootcfg_info.timeout = atoi(value);
 		} else if (!strncmp(key, "default", 7)) {
 			bootcfg_info.def = atoi(value) - 1;
 		} else if (!strncmp(key, "consdev", 7)) {
 			bootcfg_info.consdev = value;
 		} else if (!strncmp(key, "root", 4)) {
 			bootcfg_info.root = value;
 		} else if (!strncmp(key, BOOTCFG_CMD_LOAD, 4)) {
 			command(BOOTCFG_CMD_LOAD, value);
 		} else if (!strncmp(key, "format", 6)) {
 			printf("value:%c\n", *value);
 			switch (*value) {
 			case 'a':
 			case 'A':
 				bootcfg_info.menuformat = MENUFORMAT_AUTO;
 				break;
 			case 'n':
 			case 'N':
 			case 'd':

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bootcfg.h,v 1.3 2019/03/31 20:08:45 christos Exp $	*/
+/*	$NetBSD: bootcfg.h,v 1.4 2021/05/30 05:59:23 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -32,26 +32,27 @@
 #define BOOTCFG_FILENAME "boot.cfg"
 #define BOOTCFG_MAXMENU	 20
 #define BOOTCFG_MAXBANNER 12
 #define BOOTCFG_CMD_LOAD	  "load"
 #define BOOTCFG_CMD_USERCONF	  "userconf"
 typedef void (*bootcfg_command)(const char *cmd, char *arg);
 struct bootcfg_def {
 	char *banner[BOOTCFG_MAXBANNER];	/* Banner text */
 	char *command[BOOTCFG_MAXMENU];		/* Menu commands per entry*/
 	char *consdev;				/* Console device */
 	char *root;				/* Root specification */
 	int def;				/* Default menu option */
 	char *desc[BOOTCFG_MAXMENU];		/* Menu text per entry */
 	int nummenu;				/* Number of menu items */
 	int timeout;		 		/* Timeout in seconds */
 	int menuformat;				/* Letters instead of numbers */
 	int clear;				/* Clear the screen? */
 };
 extern struct bootcfg_def bootcfg_info;
 int perform_bootcfg(const char *, bootcfg_command, const off_t);
 void bootcfg_do_noop(const char *, char *);
 #endif /* !_BOOTCFG_H */