From 8807f8e2268ee5297fac4f82e24bff8ba03e43c1 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Tue, 11 Apr 2017 16:49:11 +0200 Subject: 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: I0629a63154ff90bd712f621297b886505a2f462c Signed-off-by: Anton Gerasimov Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9189 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- meta-agl-bsp/conf/include/agl_raspberrypi3.inc | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'meta-agl-bsp/conf/include/agl_raspberrypi3.inc') diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc index a3a84be5f..da4a02a5e 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc @@ -11,7 +11,6 @@ CORE_IMAGE_EXTRA_INSTALL += "wayland weston" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb" -KERNEL_IMAGETYPE_sota = "uImage" PREFERRED_VERSION_linux-raspberrypi = "4.4.%" PREFERRED_VERSION_mesa = "12.%" @@ -23,20 +22,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 +29,5 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware " # Psplash causes crash on first boot on RPi IMAGE_FEATURES_remove = "splash" -OSTREE_BOOTLOADER ?= "u-boot" + +require conf/include/local/sota_raspberrypi.inc -- cgit 1.2.3-korg