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_dra7xx-evm.inc | 4 ---- meta-agl-bsp/conf/include/agl_intel-corei7-64.inc | 5 +---- meta-agl-bsp/conf/include/agl_porter-nogfx.inc | 9 +-------- meta-agl-bsp/conf/include/agl_porter.inc | 9 +-------- meta-agl-bsp/conf/include/agl_qemux86-64.inc | 7 +------ meta-agl-bsp/conf/include/agl_raspberrypi2.inc | 18 ++---------------- meta-agl-bsp/conf/include/agl_raspberrypi3.inc | 18 ++---------------- 7 files changed, 8 insertions(+), 62 deletions(-) (limited to 'meta-agl-bsp/conf') diff --git a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc index 86ed8d2d6..f3abe4cc5 100644 --- a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc +++ b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc @@ -47,7 +47,3 @@ IMAGE_INSTALL_append = " \ ${PACKAGES_MULTIMEDIA} \ cmem \ " - -IMAGE_CLASSES_append_sota = " image_types_uboot sdcard_image-dra7xx-evm-ota" -IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'dra7xx-evm-sdimg-ota ', '', d)}" -OSTREE_BOOTLOADER ?= "u-boot" 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..b79b436ac 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" - +require 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..37ff7837d 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" +require 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..01ee3e414 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" +require 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..341e9ad74 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" +require 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..da4a02a5e 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi2.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_2_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 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