Index: distrib/evbarm/instkernel/instkernel/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/evbarm/instkernel/instkernel/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- distrib/evbarm/instkernel/instkernel/Makefile	14 Dec 2017 06:29:15 -0000	1.30
+++ distrib/evbarm/instkernel/instkernel/Makefile	9 May 2019 07:43:20 -0000
@@ -12,7 +12,7 @@ SSHRAMDISK=	${SSHRAMDISKDIR}/sshramdisk.
 
 MDSETTARGETS=
 .for i in ${BUILD_KERNELS:M*_INSTALL}
-.if ${i} == "RPI_INSTALL" || ${i} == "RPI2_INSTALL"
+.if ${i} == "RPI_INSTALL"
 MDSETTARGETS+=		${i}	${SSHRAMDISK}	netbsd-${i}
 MDSET_SUFFIXES.netbsd-${i}=	bin create-bin  img create-img
 .else
Index: distrib/utils/embedded/conf/armv7.conf
===================================================================
RCS file: /cvsroot/src/distrib/utils/embedded/conf/armv7.conf,v
retrieving revision 1.33
diff -u -p -r1.33 armv7.conf
--- distrib/utils/embedded/conf/armv7.conf	13 Apr 2019 10:58:11 -0000	1.33
+++ distrib/utils/embedded/conf/armv7.conf	9 May 2019 07:43:33 -0000
@@ -11,7 +11,6 @@ resize=true
 kernels_generic="GENERIC"
 # non-FDTised / special kernels
 kernels_beagle="BEAGLEBOARD BEAGLEBONE"
-kernels_rpi="RPI2"
 
 make_label() {
 	make_label_evbarm
@@ -55,10 +54,10 @@ populate_rpi() {
 	firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
 	firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
 
-	# RPI2 kernel needs to be installed as kernel7.img
-	if [ -f "${mnt}/boot/netbsd-RPI2.img" ]; then
-		echo "${bar} renaming netbsd-RPI2.img to kernel7.img ${bar}"
-		mv "${mnt}/boot/netbsd-RPI2.img" "${mnt}/boot/kernel7.img"
+	# The GENERIC .img kernel needs to be installed as kernel7.img for RPI2
+	if [ -f "${mnt}/boot/netbsd-GENERIC.img" ]; then
+		echo "${bar} renaming netbsd-GENERIC.img to kernel7.img ${bar}"
+		mv "${mnt}/boot/netbsd-GENERIC.img" "${mnt}/boot/kernel7.img"
 
 		cat > "${mnt}/boot/cmdline.txt" << EOF
 root=ld0a console=${console}
@@ -68,6 +67,7 @@ EOF
 
 		cat > ${mnt}/boot/config.txt << EOF
 # UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
+kernel_address=0x01000040
 enable_uart=1
 force_turbo=0
 EOF
@@ -134,12 +134,12 @@ populate() {
 		test -f "${f}" && kernels="${kernels} ${f}"
 	done
 	# .img kernels
-	for k in $kernels_rpi; do
+	for k in $kernels_generic; do
 		f="${kernel}/netbsd-${k}.img.gz"
 		test -f "${f}" && kernels="${kernels} ${f}"
 	done
 	# .dtb files
-	for k in $kernels_generic $kernels_rpi $; do
+	for k in $kernels_generic $; do
 		test -d "${KERNOBJDIR}/${k}" && \
 		    dtbs="$(${MAKE} -C ${KERNOBJDIR}/${k} -v DTB)" || \
 		    dtbs=
Index: etc/etc.evbarm/Makefile.inc
===================================================================
RCS file: /cvsroot/src/etc/etc.evbarm/Makefile.inc,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile.inc
--- etc/etc.evbarm/Makefile.inc	31 Mar 2019 13:04:54 -0000	1.105
+++ etc/etc.evbarm/Makefile.inc	9 May 2019 07:43:34 -0000
@@ -108,8 +108,6 @@ EVBARM_BOARDS.armv7+=		OVERO
 EVBARM_BOARDS.armv7hf+=		OVERO
 EVBARM_BOARDS.armv7+=		PANDABOARD
 EVBARM_BOARDS.armv7hf+= 	PANDABOARD
-EVBARM_BOARDS.armv7+=		RPI2
-EVBARM_BOARDS.armv7hf+=	 	RPI2
 
 KERNEL_SETS.arm64+=		GENERIC64
 .endif