summaryrefslogtreecommitdiffstats
path: root/meta-sota/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2016-08-29 12:38:14 +0000
committerGerrit Code Review <gerrit@172.30.200.200>2016-08-29 12:38:14 +0000
commitdf72ee883ec73cab47cfaa23e0f2feff9f1d2862 (patch)
treee2b596c332c78370d746ba6d29c3d405f53bb0d0 /meta-sota/recipes-bsp/u-boot
parent208d0258a615f5eccfcaa573d4c42bd64168381a (diff)
parent69d6b7adc9aef8d39ca66ef8688ac968876ae040 (diff)
Merge "Replaced functionality in qemux86-ota machine with algsetup.sh feature. otaimg is now a live image."
Diffstat (limited to 'meta-sota/recipes-bsp/u-boot')
-rw-r--r--meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch (renamed from meta-sota/recipes-bsp/u-boot/u-boot-buildrom/0001-Set-up-environment-for-OSTree-integration.patch)0
-rw-r--r--meta-sota/recipes-bsp/u-boot/u-boot-ota_2016.07.bb (renamed from meta-sota/recipes-bsp/u-boot/u-boot-buildrom_2016.07.bb)9
2 files changed, 6 insertions, 3 deletions
diff --git a/meta-sota/recipes-bsp/u-boot/u-boot-buildrom/0001-Set-up-environment-for-OSTree-integration.patch b/meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
index c33d40c..c33d40c 100644
--- a/meta-sota/recipes-bsp/u-boot/u-boot-buildrom/0001-Set-up-environment-for-OSTree-integration.patch
+++ b/meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
diff --git a/meta-sota/recipes-bsp/u-boot/u-boot-buildrom_2016.07.bb b/meta-sota/recipes-bsp/u-boot/u-boot-ota_2016.07.bb
index 7e3c67f..8f0b20a 100644
--- a/meta-sota/recipes-bsp/u-boot/u-boot-buildrom_2016.07.bb
+++ b/meta-sota/recipes-bsp/u-boot/u-boot-ota_2016.07.bb
@@ -13,7 +13,10 @@ SRC_URI += "file://0001-Set-up-environment-for-OSTree-integration.patch"
PV = "v2016.07+git${SRCPV}"
-EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline BUILD_ROM=y"
-
-UBOOT_SUFFIX = "rom"
+EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline"
+EXTRA_OEMAKE_append_qemux86 = " KCFLAGS=-fgnu89-inline BUILD_ROM=y"
+EXTRA_OEMAKE_append_qemux86-64 = " KCFLAGS=-fgnu89-inline BUILD_ROM=y"
+UBOOT_SUFFIX = "bin"
+UBOOT_SUFFIX_qemux86 = "rom"
+UBOOT_SUFFIX_qemux86-64 = "rom"