summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/conf/include
diff options
context:
space:
mode:
authorAnton Gerasimov <anton@advancedtelematic.com>2017-04-11 16:49:11 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-04-23 19:12:00 +0000
commit521815fa95dba3d47704b62b4b6911fc994ad4c8 (patch)
tree3a58f617c7851c9c1af73351f8383feae5b193f7 /meta-agl-bsp/conf/include
parent2058488e70e63f9ce064273043aa627d786b58d7 (diff)
Switch to meta-updater
Replace SOTA-related sections with includes, moved u-boot-ota common to minnowboard and qemu to meta-agl-bsp Change-Id: I531f0eec07bab01610a225afc6d32a2f3a8156ad Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9095 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-bsp/conf/include')
-rw-r--r--meta-agl-bsp/conf/include/agl_intel-corei7-64.inc5
-rw-r--r--meta-agl-bsp/conf/include/agl_porter-nogfx.inc9
-rw-r--r--meta-agl-bsp/conf/include/agl_porter.inc9
-rw-r--r--meta-agl-bsp/conf/include/agl_qemux86-64.inc7
-rw-r--r--meta-agl-bsp/conf/include/agl_raspberrypi2.inc17
-rw-r--r--meta-agl-bsp/conf/include/agl_raspberrypi3.inc17
6 files changed, 8 insertions, 56 deletions
diff --git a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
index 1de73a208..228774b9e 100644
--- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
+++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
@@ -24,7 +24,4 @@ IMAGE_INSTALL_append = " \
va-intel \
gstreamer-vaapi-1.0 "
-OSTREE_BOOTLOADER ?= "u-boot"
-PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot-ota"
-UBOOT_MACHINE_sota ?= "minnowmax_defconfig"
-
+include conf/include/local/sota_minnowboard.inc
diff --git a/meta-agl-bsp/conf/include/agl_porter-nogfx.inc b/meta-agl-bsp/conf/include/agl_porter-nogfx.inc
index 2a06bbec6..f6372081a 100644
--- a/meta-agl-bsp/conf/include/agl_porter-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_porter-nogfx.inc
@@ -19,11 +19,4 @@ UBOOT_MACHINE = "porter_vin_config"
PREFERRED_PROVIDER_virtual/libgles2 = "mesa"
PREFERRED_PROVIDER_virtual/egl = "mesa"
-# Commit united image to OSTree, not just uImage
-OSTREE_KERNEL = "uImage+dtb"
-
-EXTRA_IMAGEDEPENDS_append_sota = " porter-bootfiles"
-IMAGE_CLASSES_append_sota = " image_types_uboot "
-IMAGE_BOOT_FILES_sota = "porter-bootfiles/*"
-
-OSTREE_BOOTLOADER ?= "u-boot"
+include conf/include/local/sota_porter.inc
diff --git a/meta-agl-bsp/conf/include/agl_porter.inc b/meta-agl-bsp/conf/include/agl_porter.inc
index c562784aa..cac5be7d4 100644
--- a/meta-agl-bsp/conf/include/agl_porter.inc
+++ b/meta-agl-bsp/conf/include/agl_porter.inc
@@ -179,11 +179,4 @@ DISTRO_FEATURES_append = " h264avcenc_lib"
# ARM AAC Encode Middleware for Linux
#DISTRO_FEATURES_append = " aacenc_mdw"
-# Commit united image to OSTree, not just uImage
-OSTREE_KERNEL = "uImage+dtb"
-
-EXTRA_IMAGEDEPENDS_append_sota = " porter-bootfiles"
-IMAGE_CLASSES_append_sota = " image_types_uboot "
-IMAGE_BOOT_FILES_sota = "porter-bootfiles/*"
-
-OSTREE_BOOTLOADER ?= "u-boot"
+include conf/include/local/sota_porter.inc
diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
index d48252e92..a9d320c9d 100644
--- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc
+++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
@@ -18,9 +18,4 @@ APPEND += "console=ttyS0,115200n8"
# All boot message will be off
APPEND += "quiet"
-# U-Boot support for SOTA
-PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota"
-UBOOT_MACHINE_sota = "qemu-x86_defconfig"
-OSTREE_BOOTLOADER ?= "u-boot"
-
-OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda"
+include conf/include/local/sota_qemux86-64.inc
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
index 7250f5c22..24077f02a 100644
--- a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
@@ -23,20 +23,6 @@ PREFERRED_PROVIDER_jpeg = "jpeg"
MACHINE_FEATURES += "vc4graphics"
-### Image classes, fstypes and (S)OTA
-
-# normal image class is sdcard_image-rpi-gdp, for sota it is image_types_uboot & sdcard_image-rpi-ota
-IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'image_types_uboot sdcard_image-rpi-ota', 'sdcard_image-rpi-gdp', d)}"
-
-# normal image is rpi-sdimg, for sota it is rpi-sdimg-ota
-#IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}"
-### both rpi-sdimg and rpi-sdimg-ota broken
-IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz"
-
-KERNEL_IMAGETYPE_sota = "uImage"
-PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot"
-UBOOT_MACHINE_sota = "rpi_2_defconfig"
-
# For libomxil
#LICENSE_FLAGS_WHITELIST = "commercial"
@@ -44,4 +30,5 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware "
# Psplash causes crash on first boot on RPi
IMAGE_FEATURES_remove = "splash"
-OSTREE_BOOTLOADER ?= "u-boot"
+
+include conf/include/local/sota_raspberrypi.inc
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
index a3a84be5f..24077f02a 100644
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
@@ -23,20 +23,6 @@ PREFERRED_PROVIDER_jpeg = "jpeg"
MACHINE_FEATURES += "vc4graphics"
-### Image classes, fstypes and (S)OTA
-
-# normal image class is sdcard_image-rpi-gdp, for sota it is image_types_uboot & sdcard_image-rpi-ota
-IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'image_types_uboot sdcard_image-rpi-ota', 'sdcard_image-rpi-gdp', d)}"
-
-# normal image is rpi-sdimg, for sota it is rpi-sdimg-ota
-IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}"
-### both rpi-sdimg and rpi-sdimg-ota broken
-IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz"
-
-KERNEL_IMAGETYPE_sota = "uImage"
-PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot"
-UBOOT_MACHINE_sota = "rpi_3_32b_defconfig"
-
# For libomxil
#LICENSE_FLAGS_WHITELIST = "commercial"
@@ -44,4 +30,5 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware "
# Psplash causes crash on first boot on RPi
IMAGE_FEATURES_remove = "splash"
-OSTREE_BOOTLOADER ?= "u-boot"
+
+include conf/include/local/sota_raspberrypi.inc