diff options
| -rw-r--r-- | templates/machine/porter/50_local.conf.inc | 3 | ||||
| -rw-r--r-- | templates/machine/qemux86-64/50_local.conf.inc | 4 | ||||
| -rw-r--r-- | templates/machine/qemux86/50_local.conf.inc | 4 | ||||
| -rw-r--r-- | templates/machine/raspberrypi2/50_local.conf.inc | 9 | ||||
| -rw-r--r-- | templates/machine/raspberrypi3/50_local.conf.inc | 9 |
5 files changed, 29 insertions, 0 deletions
diff --git a/templates/machine/porter/50_local.conf.inc b/templates/machine/porter/50_local.conf.inc index 570e41817..b50fcf7c4 100644 --- a/templates/machine/porter/50_local.conf.inc +++ b/templates/machine/porter/50_local.conf.inc @@ -184,3 +184,6 @@ DISTRO_FEATURES_append = " h264avcenc_lib" #DISTRO_FEATURES_append = " aacsdec_mdw" # ARM AAC Encode Middleware for Linux #DISTRO_FEATURES_append = " aacenc_mdw" + +# Commit united image to OSTree, not just uImage +OSTREE_KERNEL = "uImage+dtb" diff --git a/templates/machine/qemux86-64/50_local.conf.inc b/templates/machine/qemux86-64/50_local.conf.inc index f5bb53cfc..29e29b4d0 100644 --- a/templates/machine/qemux86-64/50_local.conf.inc +++ b/templates/machine/qemux86-64/50_local.conf.inc @@ -18,3 +18,7 @@ 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" diff --git a/templates/machine/qemux86/50_local.conf.inc b/templates/machine/qemux86/50_local.conf.inc index 9cdc49da9..1062a7744 100644 --- a/templates/machine/qemux86/50_local.conf.inc +++ b/templates/machine/qemux86/50_local.conf.inc @@ -18,3 +18,7 @@ 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" diff --git a/templates/machine/raspberrypi2/50_local.conf.inc b/templates/machine/raspberrypi2/50_local.conf.inc index d864964c9..827fa052c 100644 --- a/templates/machine/raspberrypi2/50_local.conf.inc +++ b/templates/machine/raspberrypi2/50_local.conf.inc @@ -7,7 +7,14 @@ CORE_IMAGE_EXTRA_INSTALL += "wayland weston" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" IMAGE_CLASSES += "sdcard_image-rpi-gdp" IMAGE_FSTYPES += "tar.bz2 ext3 rpi-sdimg" +IMAGE_CLASSES_append_sota = " sdcard_image-rpi-ota" +IMAGE_CLASSES_remove_sota = " sdcard_image-rpi-gdp" +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'rpi-sdimg-ota', '', d)}" +IMAGE_FSTYPES_remove_sota = "rpi-sdimg" +IMAGE_FSTYPES_remove_sota = "rpi-sdimg" + KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb" +KERNEL_IMAGETYPE_sota = "uImage" PREFERRED_VERSION_linux-raspberrypi = "4.4.%" PREFERRED_VERSION_mesa = "11.%" @@ -17,5 +24,7 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa" PREFERRED_PROVIDER_virtual/mesa = "mesa" PREFERRED_PROVIDER_jpeg = "jpeg" +UBOOT_MACHINE_sota = "rpi_3_32b_defconfig" +PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot" # For libomxil #LICENSE_FLAGS_WHITELIST = "commercial" diff --git a/templates/machine/raspberrypi3/50_local.conf.inc b/templates/machine/raspberrypi3/50_local.conf.inc index a308e40e7..466886938 100644 --- a/templates/machine/raspberrypi3/50_local.conf.inc +++ b/templates/machine/raspberrypi3/50_local.conf.inc @@ -7,7 +7,14 @@ CORE_IMAGE_EXTRA_INSTALL += "wayland weston" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" IMAGE_CLASSES += "sdcard_image-rpi-gdp" IMAGE_FSTYPES += "tar.bz2 ext3 rpi-sdimg" +IMAGE_CLASSES_append_sota = " sdcard_image-rpi-ota" +IMAGE_CLASSES_remove_sota = " sdcard_image-rpi-gdp" +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'rpi-sdimg-ota ', '', d)}" +IMAGE_FSTYPES_remove_sota = "rpi-sdimg" +IMAGE_FSTYPES_remove_sota = "rpi-sdimg" + KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb" +KERNEL_IMAGETYPE_sota = "uImage" PREFERRED_VERSION_linux-raspberrypi = "4.4.%" PREFERRED_VERSION_mesa = "11.%" @@ -17,5 +24,7 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa" PREFERRED_PROVIDER_virtual/mesa = "mesa" PREFERRED_PROVIDER_jpeg = "jpeg" +UBOOT_MACHINE_sota = "rpi_3_32b_defconfig" +PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot" # For libomxil #LICENSE_FLAGS_WHITELIST = "commercial" |