From 1b73e59ec2703605ad20ea7b42516cb382a5436a Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Tue, 25 Oct 2016 11:08:50 +0200 Subject: OSTree-enabled image for raspberry Pi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug-AGL: SPEC-254 v2 [jsmoeller]: change rpi fdt addr to 200M (fix cma), re-add inherit gobject-introspection (!) v3 [oytis]: move boot logic to editable uEnv.txt Change-Id: Ic54aadc8377ed1e2a8f2f4ab87db2a7a6660cd15 Signed-off-by: Anton Gerasimov Signed-off-by: Jan-Simon Möller --- templates/feature/agl-sota/50_local.conf.inc | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'templates/feature/agl-sota') diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc index 05cf3cf..eff85b5 100644 --- a/templates/feature/agl-sota/50_local.conf.inc +++ b/templates/feature/agl-sota/50_local.conf.inc @@ -6,13 +6,27 @@ IMAGE_INSTALL_append = " ostree" IMAGE_CLASSES += "image_types_ostree image_types_ota" IMAGE_FSTYPES += "otaimg" +IMAGE_CLASSES_append_raspberrypi = " sdcard_image-rpi-ota" +IMAGE_CLASSES_append_raspberrypi2 = " sdcard_image-rpi-ota" + +IMAGE_CLASSES_remove_raspberrypi = " sdcard_image-rpi-gdp" +IMAGE_CLASSES_remove_raspberrypi2 = " sdcard_image-rpi-gdp" + +IMAGE_FSTYPES += "${@'rpi-sdimg-ota' if d.getVar('MACHINE', True) in [ 'raspberrypi', 'raspberrypi2', 'raspberrypi3' ] else ''}" + +IMAGE_FSTYPES_remove_raspberrypi = "rpi-sdimg" +IMAGE_FSTYPES_remove_raspberrypi2 = "rpi-sdimg" + UBOOT_MACHINE_qemux86 = "qemu-x86_defconfig" UBOOT_MACHINE_qemux86-64 = "qemu-x86_defconfig" +UBOOT_MACHINE_raspberrypi3 = "rpi_3_32b_defconfig" + +KERNEL_IMAGETYPE_arm = "uImage" PREFERRED_PROVIDER_virtual/bootloader_qemux86 ?= "u-boot-ota" PREFERRED_PROVIDER_virtual/bootloader_qemux86-64 ?= "u-boot-ota" -PREFERRED_PROVIDER_virtual/bootloader_raspberrypi3 ?= "u-boot-ota" -PREFERRED_PROVIDER_virtual/bootloader_raspberrypi2 ?= "u-boot-ota" +PREFERRED_PROVIDER_virtual/bootloader_raspberrypi3 ?= "u-boot" +PREFERRED_PROVIDER_virtual/bootloader_raspberrypi2 ?= "u-boot" # Please redefine OSTREE_REPO in order to have a persistent OSTree repo OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" -- cgit 1.2.3-korg