Index: etc/etc.evbarm/Makefile.inc
===================================================================
RCS file: /home/netbsd/src/etc/etc.evbarm/Makefile.inc,v
retrieving revision 1.121
diff -p -u -r1.121 Makefile.inc
--- etc/etc.evbarm/Makefile.inc	2 Oct 2020 17:27:12 -0000	1.121
+++ etc/etc.evbarm/Makefile.inc	5 Nov 2020 11:30:58 -0000
@@ -25,6 +25,9 @@ KERNEL_SETS.armv4+=		IXM1200
 EVBARM_BOARDS.xscale+=		ADI_BRH
 KERNEL_SETS.xscale+=		NSLU2
 
+EVBARM_BOARDS.armv6+=		RPI
+EVBARM_BOARDS.armv6hf+=	 	RPI
+
 KERNEL_SETS.armv7+=		GENERIC
 KERNEL_SETS.armv7hf+=		GENERIC
 .else
Index: distrib/utils/embedded/conf/rpi.conf
===================================================================
RCS file: /home/netbsd/src/distrib/utils/embedded/conf/rpi.conf,v
retrieving revision 1.38
diff -p -u -r1.38 rpi.conf
--- distrib/utils/embedded/conf/rpi.conf	27 May 2020 11:02:52 -0000	1.38
+++ distrib/utils/embedded/conf/rpi.conf	5 Nov 2020 11:49:35 -0000
@@ -5,7 +5,6 @@
 board=rpi
 kerneldir=$src/sys/arch/evbarm/compile/RPI/
 kernel=$kerneldir/netbsd-RPI.bin
-kernels_rpi="RPI RPI2"
 resize=true
 
 . ${DIR}/conf/evbarm.conf
@@ -47,8 +46,6 @@ EOF
 }
 
 populate() {
-	rpi2_kernel="$(echo $kernel | sed -e 's/RPI/RPI2/g')"
-
 	cat > ${mnt}/boot/cmdline.txt << EOF
 root=ld0a console=fb
 #fb=1280x1024		# to select a mode, otherwise try EDID
@@ -94,30 +91,19 @@ EOF
 		;;
 	esac || fail "copy of ${kernel} to ${mnt}/boot/kernel.img failed"
 
-	echo "${bar} installing RPI2 kernel ${bar}"
-	case ${rpi2_kernel} in
-	*.gz)
-		gzip -dc ${rpi2_kernel} > ${mnt}/boot/kernel7.img
-		;;
-	*)
-		cp ${rpi2_kernel} ${mnt}/boot/kernel7.img
-		;;
-	esac || fail "Copy of ${rpi2_kernel} to ${mnt}/boot/kernel7.img failed"
-
-	echo "${bar} installing kernel files ${bar}"
-	# install kernels to /boot partition
-	for k in ${kernels}; do
-		tgt="$(basename ${k} | sed 's/\.gz$//')"
-		echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
-		case "${k}" in
+	if [ "${MACHINE_ARCH}" != "earmv6hfeb" ]; then
+		rpi2_kernel="$(echo $kernel | sed -e 's/RPI/RPI2/g')"
+		echo "${bar} installing RPI2 kernel ${bar}"
+		case ${rpi2_kernel} in
 		*.gz)
-			${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
+			gzip -dc ${rpi2_kernel} > ${mnt}/boot/kernel7.img
 			;;
 		*)
-			cp "${k}" "${mnt}/boot/${tgt}"
+			cp ${rpi2_kernel} ${mnt}/boot/kernel7.img
 			;;
-		esac
-	done
+		esac || \
+		fail "Copy of ${rpi2_kernel} to ${mnt}/boot/kernel7.img failed"
+	fi
 
 	echo "${bar} installing firmware files ${bar}"
 	(cd ${mnt}/boot &&
Index: distrib/utils/embedded/conf/rpi_inst.conf
===================================================================
RCS file: /home/netbsd/src/distrib/utils/embedded/conf/rpi_inst.conf,v
retrieving revision 1.16
diff -p -u -r1.16 rpi_inst.conf
--- distrib/utils/embedded/conf/rpi_inst.conf	18 May 2020 21:19:34 -0000	1.16
+++ distrib/utils/embedded/conf/rpi_inst.conf	5 Nov 2020 10:10:13 -0000
@@ -12,8 +12,8 @@ image=$HOME/${board}.img
 
 swap=8
 extra=8		# spare space
-boot=112
 init=8
+boot=$(( 192 - ${init} ))
 
 size=$(( 10485760 + ${swap} * 1024 * 512 + ${boot} * 1024 * 512 + ${init} * 1024 * 512 ))
 msdosid=14