diff --git a/releasetools/arm_sdimage_rpi.sh b/releasetools/arm_sdimage_rpi.sh
index 13616ce5e..f818104fc 100755
--- a/releasetools/arm_sdimage_rpi.sh
+++ b/releasetools/arm_sdimage_rpi.sh
@@ -84,30 +84,11 @@ do
 done
 ${CROSS_PREFIX}objcopy ${OBJ}/minix/kernel/kernel -O binary ${ROOT_DIR}/kernel.bin
 # create packer
-${CROSS_PREFIX}as ${RELEASETOOLSDIR}/rpi-bootloader/bootloader2.S -o ${RELEASETOOLSDIR}/rpi-bootloader/bootloader2.o
-${CROSS_PREFIX}as ${RELEASETOOLSDIR}/rpi-bootloader/bootloader3.S -o ${RELEASETOOLSDIR}/rpi-bootloader/bootloader3.o
-${CROSS_PREFIX}ld ${RELEASETOOLSDIR}/rpi-bootloader/bootloader2.o -o ${RELEASETOOLSDIR}/rpi-bootloader/bootloader2.elf -Ttext=0x8000 2> /dev/null
-${CROSS_PREFIX}ld ${RELEASETOOLSDIR}/rpi-bootloader/bootloader3.o -o ${RELEASETOOLSDIR}/rpi-bootloader/bootloader3.elf -Ttext=0x8000 2> /dev/null
-${CROSS_PREFIX}objcopy -O binary ${RELEASETOOLSDIR}/rpi-bootloader/bootloader2.elf ${ROOT_DIR}/minix_rpi2.bin
-${CROSS_PREFIX}objcopy -O binary ${RELEASETOOLSDIR}/rpi-bootloader/bootloader3.elf ${ROOT_DIR}/minix_rpi3.bin
+${CROSS_PREFIX}as ${RELEASETOOLSDIR}/rpi-bootloader/bootloader.S -o ${RELEASETOOLSDIR}/rpi-bootloader/bootloader.o
+${CROSS_PREFIX}ld ${RELEASETOOLSDIR}/rpi-bootloader/bootloader.o -o ${RELEASETOOLSDIR}/rpi-bootloader/bootloader.elf -Ttext=0x8000 2> /dev/null
+${CROSS_PREFIX}objcopy -O binary ${RELEASETOOLSDIR}/rpi-bootloader/bootloader.elf ${ROOT_DIR}/minix_rpi.bin
 # pack modules
-(cd ${ROOT_DIR} && cat <<EOF | cpio -o --format=newc >> ${ROOT_DIR}/minix_rpi2.bin 2>/dev/null
-kernel.bin
-mod01_ds.elf
-mod02_rs.elf
-mod03_pm.elf
-mod04_sched.elf
-mod05_vfs.elf
-mod06_memory.elf
-mod07_tty.elf
-mod08_mib.elf
-mod09_vm.elf
-mod10_pfs.elf
-mod11_mfs.elf
-mod12_init.elf
-EOF
-)
-(cd ${ROOT_DIR} && cat <<EOF | cpio -o --format=newc >> ${ROOT_DIR}/minix_rpi3.bin 2>/dev/null
+(cd ${ROOT_DIR} && cat <<EOF | cpio -o --format=newc >> ${ROOT_DIR}/minix_rpi.bin 2>/dev/null
 kernel.bin
 mod01_ds.elf
 mod02_rs.elf
@@ -128,12 +109,12 @@ cp -r releasetools/rpi-firmware/* ${ROOT_DIR}
 # Write GPU config file
 cat <<EOF >${ROOT_DIR}/config.txt
 [pi3]
-kernel=minix_rpi3.bin
+kernel=minix_rpi.bin
 enable_uart=1
 dtoverlay=pi3-disable-bt
 
 [pi2]
-kernel=minix_rpi2.bin
+kernel=minix_rpi.bin
 EOF
 
 ${CROSS_TOOLS}/nbmakefs -t msdos -s $FAT_SIZE -O $FAT_START -o "F=32,c=1" ${IMG} ${ROOT_DIR} >/dev/null
@@ -148,4 +129,4 @@ echo ""
 echo "Disk image at `pwd`/${IMG}"
 echo ""
 echo "To boot this image on kvm:"
-echo "qemu-system-arm -M raspi2 -drive if=sd,cache=writeback,format=raw,file=$(pwd)/${IMG} -bios ${ROOT_DIR}/minix_rpi2.bin"
+echo "qemu-system-arm -M raspi2 -drive if=sd,cache=writeback,format=raw,file=$(pwd)/${IMG} -bios ${ROOT_DIR}/minix_rpi.bin"
diff --git a/releasetools/rpi-bootloader/bootloader2.S b/releasetools/rpi-bootloader/bootloader.S
similarity index 71%
rename from releasetools/rpi-bootloader/bootloader2.S
rename to releasetools/rpi-bootloader/bootloader.S
index 367ecff3d..10812bebd 100644
--- a/releasetools/rpi-bootloader/bootloader2.S
+++ b/releasetools/rpi-bootloader/bootloader.S
@@ -5,13 +5,12 @@
 .align 4
 argv:
 	.word	argv0
-	.word	argv1
-	.word	0x0
+	.word   argv1
+        .word	0x0
 argv0:
 	.asciz "0x00200000"
 argv1:
-	.asciz "board_name=RPI_2_B console=tty00"
-
+        .asciz ""
 .data
 .align 4
 	.space 256
diff --git a/releasetools/rpi-bootloader/bootloader3.S b/releasetools/rpi-bootloader/bootloader3.S
deleted file mode 100644
index 1b3ae2cab..000000000
--- a/releasetools/rpi-bootloader/bootloader3.S
+++ /dev/null
@@ -1,18 +0,0 @@
-.text
-
-.include "releasetools/rpi-bootloader/bootloader_common.S"
-
-.align 4
-argv:
-	.word	argv0
-	.word	argv1
-	.word	0x0
-argv0:
-	.asciz "0x00200000"
-argv1:
-	.asciz "board_name=RPI_3_B console=tty00"
-
-.data
-.align 4
-	.space 256
-stack_top: