From: Denys Dmytriyenko <denys@ti.com>
To: <meta-ti@yoctoproject.org>
Date: Wed, 17 Oct 2018 20:15:58 +0000
Message-ID: <20181017201558.8551-3-denys@ti.com>
In-Reply-To: <20181017201558.8551-1-denys@ti.com>
References: <20181017201558.8551-1-denys@ti.com>
MIME-Version: 1.0
Subject: [PATCH 3/3] beaglebone.conf: Package kernel and devicetree
Precedence: list
Content-Type: text/plain

From: Khem Raj <raj.khem@gmail.com>

Use variables from u-boot recipe, makes it easy to switch between TI staging
and mainline u-boot from oe-core if someone wants to.

Use SPL_BINARY and UBOOT_SUFFIX to define IMAGE_BOOT_FILES

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 conf/machine/beaglebone.conf | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
index 9aeb2992..5e7348a4 100644
--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: BeagleBone machine
-#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board 
+#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
 
 require conf/machine/include/ti33x.inc
 
@@ -16,11 +16,17 @@ SERIAL_CONSOLES = "115200;ttyS0"
 # fall back on generic am335x_evm_config for now
 #UBOOT_MACHINE = "am335x_boneblack_config"
 
+SPL_BINARY = "MLO"
+UBOOT_SUFFIX = "img"
+
 WKS_FILE = "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES = "MLO u-boot.img"
-IMAGE_FSTYPES += "tar.xz wic.xz"
 
 do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY}"
+
+IMAGE_FSTYPES += "tar.xz wic.xz"
+
+IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
 
 # Refine the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_BOARDS = "bbbAM335x"
-- 
2.17.1