3 files changed, 53 insertions, 81 deletions

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
deleted file mode 100644
index 2c58553ec5bb..000000000000
--- a/release/arm/BEAGLEBONE.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-EMBEDDED_TARGET_ARCH="armv7"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
-FAT_SIZE="50m"
-FAT_TYPE="16"
-IMAGE_SIZE="3072M"
-KERNEL="GENERIC"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-PART_SCHEME="MBR"
-export BOARDNAME="BEAGLEBONE"
-
-arm_install_uboot() {
-	UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"
-	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
-	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
-	chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO
-	chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
-	sync
-	umount_loop ${CHROOTDIR}/${FATMOUNT}
-	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-
-	return 0
-}
diff --git a/release/arm/GENERICSD.conf b/release/arm/GENERICSD.conf
index 17086ba59185..8749f5fd95cf 100644
--- a/release/arm/GENERICSD.conf
+++ b/release/arm/GENERICSD.conf
@@ -6,11 +6,64 @@
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDED_TARGET="arm"
 EMBEDDEDBUILD=1
+EMBEDDEDPORTS="sysutils/u-boot-beaglebone sysutils/u-boot-rpi2 sysutils/rpi-firmware"
 FAT_SIZE="50m -b 1m"
 FAT_TYPE="16"
 IMAGE_SIZE="3072M"
 KERNEL="GENERIC"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+BBB_UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"
+RPI_UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
+RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
+RPI_OL_DIR="${RPI_FIRMWARE_DIR}/overlays"
+OVERLAYS="mmc.dtbo"
 PART_SCHEME="MBR"
 export BOARDNAME="GENERICSD"
+
+arm_install_uboot_rpi2() {
+	UBOOT_FILES="u-boot.bin"
+	RPI_FIRMWARE_FILES="bootcode.bin config.txt \
+		fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \
+		start.elf start_cd.elf start_db.elf start_x.elf \
+		bcm2709-rpi-2-b.dtb"
+	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	for _UF in ${UBOOT_FILES}; do
+		chroot ${CHROOTDIR} cp -p ${RPI_UBOOT_DIR}/${_UF} \
+			${FATMOUNT}/${_UF}
+	done
+	for _UF in ${RPI_FIRMWARE_FILES}; do
+		chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \
+			${FATMOUNT}/${_UF}
+	done
+	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
+	for _OL in ${OVERLAYS}; do
+		chroot ${CHROOTDIR} cp -p ${RPI_OL_DIR}/${_OL} \
+			${FATMOUNT}/overlays/${_OL}
+	done
+	sync
+	umount_loop ${CHROOTDIR}/${FATMOUNT}
+	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+	
+	return 0
+}
+
+arm_install_uboot_bbb() {
+	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	chroot ${CHROOTDIR} cp -p ${BBB_UBOOT_DIR}/MLO ${FATMOUNT}/MLO
+	chroot ${CHROOTDIR} cp -p ${BBB_UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
+	sync
+	umount_loop ${CHROOTDIR}/${FATMOUNT}
+	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
+
+	return 0
+}
+
+arm_install_uboot() {
+	arm_install_uboot_bbb
+	arm_install_uboot_rpi2
+}
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
deleted file mode 100644
index f46c652e2dc3..000000000000
--- a/release/arm/RPI2.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-EMBEDDED_TARGET_ARCH="armv7"
-EMBEDDED_TARGET="arm"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-rpi2 sysutils/rpi-firmware"
-FAT_SIZE="50m"
-FAT_TYPE="16"
-IMAGE_SIZE="3072M"
-KERNEL="GENERIC"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
-RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
-OL_DIR="${RPI_FIRMWARE_DIR}/overlays"
-OVERLAYS="mmc.dtbo"
-PART_SCHEME="MBR"
-export BOARDNAME="RPI2"
-
-arm_install_uboot() {
-	UBOOT_FILES="u-boot.bin"
-	RPI_FIRMWARE_FILES="bootcode.bin config.txt \
-		fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \
-		start.elf start_cd.elf start_db.elf start_x.elf \
-		bcm2709-rpi-2-b.dtb"
-	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
-	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
-	for _UF in ${UBOOT_FILES}; do
-		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
-			${FATMOUNT}/${_UF}
-	done
-	for _UF in ${RPI_FIRMWARE_FILES}; do
-		chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \
-			${FATMOUNT}/${_UF}
-	done
-	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
-	for _OL in ${OVERLAYS}; do
-		chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \
-			${FATMOUNT}/overlays/${_OL}
-	done
-	sync
-	umount_loop ${CHROOTDIR}/${FATMOUNT}
-	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-	
-	return 0
-}