diff --git a/sys/arch/hpcsh/conf/GENERIC b/sys/arch/hpcsh/conf/GENERIC
index 5d0ef8aafc9e..73752092b24f 100644
--- a/sys/arch/hpcsh/conf/GENERIC
+++ b/sys/arch/hpcsh/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.17 2002/02/01 17:52:55 uch Exp $
+# $NetBSD: GENERIC,v 1.18 2002/02/11 17:18:35 uch Exp $
 #
 # GENERIC machine description file
 # 
@@ -44,7 +44,7 @@ options 	RTC_OFFSET=-540 # hardware clock is this many mins. west of GMT
 
 #options 	SCSIVERBOSE	# human readable SCSI error messages
 #options 	PCMCIAVERBOSE	# verbose PCMCIA configuration messages
-#options	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
+options		PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
 
 # Executable format options
 options 	EXEC_COFF	# 32-bit COFF executables
@@ -113,6 +113,10 @@ hd64461if0 at shb0 irq 4
 hd64461pcmcia*	at hd64461if0
 hd64461video*	at hd64461if0
 
+#
+# HITACHI PERSONA (HPW-50PAD, HPQ-650PA)
+#
+com*		at hd64461if?
 #
 # machine independent part
 #
diff --git a/sys/arch/hpcsh/conf/JORNADA690 b/sys/arch/hpcsh/conf/JORNADA690
index bfa257e9bbe6..6d748cd71744 100644
--- a/sys/arch/hpcsh/conf/JORNADA690
+++ b/sys/arch/hpcsh/conf/JORNADA690
@@ -1,4 +1,4 @@
-#	$NetBSD: JORNADA690,v 1.13 2002/01/27 13:23:17 jdolecek Exp $
+#	$NetBSD: JORNADA690,v 1.14 2002/02/11 17:18:35 uch Exp $
 #
 #	JORNADA690 uch's Jornada 690
 #
@@ -7,6 +7,8 @@ include "arch/hpcsh/conf/std.hpcsh"
 
 maxusers	32			# estimated number of users
 
+options 	KLOADER_KERNEL_PATH="\"/netbsd\""
+
 options 	SH7709A			# 133MHz
 options 	SH7709A_BROKEN_IPR
 options 	PCLOCK=22000000		# 22MHz
@@ -16,7 +18,10 @@ options 	DIAGNOSTIC		# extra kernel debugging checks
 options 	DEBUG			# extra kernel debugging support
 options 	KTRACE			# system call tracing support
 options 	MSGBUFSIZE=65534
-#options	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
+options		PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
+
+# in-kernel bootloader
+options 	KLOADER_KERNEL_PATH="\"/netbsd\""
 
 # Standard system options