Create boot.tar.gz as part of the image build

Each machine config defines what is included in the boot.tar.gz
package. For beaglebone, include the uEnv.txt u-boot script that
is used to start up the device.

Change-Id: Ia509dd61c789fda53889cea8ea9221cfa8b469a9
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

10 files changed, 146 insertions, 0 deletions

diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass
new file mode 100644
index 0000000..9218bd3
--- /dev/null
+++ b/classes/bootfs-image.bbclass
@@ -0,0 +1,51 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+BOOTFS_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}-${DATETIME}"
+BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}"
+
+BOOTFS_DEPENDS ?= ""
+
+do_bootfs () {
+        if [ -n ${BOOTFS_CONTENT} ]; then
+                exit 0
+        fi
+
+        mkdir -p ${S}/bootfs
+
+        for item in ${BOOTFS_CONTENT}; do
+                src=`echo $item | awk -F':' '{ print $1 }'`
+                dst=`echo $item | awk -F':' '{ print $2 }'`
+
+                install -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/bootfs/$dst
+        done
+
+        cd ${S}/bootfs
+        rm -f ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz
+
+        tar czvf ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz .
+        ln -s ${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz
+}
+
+addtask bootfs before do_rootfs
+
+do_bootfs[depends] += "${BOOTFS_DEPENDS}"
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 5799db7..6772a2a 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -22,6 +22,12 @@
 
 IMAGE_FSTYPES = "tar.gz"
 
+BOOTFS_CONTENT = "\
+    u-boot-${MACHINE}.img:u-boot.img \
+    MLO-${MACHINE}:MLO \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy"
+
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
 
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index 829b4fa..dab9c68 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -22,6 +22,12 @@
 
 IMAGE_FSTYPES = "tar.gz"
 
+BOOTFS_CONTENT = "\
+    u-boot-${MACHINE}.img:u-boot.img \
+    MLO-${MACHINE}:MLO \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy"
+
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
 
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index ba13aaa..376e3c6 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -17,6 +17,15 @@
 ############################################################################
 IMAGE_FSTYPES = "tar.gz"
 
+BOOTFS_CONTENT = "\
+    u-boot-${MACHINE}.img:u-boot.img \
+    MLO-${MACHINE}:MLO \
+    uEnv-${MACHINE}.txt:uEnv.txt \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-uenv-script:do_deploy"
+
+EXTRA_IMAGEDEPENDS += "u-boot-uenv-script"
+
 PREFERRED_VERSION_libgles-omap3 = "5.01.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "5.01.00.01"
 
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
index d83f6b4..a7099a5 100644
--- a/conf/distro/include/imx53qsb.conf
+++ b/conf/distro/include/imx53qsb.conf
@@ -22,6 +22,12 @@
 
 IMAGE_FSTYPES = "tar.gz"
 
+BOOTFS_CONTENT = "\
+    u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy"
+
 MACHINE_EXTRA_INSTALL = "\
         amd-gpu-bin-mx51 \
         "
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 5f6df70..2a64026 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -22,6 +22,15 @@
 
 IMAGE_FSTYPES = "tar.gz"
 
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    6x_bootscript-${MACHINE}:6x_bootscript \
+    6x_upgrade-${MACHINE}:6x_upgrade \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy"
+
+EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
+
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index 12f1033..61cebb4 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -22,6 +22,12 @@
 
 IMAGE_FSTYPES = "tar.gz"
 
+BOOTFS_CONTENT = "\
+    bcm2835-bootfiles/*: \
+    ${KERNEL_IMAGETYPE}:kernel.img \
+    "
+BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
+
 PREFERRED_PROVIDER_virtual/libgles1 = "userland"
 
 MACHINE_EXTRA_INSTALL = "\
diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb
index 4b492cd..8daffbd 100644
--- a/recipes/images/b2qt-embedded-image.bb
+++ b/recipes/images/b2qt-embedded-image.bb
@@ -33,6 +33,7 @@ IMAGE_FEATURES += "\
         "
 
 inherit core-image
+inherit bootfs-image
 
 IMAGE_INSTALL += "\
     packagegroup-b2qt-embedded-base \
diff --git a/recipes/u-boot/u-boot-uenv-script.bb b/recipes/u-boot/u-boot-uenv-script.bb
new file mode 100644
index 0000000..b15dd1f
--- /dev/null
+++ b/recipes/u-boot/u-boot-uenv-script.bb
@@ -0,0 +1,49 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "U-Boot script to start up BeagleBone Black"
+LICENSE = "CLOSED"
+PR = "r0"
+
+COMPATIBLE_MACHINE = "(beaglebone)"
+PV = "20140225"
+
+SRC_URI = "file://uEnv.txt"
+
+inherit deploy
+
+do_deploy () {
+    install -d ${DEPLOYDIR}
+    install ${WORKDIR}/uEnv.txt ${DEPLOYDIR}/uEnv-${MACHINE}-${PV}-${PR}.txt
+
+    cd ${DEPLOYDIR}
+    rm -f uEnv-${MACHINE}.txt
+    ln -sf uEnv-${MACHINE}-${PV}-${PR}.txt uEnv-${MACHINE}.txt
+}
+
+addtask deploy after do_install before do_build
+
+do_compile[noexec] = "1"
+do_install[noexec] = "1"
+do_populate_sysroot[noexec] = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes/u-boot/u-boot-uenv-script/uEnv.txt b/recipes/u-boot/u-boot-uenv-script/uEnv.txt
new file mode 100644
index 0000000..f8385a4
--- /dev/null
+++ b/recipes/u-boot/u-boot-uenv-script/uEnv.txt
@@ -0,0 +1,3 @@
+bootfile=zImage
+optargs=consoleblank=0 vt.global_cursor_default=0
+mmcboot=echo Booting from mmc ...; run mmcargs; bootz ${kloadaddr} - ${fdtaddr}