summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hao <kexin.hao@windriver.com>2018-08-14 09:31:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-15 09:49:02 +0100
commit800fc3ea87add6a7205ecfa3b088701ed635082f (patch)
treeee0153e5cf90269343546568e58d9c357061783c
parent1b46e2c1acd2c0cd557740220bbc3ccb77dae127 (diff)
downloadopenembedded-core-contrib-800fc3ea87add6a7205ecfa3b088701ed635082f.tar.gz
openembedded-core-contrib-800fc3ea87add6a7205ecfa3b088701ed635082f.tar.bz2
openembedded-core-contrib-800fc3ea87add6a7205ecfa3b088701ed635082f.zip
meta-yocto-bsp: beaglebone: Add the u-boot boot config file for the wic image
Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto-bsp/conf/machine/beaglebone-yocto.conf2
-rw-r--r--meta-yocto-bsp/wic/beaglebone-yocto.wks2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
index ae682a47d3..faa4f1bd36 100644
--- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
+++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
@@ -37,4 +37,4 @@ UBOOT_LOADADDRESS = "0x80008000"
MACHINE_FEATURES = "usbgadget usbhost vfat alsa"
-IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} MLO"
+IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} MLO zImage am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
diff --git a/meta-yocto-bsp/wic/beaglebone-yocto.wks b/meta-yocto-bsp/wic/beaglebone-yocto.wks
index 967cad78b8..0b5d793b73 100644
--- a/meta-yocto-bsp/wic/beaglebone-yocto.wks
+++ b/meta-yocto-bsp/wic/beaglebone-yocto.wks
@@ -2,5 +2,5 @@
# long-description: Creates a partitioned SD card image for Beaglebone.
# Boot files are located in the first vfat partition.
-part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4 --size 16
+part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4 --size 16 --sourceparams="loader=u-boot"
part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4