aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-10-10 11:23:40 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-10-14 18:25:55 +0000
commit91dc17593927f8a325bdbcb2cb2a118263ebfaa9 (patch)
tree2cd22523036563923127c455f89a93e40cdafda1
parent747eb165a15238bc3c5e92b4a35bfe59027bd0c3 (diff)
meta-agl-bsp: Enable WIC support for Raspberry Pi 2/3
In order to have WIC images be fully functional for both u-boot and non-u-boot we need to bring in more logic in determining what files will get mapped to what location. This is not found in meta-raspberrypi/pyro but is found in their master branch. These changes bring us in sync with meta-raspberrypi/conf/machine/include/rpi-base.inc as of their revision c26e9d3df54293a88fba047a29b335f52b01120e for Pi 2 and Pi 3. We do not attempt to bring in the additional logic they have to handle Pi 3-64 and U-Boot at this time as that is more invasive and not required for our use cases. Bug-AGL: SPEC-409 Change-Id: I642735a9be3daad96c0c1376cd6341b0697ffc09 Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11207 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl-bsp/conf/include/agl_raspberrypi2.inc18
-rw-r--r--meta-agl-bsp/conf/include/agl_raspberrypi3.inc18
2 files changed, 26 insertions, 10 deletions
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
index 111893b32..a474652e1 100644
--- a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
@@ -32,8 +32,16 @@ IMAGE_FEATURES_remove = "splash"
# Build updatable image. Only takes effect when sota.bbclass is inherited
DISTRO_FEATURES_append = " sota"
-# Add the custom rpi-sdimg output format
-AGL_EXTRA_IMAGE_FSTYPES = " rpi-sdimg.xz"
-
-# Use the AGL default ext4.xz to generate the rpi-sdimg
-SDIMG_ROOTFS_TYPE = "ext4.xz"
+# Create WIC images to write to SD cards.
+WKS_FILE = "sdimage-raspberrypi.wks"
+AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
+IMAGE_BOOT_FILES = "bcm2835-bootfiles/* \
+ ${@make_dtb_boot_files(d)} \
+ ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', \
+ '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \
+ '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \
+ "
+do_image_wic[depends] += " \
+ bcm2835-bootfiles:do_deploy \
+ ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'u-boot:do_deploy', '',d)} \
+ "
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
index 54ccdd573..599de5d76 100644
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
@@ -25,8 +25,16 @@ IMAGE_FEATURES_remove = "splash"
# Build updatable image. Only takes effect when sota.bbclass is inherited
DISTRO_FEATURES_append = " sota"
-# Add the custom rpi-sdimg output format
-AGL_EXTRA_IMAGE_FSTYPES = " rpi-sdimg.xz"
-
-# Use the AGL default ext4.xz to generate the rpi-sdimg
-SDIMG_ROOTFS_TYPE = "ext4.xz"
+# Create WIC images to write to SD cards.
+WKS_FILE = "sdimage-raspberrypi.wks"
+AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
+IMAGE_BOOT_FILES = "bcm2835-bootfiles/* \
+ ${@make_dtb_boot_files(d)} \
+ ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', \
+ '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \
+ '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \
+ "
+do_image_wic[depends] += " \
+ bcm2835-bootfiles:do_deploy \
+ ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'u-boot:do_deploy', '',d)} \
+ "