Index: sys/stand/efiboot/boot.c
===================================================================
RCS file: /cvsroot/src/sys/stand/efiboot/boot.c,v
retrieving revision 1.15
diff -u -p -r1.15 boot.c
--- sys/stand/efiboot/boot.c	18 Jan 2019 19:41:03 -0000	1.15
+++ sys/stand/efiboot/boot.c	10 Apr 2019 18:01:38 -0000
@@ -137,6 +138,9 @@ command_boot(char *arg)
 	if (!kernel || !*kernel)
 		kernel = DEFFILENAME;
 
+	if (!*bootargs)
+		bootargs = netbsd_args;
+
 	exec_netbsd(kernel, bootargs);
 }
 
@@ -415,7 +419,8 @@ boot(void)
 	for (; currname < (int)NUMNAMES; currname++) {
 		if (currname >= 0)
 			set_bootfile(names[currname]);
-		printf("booting %s - starting in ", netbsd_path);
+		printf("booting %s%s%s - starting in ", netbsd_path,
+		    netbsd_args[0] != '\0' ? " " : "", netbsd_args);
 
 		c = awaitkey(DEFTIMEOUT, 1);
 		if (c != '\r' && c != '\n' && c != '\0')
Index: sys/stand/efiboot/efiboot.c
===================================================================
RCS file: /cvsroot/src/sys/stand/efiboot/efiboot.c,v
retrieving revision 1.13
diff -u -p -r1.13 efiboot.c
--- sys/stand/efiboot/efiboot.c	30 Mar 2019 12:47:53 -0000	1.13
+++ sys/stand/efiboot/efiboot.c	10 Apr 2019 18:01:38 -0000
@@ -42,6 +42,14 @@ EFI_LOADED_IMAGE *efi_li;
 
 int howto = 0;
 
+#ifdef _LP64
+#define PRIxEFIPTR "lX"
+#define PRIxEFISIZE "lX"
+#else
+#define PRIxEFIPTR "X"
+#define PRIxEFISIZE "X"
+#endif
+
 static EFI_PHYSICAL_ADDRESS heap_start;
 static UINTN heap_size = 8 * 1024 * 1024;
 static EFI_EVENT delay_ev = 0;
@@ -75,10 +83,10 @@ efi_main(EFI_HANDLE imageHandle, EFI_SYS
 		efi_bootdp = NULL;
 
 #ifdef EFIBOOT_DEBUG
-	Print(L"Loaded image      : 0x%lX\n", efi_li);
-	Print(L"FilePath          : 0x%lX\n", efi_li->FilePath);
-	Print(L"ImageBase         : 0x%lX\n", efi_li->ImageBase);
-	Print(L"ImageSize         : 0x%lX\n", efi_li->ImageSize);
+	Print(L"Loaded image      : 0x%" PRIxEFIPTR "\n", efi_li);
+	Print(L"FilePath          : 0x%" PRIxEFIPTR "\n", efi_li->FilePath);
+	Print(L"ImageBase         : 0x%" PRIxEFIPTR "\n", efi_li->ImageBase);
+	Print(L"ImageSize         : 0x%" PRIxEFISIZE "\n", efi_li->ImageSize);
 	Print(L"Image file        : %s\n", DevicePathToStr(efi_li->FilePath));
 #endif