diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2016-09-01 16:01:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.200> | 2016-09-01 16:01:24 +0000 |
| commit | 7fa21fc6131f0af27185077091a3a8f1de73d625 (patch) | |
| tree | a6cf04a26692daac22dee40cb44d1eea9842afeb | |
| parent | 86692ea51c6f3f4c0e4d63bf4db3ef76fb0221bd (diff) | |
| parent | 137845ad1a64c93d8bead1e8f1448d56e7bfee07 (diff) | |
Merge "Force u-boot (or another virtual/bootloader if overriden by user) to build with otaimg"
| -rw-r--r-- | meta-sota/classes/image_types_ota.bbclass | 1 | ||||
| -rw-r--r-- | templates/feature/agl-sota/50_local.conf.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta-sota/classes/image_types_ota.bbclass b/meta-sota/classes/image_types_ota.bbclass index 9820724..cc526b6 100644 --- a/meta-sota/classes/image_types_ota.bbclass +++ b/meta-sota/classes/image_types_ota.bbclass @@ -12,6 +12,7 @@ export BOOTFS_EXTRA_SIZE do_otaimg[depends] += "e2fsprogs-native:do_populate_sysroot \ parted-native:do_populate_sysroot \ virtual/kernel:do_deploy \ + virtual/bootloader:do_deploy \ ${INITRD_IMAGE}:do_rootfs \ ${PN}:do_rootfs" diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc index a27d7af..d2bab53 100644 --- a/templates/feature/agl-sota/50_local.conf.inc +++ b/templates/feature/agl-sota/50_local.conf.inc @@ -5,7 +5,7 @@ IMAGE_CLASSES += "image_types_ota" IMAGE_FSTYPES += "otaimg" UBOOT_MACHINE_qemux86 = "qemu-x86_defconfig" -UBOOT_MACHINE_qemux86_64 = "qemu-x86_defconfig" +UBOOT_MACHINE_qemux86-64 = "qemu-x86_defconfig" PREFERRED_PROVIDER_virtual/bootloader_qemux86 ?= "u-boot-ota" PREFERRED_PROVIDER_virtual/bootloader_qemux86-64 ?= "u-boot-ota" |