cleanup: merge firmware-rpi3 and boot-rpi3 packages

Make boot-rpi a sub package of firmware-rpi3.

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>

pkg/boot-rpi3/build

@@ -1,16 +0,0 @@
-# inherit package details from kernel package
-source "$SCRIPTDIR/pkg/firmware-rpi3/build"
-DEPENDS="toolchain"
-
-build() {
-	return
-}
-
-deploy() {
-	local SOURCE="$1"
-
-	cp -r ${SOURCE}/boot/* "$PKGDEPLOYDIR/"
-
-	cp "$SCRIPTDIR/pkg/boot-rpi3/config.txt" "$PKGDEPLOYDIR/config.txt"
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
-}

pkg/firmware-rpi3/build

@@ -4,6 +4,7 @@ TARBALL="${VERSION}.tar.gz"
 URL="https://github.com/raspberrypi/firmware/archive"
 SHA256SUM="6b6db5f15c400bc1224266fd44238dd9b2479fd09f8a55e36ccdac2120632f8f"
 DEPENDS="toolchain"
+SUBPKG="boot-rpi3 firmware-rpi3 firmware-rpi3-dev"
 
 prepare() {
 	return
@@ -17,6 +18,8 @@ deploy() {
 	local SOURCE="$1"
 
 	cp -r "$SOURCE/hardfp/opt" "$PKGDEPLOYDIR"
+	cp -r ${SOURCE}/boot/* "$PKGDEPLOYDIR/"
+	cp "$SCRIPTDIR/pkg/$PKGNAME/config.txt" "$PKGDEPLOYDIR/config.txt"
 	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 
 	strip_files ${PKGDEPLOYDIR}/opt/vc/bin/*