From cc91e6bfaac42d63938b67a3efa4526dd9d8a063 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 18 Oct 2018 02:15:58 +0000 Subject: beaglebone.conf: Package kernel and devicetree 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 Signed-off-by: Denys Dmytriyenko --- conf/machine/beaglebone.conf | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'conf') 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" -- cgit v1.2.3-54-g00ecf