rpi-base.conf: add disable-bt.dtbo and miniuart-bt.dtbo overlays.

Closes #602. Signed-off-by: Orne Brocaar <info@brocaar.com>
linux-raspberrypi: bump to Linux version 4.19.93
2025-12-06 14:19:12 +00:00 · 2020-03-31 11:59:00 +01:00 · 2020-01-28 10:04:36 +00:00 · 2020-01-28 10:04:36 +00:00 · 2020-01-28 10:04:36 +00:00 · 2020-01-28 10:04:36 +00:00
177 changed files with 8253 additions and 1821 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,27 @@
 <!--
 If you are reporting a new issue, make sure that we do not have any duplicates
 already open. You can ensure this by searching the issue list for this
 repository. If there is a duplicate, please close your issue and add a comment
 to the existing issue instead.
 -->
 **Description**
 <!--
 Briefly describe the problem you are having in a few paragraphs.
 -->
 **Steps to reproduce the issue:**
 1.
 2.
 3.
 **Describe the results you received:**
 **Describe the results you expected:**
 **Additional information you deem important (e.g. issue happens only occasionally):**
 **Additional details (revisions used, host distro, etc.):**
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
 <!--
 Please make sure you've read and understood our contributing guidelines.
 For additional information on the contribution guidelines:
 https://wiki.yoctoproject.org/wiki/Contribution_Guidelines#General_Information
 If this PR fixes an issue, make sure your description includes "fixes #xxxx".
 If this PR connects to an issue, make sure your description includes "connected to #xxxx".
 Please provide the following information:
 -->
 **- What I did**
 **- How I did it**
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
 build*
 *~
 .*.swp
 *.orig
 *.rej
 *.log
 docs/_build
--- a/292
+++ b/292
@@ -1,292 +0,0 @@
 Quick links
 ===========
 Git repository web frontend:
    http://git.yoctoproject.org/cgit/cgit.cgi/meta-raspberrypi/
 Mailing list (yocto mailing list):
    yocto@yoctoproject.org
 Issues management (redmine):
    http://redmine.gherzan.ro/projects/meta-raspberrypi
 Contents:
 =========
 1. Description
 2. Yocto BSP Layer - Raspberry Pi
    2.A. Compressed deployed files
    2.B. GPU memory
    2.C. Add purchased license codecs
    2.D. Disable overscan
    2.E. Set overclocking options
    2.F. Optional - Video camera support with V4L2 drivers
    2.G. Optional - Enable offline compositing support
    2.H. Optional - Enable kgdb over console support
    2.I. Images
    2.J. Boot to U-Boot
    2.K. Image with Initramfs
    2.L. Device tree support
 3. Extra apps
    3.A. omxplayer
 4. Source code and mirrors
 5. Contribution
    5.A. Mailing List
    5.B. Redmine
 6. Maintainers
 1. Description
 ==============
 This is the general hardware specific BSP overlay for the RaspberryPi device.
 More information can be found at:
                   http://www.raspberrypi.org/ (Official Site)
 The core BSP part of meta-raspberrypi should work with different
 OpenEmbedded/Yocto distributions and layer stacks, such as:
 * Distro-less (only with OE-Core).
 * Angstrom.
 * Yocto/Poky (main focus of testing).
 2. Yocto BSP Layer - RaspberryPi
 ================================
 This layer depends on:
 URI: git://git.yoctoproject.org/poky
 branch: master
 revision: HEAD
 URI: git://git.openembedded.org/meta-openembedded
 layers: meta-oe, meta-multimedia
 branch: master
 revision: HEAD
 How to use it:
 1. source poky/oe-init-build-env rpi-build
 2. Add needed layer to bblayers.conf:
    - meta-raspberrypi
 3  Set MACHINE to "raspberrypi"/"raspberrypi2" in local.conf
 4. bitbake rpi-hwup-image
 5. dd to a SD card the generated sdimg file (use xzcat if rpi-sdimg.xz is used)
 6. Boot your RPI.
 2.A. Optional - compressed deployed files:
 ==========================================
 1. Overwrite IMAGE_FSTYPES in local.conf
    IMAGE_FSTYPES = "tar.bz2 ext3.xz"
 2. Overwrite SDIMG_ROOTFS_TYPE in local.conf
    SDIMG_ROOTFS_TYPE = "ext3.xz"
 3. Overwrite SDIMG_COMPRESSION in local.conf
    SDIMG_COMPRESSION = "xz"
 *Accommodate the values above to your own needs (ex: ext3 / ext4).
 2.B. Optional - GPU memory:
 ===========================
 Variable    : Details
 GPU_MEM     : GPU memory in megabyte. Sets the memory split between the ARM and
              GPU. ARM gets the remaining memory. Min 16. Default 64.
 GPU_MEM_256 : GPU memory in megabyte for the 256MB Raspberry Pi. Ignored by the
              512MB RP. Overrides gpu_mem. Max 192. Default not set.
 GPU_MEM_512 : GPU memory in megabyte for the 512MB Raspberry Pi. Ignored by the
              256MB RP. Overrides gpu_mem. Max 448. Default not set.
 2.C.Optional - Add purchased license codecs:
 ============================================
 To add you own licenses use variables KEY_DECODE_MPG2 and KEY_DECODE_WVC1 in
 local.conf. Example:
 KEY_DECODE_MPG2 = "12345678"
 KEY_DECODE_WVC1 = "12345678"
 You can supply more licenses separated by comma. Example:
 KEY_DECODE_WVC1 = "0x12345678,0xabcdabcd,0x87654321"
 2.D. Optional - Disable overscan:
 =================================
 By default the GPU adds a black border around the video output to compensate for
 TVs which cut off part of the image. To disable this set this variable in
 local.conf:
 DISABLE_OVERSCAN = "1"
 2.E. Optional - Set overclocking options:
 =========================================
 The Raspberry PI can be overclocked. As of now overclocking up to the "Turbo
 Mode" is officially supported by the raspbery and does not void warranty.
 Check the config.txt for a detailed description of options and modes. Example:
 # Turbo mode
 ARM_FREQ = "1000"
 CORE_FREQ = "500"
 SDRAM_FREQ = "500"
 OVER_VOLTAGE = "6"
 2.F. Optional - Video camera support with V4L2 drivers
 ======================================================
 Set this variable to enable support for the video camera (Linux 3.12.4+ required)
 VIDEO_CAMERA = "1"
 2.G. Optional - Enable offline compositing support
 ==================================================
 Set this variable to enable support for dispmanx offline compositing
 DISMANX_OFFLINE = "1"
 This will enable the firmware to fall back to off-line compositing of
 Dispmanx elements. Normally the compositing is done on-line, during scanout,
 but cannot handle too many elements. With off-line enabled, an off-screen
 buffer is allocated for compositing. When scene complexity (number and sizes
 of elements) is high, compositing will happen off-line into the buffer.
 Heavily recommended for Wayland/Weston.
 See: http://wayland.freedesktop.org/raspberrypi.html
 2.H. Optional - Enable kgdb over console support
 ================================================
 To add the kdbg over console (kgdboc) parameter to the kernel command line,
 set this variable in local.conf:
 ENABLE_KGDB = "1"
 2.I. Images
 ===========
 * rpi-hwup-image
    Hardware up image
 * rpi-basic-image
    Based on rpi-hwup-image with some added features (ex: splash)
 * rpi-test-image
    Image based on rpi-basic-image which includes most of the packages in this
    layer and some media samples.
 2.J. Boot to U-Boot
 ===================
 To have u-boot load kernel image, set in your local.conf
 KERNEL_IMAGETYPE = "uImage"
 This will make kernel.img be u-boot image which will load uImage.
 By default, kernel.img is the actual kernel image (ex. Image).
 2.K. Image with Initramfs
 =========================
 To build an initramfs image :
    * Set this 3 kernel variables (in linux-raspberrypi.inc for example)
        - kernel_configure_variable BLK_DEV_INITRD y
        - kernel_configure_variable INITRAMFS_SOURCE ""
        - kernel_configure_variable RD_GZIP y
    * Set the yocto variables (in linux-raspberrypi.inc for example)
        - INITRAMFS_IMAGE = "<a name for your initramfs image>"
        - INITRAMFS_IMAGE_BUNDLE = "1"
    * Set the meta-rasberrypi variable (in raspberrypi.conf for example)
        - KERNEL_INITRAMFS = "-initramfs"
 2.L. Device tree support
 =========================
 Device tree for RPi is only supported when using linux-raspberrypi 3.18+
 kernels.
    * Set KERNEL_DEVICETREE (in conf/machine/raspberrypi.conf)
        - the trailer is added to the kernel image before kernel install task.
          While creating the SDCard image, this modified kernel is put on
          boot partition (as kernel.img) as well as DeviceTree blobs (.dtb files).
 NOTE: KERNEL_DEVICETREE is default enabled for kernel >= 3.18 and always disabled for
      older kernel versions.
 2.M. Optional - enable SPI bus
 ==============================
 When using device tree kernels, set this variable to enable the SPI bus
 ENABLE_SPI_BUS = "1"
 3. Extra apps
 =============
 3.A. omxplayer
 ==============
 omxplayer depends on libav which has a commercial license. So in order to be
 able to compile omxplayer you will need to whiteflag the commercial license
 adding to you local.conf:
 LICENSE_FLAGS_WHITELIST = "commercial"
 4. Board Configuration
 ======================
 4.A. Audio Routing
 ==================
 To load audio driver
    modprobe snd-bcm2835
 To test audio playback
    e.g. aplay test.wav
 Note that without HDMI connected this emits audio from the 3.5in jack connector
 as expected. However With an HDMI display connected there is no audio output from
 the jack connector.
 To force the audio routing via the 3.5in jack connector use
    amixer cset numid=3 1
 Options to amixer cset are:
    0=auto
    1=headphones
    2=hdmi
 5. Source code and mirrors
 ==========================
 Main repo:
    git://git.yoctoproject.org/meta-raspberrypi
    http://git.yoctoproject.org/git/meta-raspberrypi
 Github mirror:
    https://github.com/agherzan/meta-raspberrypi
 Bitbucket mirror:
    https://bitbucket.org/agherzan/meta-raspberrypi
 6. Contributing
 ===============
 6.A. Mailing list
 =================
 The main communication tool we use is a mailing list:
    yocto@yoctoproject.org
    https://lists.yoctoproject.org/listinfo/yocto
 Feel free to ask any kind of questions but always prepend your email subject
 with "[meta-raspberrypi]". This is because we use the 'yocto' mailing list and
 not a perticular 'meta-raspberrypi' mailing list.
 To contribute to this layer you should send the patches for review to the
 above specified mailing list.
 The patches should be compliant with the openembedded patch guidelines:
 http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
 When creating patches, please use something like:
    git format-patch -s --subject-prefix='meta-raspberrypi][PATCH' origin
 When sending patches to mailing list, please use something like:
    git send-email --to yocto@yoctoproject.org <generated patch>
 6.B. Redmine
 ============
 In order to manage and trace the meta-raspberrypi issues, we use redmine:
    http://redmine.gherzan.ro/projects/meta-raspberrypi
 Here we report, trace and develop bugs, features or support tickets for this
 yocto BSP later.
 If you push patches which have a redmine issue associated, please provide the
 issue number in the commit log just before "Signed-off-by" line(s). Example line
 for a bug:
    [Bug #13]
 7. Maintainers
 ==============
    Andrei Gherzan <andrei at gherzan.ro>
--- a/README.md
+++ b/README.md
@@ -0,0 +1,56 @@
 # meta-raspberrypi
 Yocto BSP layer for the Raspberry Pi boards - <http://www.raspberrypi.org/>.
 [![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi1/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi1)
 [![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi2/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi2)
 [![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi3/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi3)
 [![Matrix](https://img.shields.io/matrix/meta-raspberrypi:cub.icu.svg?server_fqdn=matrix.cub.icu)](https://matrix.to/#/#meta-raspberrypi:cub.icu)
 ## Quick links
 * Git repository web frontend:
  <https://github.com/agherzan/meta-raspberrypi>
 * Mailing list (yocto mailing list): <yocto@yoctoproject.org>
 * Issues management (Github Issues):
  <https://github.com/agherzan/meta-raspberrypi/issues>
 * Documentation: <http://meta-raspberrypi.readthedocs.io/en/latest/>
 ## Description
 This is the general hardware specific BSP overlay for the RaspberryPi device.
 More information can be found at: <http://www.raspberrypi.org/> (Official Site)
 The core BSP part of meta-raspberrypi should work with different
 OpenEmbedded/Yocto distributions and layer stacks, such as:
 * Distro-less (only with OE-Core).
 * Angstrom.
 * Yocto/Poky (main focus of testing).
 ## Dependencies
 This layer depends on:
 * URI: git://git.yoctoproject.org/poky
  * branch: master
  * revision: HEAD
 * URI: git://git.openembedded.org/meta-openembedded
  * layers: meta-oe, meta-multimedia, meta-networking, meta-python
  * branch: master
  * revision: HEAD
 ## Quick Start
 1. source poky/oe-init-build-env rpi-build
 2. Add this layer to bblayers.conf and the dependencies above
 3. Set MACHINE in local.conf to one of the supported boards
 4. bitbake core-image-base
 5. dd to a SD card the generated sdimg file (use xzcat if rpi-sdimg.xz is used)
 6. Boot your RPI.
 ## Maintainers
 * Andrei Gherzan `<andrei at gherzan.ro>`
--- a/classes/linux-raspberrypi-base.bbclass
+++ b/classes/linux-raspberrypi-base.bbclass
@@ -1,39 +0,0 @@
 inherit linux-kernel-base
 def get_dts(d, ver):
    staging_dir = d.getVar("STAGING_KERNEL_BUILDDIR", True)
    dts = d.getVar("KERNEL_DEVICETREE", True)
    # d.getVar() might return 'None' as a normal string
    # leading to 'is None' check isn't enough.
    # TODO: Investigate if this is a bug in bitbake
    if ver is None or ver == "None":
        ''' if 'ver' isn't set try to grab the kernel version
        from the kernel staging '''
        ver = get_kernelversion_file(staging_dir)
    if ver is not None:
        min_ver = ver.split('.', 3)
    else:
        return dts
    # Always turn off device tree support for kernel's < 3.18
    try:
        if int(min_ver[0]) <= 3:
            if int(min_ver[1]) < 18:
                dts = ""
    except IndexError:
        min_ver = None
    return dts
 def split_overlays(d, out):
    dts = get_dts(d, None)
    if out:
        overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d)
    else:
        overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d)
    return overlays
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -1,8 +1,7 @@
 inherit image_types
 inherit linux-raspberrypi-base
 #
-# Create an image that can by written onto a SD card using dd.
+# Create an image that can be written onto a SD card using dd.
 #
 # The disk layout used is:
 #
@@ -29,12 +28,10 @@ IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}"
 # Set kernel and boot loader
 IMAGE_BOOTLOADER ?= "bcm2835-bootfiles"
 # Set initramfs extension
 KERNEL_INITRAMFS ?= ""
 # Kernel image name
 SDIMG_KERNELIMAGE_raspberrypi  ?= "kernel.img"
 SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img"
 SDIMG_KERNELIMAGE_raspberrypi3-64 ?= "kernel8.img"
 # Boot partition volume id
 BOOTDD_VOLUME_ID ?= "${MACHINE}"
@@ -47,137 +44,149 @@ IMAGE_ROOTFS_ALIGNMENT = "4096"
 # Use an uncompressed ext3 by default as rootfs
 SDIMG_ROOTFS_TYPE ?= "ext3"
-SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
+SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${SDIMG_ROOTFS_TYPE}"
-IMAGE_DEPENDS_rpi-sdimg = " \
+# For the names of kernel artifacts
-			parted-native \
+inherit kernel-artifact-names
-			mtools-native \
+
-			dosfstools-native \
+do_image_rpi_sdimg[depends] = " \
-			virtual/kernel \
+    parted-native:do_populate_sysroot \
-			${IMAGE_BOOTLOADER} \
+    mtools-native:do_populate_sysroot \
-			${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'u-boot', '',d)} \
+    dosfstools-native:do_populate_sysroot \
-			"
+    virtual/kernel:do_deploy \
    ${IMAGE_BOOTLOADER}:do_deploy \
    rpi-config:do_deploy \
    ${@bb.utils.contains('MACHINE_FEATURES', 'armstub', 'armstubs:do_deploy', '' ,d)} \
    ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
    ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'rpi-u-boot-scr:do_deploy', '',d)} \
 "
 do_image_rpi_sdimg[recrdeps] = "do_build"
 # SD card image name
-SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg"
+SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.rpi-sdimg"
 # Compression method to apply to SDIMG after it has been created. Supported
 # compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg file
 # is kept and a new compressed file is created if one of these compression
 # formats is chosen. If SDIMG_COMPRESSION is set to any other value it is
 # silently ignored.
 #SDIMG_COMPRESSION ?= ""
 # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
 FATPAYLOAD ?= ""
-IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}"
+# SD card vfat partition image name
 SDIMG_VFAT_DEPLOY ?= "${RPI_USE_U_BOOT}"
 SDIMG_VFAT = "${IMAGE_NAME}.vfat"
 SDIMG_LINK_VFAT = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.vfat"
 def split_overlays(d, out, ver=None):
    dts = d.getVar("KERNEL_DEVICETREE")
    # Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' (4.1.x) or by '.dtbo' (4.4.9+) string and will be put in a dedicated folder
    if out:
        overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d)
        overlays = oe.utils.str_filter_out('\S+\.dtbo$', overlays, d)
    else:
        overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d) + \
                   " " + oe.utils.str_filter('\S+\.dtbo$', dts, d)
    return overlays
 IMAGE_CMD_rpi-sdimg () {
-	# Align partitions
+    # Align partitions
-	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
+    BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
-	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
+    BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
-	SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE)
+    SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE)
-	echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB"
+    echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB"
-	# Check if we are building with device tree support
+    # Check if we are building with device tree support
-	DTS="${@get_dts(d, None)}"
+    DTS="${KERNEL_DEVICETREE}"
-	# Initialize sdcard image file
+    # Initialize sdcard image file
-	dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}
+    dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}
-	# Create partition table
+    # Create partition table
-	parted -s ${SDIMG} mklabel msdos
+    parted -s ${SDIMG} mklabel msdos
-	# Create boot partition and mark it as bootable
+    # Create boot partition and mark it as bootable
-	parted -s ${SDIMG} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT})
+    parted -s ${SDIMG} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT})
-	parted -s ${SDIMG} set 1 boot on
+    parted -s ${SDIMG} set 1 boot on
-	# Create rootfs partition to the end of disk
+    # Create rootfs partition to the end of disk
-	parted -s ${SDIMG} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s
+    parted -s ${SDIMG} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s
-	parted ${SDIMG} print
+    parted ${SDIMG} print
-	# Create a vfat image with boot files
+    # Create a vfat image with boot files
-	BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
+    BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
-	rm -f ${WORKDIR}/boot.img
+    rm -f ${WORKDIR}/boot.img
-	mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
+    mkfs.vfat -F32 -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
+    mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/ || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* into boot.img"
-	case "${KERNEL_IMAGETYPE}" in
+    if [ "${@bb.utils.contains("MACHINE_FEATURES", "armstub", "1", "0", d)}" = "1" ]; then
-	"uImage")
+        mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} ::/ || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} into boot.img"
-		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.img ::${SDIMG_KERNELIMAGE}
+    fi
-		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::uImage
+    if test -n "${DTS}"; then
-		;;
+        # Copy board device trees to root folder
-	*)
+        for dtbf in ${@split_overlays(d, True)}; do
-		if test -n "${DTS}"; then
+            dtb=`basename $dtbf`
-			# Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' string and will be put in a dedicated folder
+            mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$dtb ::$dtb || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/$dtb into boot.img"
-			DT_OVERLAYS="${@split_overlays(d, 0)}"
+        done
 			DT_ROOT="${@split_overlays(d, 1)}"
-			# Copy board device trees to root folder
+        # Copy device tree overlays to dedicated folder
-			for DTB in ${DT_ROOT}; do
+        mmd -i ${WORKDIR}/boot.img overlays
-				DTB_BASE_NAME=`basename ${DTB} .dtb`
+        for dtbf in ${@split_overlays(d, False)}; do
            dtb=`basename $dtbf`
            mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$dtb ::overlays/$dtb || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/$dtb into boot.img"
        done
    fi
    if [ "${RPI_USE_U_BOOT}" = "1" ]; then
        mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::${SDIMG_KERNELIMAGE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/u-boot.bin into boot.img"
        mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::boot.scr || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/boot.scr into boot.img"
        if [ ! -z "${INITRAMFS_IMAGE}" -a "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then
            mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin ::${KERNEL_IMAGETYPE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin into boot.img"
        else
            mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::${KERNEL_IMAGETYPE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} into boot.img"
        fi
    else
        if [ ! -z "${INITRAMFS_IMAGE}" -a "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then
            mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin ::${SDIMG_KERNELIMAGE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin into boot.img"
        else
            mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::${SDIMG_KERNELIMAGE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} into boot.img"
        fi
    fi
-				mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::${DTB_BASE_NAME}.dtb
+    if [ -n "${FATPAYLOAD}" ] ; then
-			done
+        echo "Copying payload into VFAT"
        for entry in ${FATPAYLOAD} ; do
            # use bbwarn instead of bbfatal to stop aborting on vfat issues like not supporting .~lock files
            mcopy -v -i ${WORKDIR}/boot.img -s ${IMAGE_ROOTFS}$entry :: || bbwarn "mcopy cannot copy ${IMAGE_ROOTFS}$entry into boot.img"
        done
    fi
-			# Copy device tree overlays to dedicated folder
+    # Add stamp file
-			mmd -i ${WORKDIR}/boot.img overlays
+    echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info
-			for DTB in ${DT_OVERLAYS}; do
+    mcopy -v -i ${WORKDIR}/boot.img ${WORKDIR}/image-version-info :: || bbfatal "mcopy cannot copy ${WORKDIR}/image-version-info into boot.img"
 				DTB_BASE_NAME=`basename ${DTB} .dtb`
-				mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtb
+    # Deploy vfat partition
-			done
+    if [ "${SDIMG_VFAT_DEPLOY}" = "1" ]; then
-		fi
+        cp ${WORKDIR}/boot.img ${IMGDEPLOYDIR}/${SDIMG_VFAT}
-		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::${SDIMG_KERNELIMAGE}
+        ln -sf ${SDIMG_VFAT} ${SDIMG_LINK_VFAT}
-		;;
+    fi
 	esac
-	if [ -n ${FATPAYLOAD} ] ; then
+    # Burn Partitions
-		echo "Copying payload into VFAT"
+    dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
-		for entry in ${FATPAYLOAD} ; do
+    # If SDIMG_ROOTFS_TYPE is a .xz file use xzcat
-				# add the || true to stop aborting on vfat issues like not supporting .~lock files
+    if echo "${SDIMG_ROOTFS_TYPE}" | egrep -q "*\.xz"
-				mcopy -i ${WORKDIR}/boot.img -s -v ${IMAGE_ROOTFS}$entry :: || true
+    then
-		done
+        xzcat ${SDIMG_ROOTFS} | dd of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
-	fi
+    else
-
+        dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
-	# Add stamp file
+    fi
 	echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info
 	mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info ::
 	# Burn Partitions
 	dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
 	# If SDIMG_ROOTFS_TYPE is a .xz file use xzcat
 	if echo "${SDIMG_ROOTFS_TYPE}" | egrep -q "*\.xz"
 	then
 		xzcat ${SDIMG_ROOTFS} | dd of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
 	else
 		dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
 	fi
 	# Optionally apply compression
 	case "${SDIMG_COMPRESSION}" in
 	"gzip")
 		gzip -k9 "${SDIMG}"
 		;;
 	"bzip2")
 		bzip2 -k9 "${SDIMG}"
 		;;
 	"xz")
 		xz -k "${SDIMG}"
 		;;
 	esac
 }
 ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; "
 rpi_generate_sysctl_config() {
-	# systemd sysctl config
+    # systemd sysctl config
-	test -d ${IMAGE_ROOTFS}${sysconfdir}/sysctl.d && \
+    test -d ${IMAGE_ROOTFS}${sysconfdir}/sysctl.d && \
-		echo "vm.min_free_kbytes = 8192" > ${IMAGE_ROOTFS}${sysconfdir}/sysctl.d/rpi-vm.conf
+        echo "vm.min_free_kbytes = 8192" > ${IMAGE_ROOTFS}${sysconfdir}/sysctl.d/rpi-vm.conf
-	# sysv sysctl config
+    # sysv sysctl config
-	IMAGE_SYSCTL_CONF="${IMAGE_ROOTFS}${sysconfdir}/sysctl.conf"
+    IMAGE_SYSCTL_CONF="${IMAGE_ROOTFS}${sysconfdir}/sysctl.conf"
-	test -e ${IMAGE_ROOTFS}${sysconfdir}/sysctl.conf && \
+    test -e ${IMAGE_ROOTFS}${sysconfdir}/sysctl.conf && \
-		sed -e "/vm.min_free_kbytes/d" -i ${IMAGE_SYSCTL_CONF}
+        sed -e "/vm.min_free_kbytes/d" -i ${IMAGE_SYSCTL_CONF}
-	echo "" >> ${IMAGE_SYSCTL_CONF} && echo "vm.min_free_kbytes = 8192" >> ${IMAGE_SYSCTL_CONF}
+    echo "" >> ${IMAGE_SYSCTL_CONF} && echo "vm.min_free_kbytes = 8192" >> ${IMAGE_SYSCTL_CONF}
 }
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,6 +9,26 @@ BBFILE_COLLECTIONS += "raspberrypi"
 BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
 BBFILE_PRIORITY_raspberrypi = "9"
 LAYERSERIES_COMPAT_raspberrypi = "sumo thud warrior zeus"
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
 # The dynamic-layers directory hosts the extensions and layer specific
 # modifications.
 #
 # The .bbappend and .bb files are included if the respective layer
 # collection is available.
 BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bbappend' % layer \
               for layer in BBFILE_COLLECTIONS.split())}"
 BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bb' % layer \
               for layer in BBFILE_COLLECTIONS.split())}"
 BBFILES_DYNAMIC += " \
    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
    networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
    networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
    qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bb \
    qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \
 "
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -6,45 +6,118 @@ SOC_FAMILY = "rpi"
 include conf/machine/include/soc-family.inc
 IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg"
-
+WKS_FILE ?= "sdimage-raspberrypi.wks"
 SERIAL_CONSOLE = "115200 ttyAMA0"
 XSERVER = " \
    xserver-xorg \
-    xf86-input-evdev \
+    ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xserver-xorg-extension-glx", "", d)} \
-    xf86-input-mouse \
+    ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xf86-video-modesetting", "xf86-video-fbdev", d)} \
    xf86-input-keyboard \
    xf86-video-fbdev \
    "
-# Really supported starting from linux-raspberrypi 3.18.y only
+RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
-KERNEL_DEVICETREE ?= " \
+    overlays/at86rf233.dtbo \
    overlays/disable-bt.dtbo \
    overlays/dwc2.dtbo \
    overlays/gpio-key.dtbo \
    overlays/hifiberry-amp.dtbo \
    overlays/hifiberry-dac.dtbo \
    overlays/hifiberry-dacplus.dtbo \
    overlays/hifiberry-digi.dtbo \
    overlays/i2c-rtc.dtbo \
    overlays/iqaudio-dac.dtbo \
    overlays/iqaudio-dacplus.dtbo \
    overlays/miniuart-bt.dtbo \
    overlays/mcp2515-can0.dtbo \
    overlays/pi3-disable-bt.dtbo \
    overlays/pi3-miniuart-bt.dtbo \
    overlays/pitft22.dtbo \
    overlays/pitft28-resistive.dtbo \
    overlays/pitft35-resistive.dtbo \
    overlays/pps-gpio.dtbo \
    overlays/rpi-ft5406.dtbo \
    overlays/rpi-poe.dtbo \
    overlays/vc4-kms-v3d.dtbo \
    overlays/vc4-fkms-v3d.dtbo \
    overlays/w1-gpio-pullup.dtbo \
    overlays/w1-gpio.dtbo \
    "
 RPI_KERNEL_DEVICETREE ?= " \
    bcm2708-rpi-zero-w.dtb \
    bcm2708-rpi-b.dtb \
    bcm2708-rpi-b-plus.dtb \
    bcm2709-rpi-2-b.dtb \
-    \
+    bcm2710-rpi-3-b.dtb \
-    overlays/hifiberry-amp-overlay.dtb \
+    bcm2710-rpi-3-b-plus.dtb \
-    overlays/hifiberry-dac-overlay.dtb \
+    bcm2711-rpi-4-b.dtb \
-    overlays/hifiberry-dacplus-overlay.dtb \
+    bcm2708-rpi-cm.dtb \
-    overlays/hifiberry-digi-overlay.dtb \
+    bcm2710-rpi-cm3.dtb \
    overlays/i2c-rtc-overlay.dtb \
    overlays/iqaudio-dac-overlay.dtb \
    overlays/iqaudio-dacplus-overlay.dtb \
    overlays/lirc-rpi-overlay.dtb \
    overlays/pps-gpio-overlay.dtb \
    overlays/w1-gpio-overlay.dtb \
    overlays/w1-gpio-pullup-overlay.dtb \
    "
 KERNEL_IMAGETYPE ?= "Image"
-MACHINE_FEATURES = "kernel26 apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"
+KERNEL_DEVICETREE ?= " \
    ${RPI_KERNEL_DEVICETREE} \
    ${RPI_KERNEL_DEVICETREE_OVERLAYS} \
    "
 # By default:
 #
 # * When u-boot is disabled use the "Image" format which can be directly loaded
 #   by the rpi firmware.
 #
 # * When u-boot is enabled use the "uImage" format and the "bootm" command
 #   within u-boot to load the kernel.
 KERNEL_BOOTCMD ??= "bootm"
 KERNEL_IMAGETYPE_UBOOT ??= "uImage"
 KERNEL_IMAGETYPE_DIRECT ??= "zImage"
 KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', \
        '${KERNEL_IMAGETYPE_UBOOT}', '${KERNEL_IMAGETYPE_DIRECT}', d)}"
 MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio ${@bb.utils.contains('DISABLE_VC4GRAPHICS', '1', '', 'vc4graphics', d)}"
 # Raspberry Pi has no hardware clock
 MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
-MACHINE_EXTRA_RRECOMMENDS += " kernel-modules"
+MACHINE_EXTRA_RRECOMMENDS += " kernel-modules udev-rules-rpi"
 # Set Raspberrypi splash image
 SPLASH = "psplash-raspberrypi"
-IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* ${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}"
+def make_dtb_boot_files(d):
    # Generate IMAGE_BOOT_FILES entries for device tree files listed in
    # KERNEL_DEVICETREE.
    alldtbs = d.getVar('KERNEL_DEVICETREE')
    imgtyp = d.getVar('KERNEL_IMAGETYPE')
    def transform(dtb):
        base = os.path.basename(dtb)
        if dtb.endswith('dtb'):
            # eg: whatever/bcm2708-rpi-b.dtb has:
            #     DEPLOYDIR file: bcm2708-rpi-b.dtb
            #     destination: bcm2708-rpi-b.dtb
            return base
        elif dtb.endswith('dtbo'):
            # overlay dtb:
            # eg: overlays/hifiberry-amp.dtbo has:
            #     DEPLOYDIR file: hifiberry-amp.dtbo
            #     destination: overlays/hifiberry-amp.dtbo
            return '{};{}'.format(base, dtb)
    return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb])
 IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \
                 ${@make_dtb_boot_files(d)} \
                 ${@bb.utils.contains('RPI_USE_U_BOOT', '1', \
                    '${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('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
    "
 do_image_wic[recrdeps] = "do_build"
 # The kernel image is installed into the FAT32 boot partition and does not need
 # to also be installed into the rootfs.
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
--- a/conf/machine/include/rpi-default-providers.inc
+++ b/conf/machine/include/rpi-default-providers.inc
@@ -1,10 +1,10 @@
 # RaspberryPi BSP default providers
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-rpi"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/egl ?= "userland"
+PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "userland"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl"
+PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}"
-PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl"
+PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}"
 PREFERRED_PROVIDER_virtual/libgbm ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}"
 PREFERRED_PROVIDER_jpeg ?= "jpeg"
--- a/conf/machine/include/rpi-default-versions.inc
+++ b/conf/machine/include/rpi-default-versions.inc
@@ -1,3 +1,3 @@
 # RaspberryPi BSP default versions
-PREFERRED_VERSION_linux-raspberrypi ?= "4.1.%"
+PREFERRED_VERSION_linux-raspberrypi ??= "4.19.%"
--- a/conf/machine/raspberrypi-cm.conf
+++ b/conf/machine/raspberrypi-cm.conf
@@ -0,0 +1,8 @@
 #@TYPE: Machine
 #@NAME: RaspberryPi Compute Module (CM1)
 #@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module (CM1)
 MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
 include conf/machine/raspberrypi.conf
 ARMSTUB ?= "armstub.bin"
--- a/conf/machine/raspberrypi-cm3.conf
+++ b/conf/machine/raspberrypi-cm3.conf
@@ -0,0 +1,14 @@
 #@TYPE: Machine
 #@NAME: RaspberryPi Compute Module 3 (CM3)
 #@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module 3 (CM3)
 DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
 require conf/machine/include/tune-cortexa7.inc
 include conf/machine/include/rpi-base.inc
 KBUILD_DEFCONFIG ?= "bcm2709_defconfig"
 SDIMG_KERNELIMAGE ?= "kernel7.img"
 UBOOT_MACHINE = "rpi_3_32b_config"
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 ARMSTUB ?= "armstub.bin"
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -6,3 +6,9 @@ DEFAULTTUNE ?= "arm1176jzfshf"
 require conf/machine/include/tune-arm1176jzf-s.inc
 include conf/machine/include/rpi-base.inc
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 UBOOT_MACHINE = "rpi_config"
 ARMSTUB ?= "armstub.bin"
--- a/conf/machine/raspberrypi0-wifi.conf
+++ b/conf/machine/raspberrypi0-wifi.conf
@@ -0,0 +1,18 @@
 #@TYPE: Machine
 #@NAME: RaspberryPi Zero WiFi Development Board
 #@DESCRIPTION: Machine configuration for the RaspberryPi Zero  WiFi board (https://www.raspberrypi.org/blog/raspberry-pi-zero-w-joins-family/)
 DEFAULTTUNE ?= "arm1176jzfshf"
 require conf/machine/include/tune-arm1176jzf-s.inc
 include conf/machine/include/rpi-base.inc
 MACHINE_EXTRA_RRECOMMENDS += "\
    linux-firmware-rpidistro-bcm43430 \
    bluez-firmware-rpidistro-bcm43430a1-hcd \
 "
 SDIMG_KERNELIMAGE ?= "kernel.img"
 UBOOT_MACHINE ?= "rpi_0_w_defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0"
 ARMSTUB ?= "armstub.bin"
--- a/conf/machine/raspberrypi0.conf
+++ b/conf/machine/raspberrypi0.conf
@@ -0,0 +1,8 @@
 #@TYPE: Machine
 #@NAME: RaspberryPi Zero Development Board
 #@DESCRIPTION: Machine configuration for the RaspberryPi Zero board (https://www.raspberrypi.org/blog/raspberry-pi-zero)
 MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
 include conf/machine/raspberrypi.conf
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
--- a/conf/machine/raspberrypi2.conf
+++ b/conf/machine/raspberrypi2.conf
@@ -6,3 +6,9 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
 require conf/machine/include/tune-cortexa7.inc
 include conf/machine/include/rpi-base.inc
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 UBOOT_MACHINE = "rpi_2_config"
 ARMSTUB ?= "armstub7.bin"
--- a/conf/machine/raspberrypi3-64.conf
+++ b/conf/machine/raspberrypi3-64.conf
@@ -0,0 +1,34 @@
 #@TYPE: Machine
 #@NAME: RaspberryPi 3 Development Board
 #@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 64 bits mode
 MACHINEOVERRIDES = "raspberrypi3:${MACHINE}"
 MACHINE_EXTRA_RRECOMMENDS += "\
    linux-firmware-rpidistro-bcm43430 \
    linux-firmware-rpidistro-bcm43455 \
    bluez-firmware-rpidistro-bcm43430a1-hcd \
    bluez-firmware-rpidistro-bcm4345c0-hcd \
 "
 require conf/machine/include/tune-cortexa53.inc
 include conf/machine/include/rpi-base.inc
 RPI_KERNEL_DEVICETREE = " \
    broadcom/bcm2710-rpi-3-b.dtb \
    broadcom/bcm2710-rpi-3-b-plus.dtb \
    broadcom/bcm2837-rpi-3-b.dtb \
    "
 SERIAL_CONSOLES ?= "115200;ttyS0"
 UBOOT_MACHINE = "rpi_3_config"
 # When u-boot is enabled we need to use the "Image" format and the "booti"
 # command to load the kernel
 KERNEL_IMAGETYPE_UBOOT ?= "Image"
 # "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
 KERNEL_IMAGETYPE_DIRECT ?= "Image"
 KERNEL_BOOTCMD ?= "booti"
 ARMSTUB ?= "armstub8.bin"
--- a/conf/machine/raspberrypi3.conf
+++ b/conf/machine/raspberrypi3.conf
@@ -0,0 +1,20 @@
 #@TYPE: Machine
 #@NAME: RaspberryPi 3 Development Board (32bit)
 #@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 32 bits mode
 DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
 require conf/machine/include/tune-cortexa7.inc
 include conf/machine/include/rpi-base.inc
 MACHINE_EXTRA_RRECOMMENDS += "\
    linux-firmware-rpidistro-bcm43430 \
    linux-firmware-rpidistro-bcm43455 \
    bluez-firmware-rpidistro-bcm43430a1-hcd \
    bluez-firmware-rpidistro-bcm4345c0-hcd \
 "
 SDIMG_KERNELIMAGE ?= "kernel7.img"
 UBOOT_MACHINE = "rpi_3_32b_config"
 SERIAL_CONSOLES ?= "115200;ttyS0"
 ARMSTUB ?= "armstub7.bin"
--- a/conf/machine/raspberrypi4-64.conf
+++ b/conf/machine/raspberrypi4-64.conf
@@ -0,0 +1,35 @@
 #@TYPE: Machine
 #@NAME: RaspberryPi 4 Development Board (64bit)
 #@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 64 bits mode
 MACHINEOVERRIDES = "raspberrypi4:${MACHINE}"
 MACHINE_EXTRA_RRECOMMENDS += "\
    linux-firmware-rpidistro-bcm43455 \
    bluez-firmware-rpidistro-bcm4345c0-hcd \
 "
 require conf/machine/include/tune-cortexa72.inc
 include conf/machine/include/rpi-base.inc
 RPI_KERNEL_DEVICETREE = " \
    broadcom/bcm2711-rpi-4-b.dtb \
 "
 SDIMG_KERNELIMAGE ?= "kernel8.img"
 SERIAL_CONSOLES ?= "115200;ttyS0"
 UBOOT_MACHINE = "rpi_4_config"
 VC4DTBO ?= "vc4-fkms-v3d"
 # When u-boot is enabled we need to use the "Image" format and the "booti"
 # command to load the kernel
 KERNEL_IMAGETYPE_UBOOT ?= "Image"
 # "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
 KERNEL_IMAGETYPE_DIRECT ?= "Image"
 KERNEL_BOOTCMD ?= "booti"
 RPI_EXTRA_CONFIG ?= "\n# Force arm in 64bit mode. See: https://github.com/raspberrypi/firmware/issues/1193.\narm_64bit=1"
 ARMSTUB ?= "armstub8-gic.bin"
--- a/conf/machine/raspberrypi4.conf
+++ b/conf/machine/raspberrypi4.conf
@@ -0,0 +1,20 @@
 #@TYPE: Machine
 #@NAME: RaspberryPi 4 Development Board (32bit)
 #@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 32 bit mode
 DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
 require conf/machine/include/tune-cortexa7.inc
 include conf/machine/include/rpi-base.inc
 MACHINE_EXTRA_RRECOMMENDS += "\
    linux-firmware-rpidistro-bcm43455 \
    bluez-firmware-rpidistro-bcm4345c0-hcd \
 "
 # 'l' stands for LPAE
 SDIMG_KERNELIMAGE ?= "kernel7l.img"
 UBOOT_MACHINE = "rpi_4_32b_config"
 SERIAL_CONSOLES ?= "115200;ttyS0"
 VC4DTBO ?= "vc4-fkms-v3d"
 ARMSTUB ?= "armstub7.bin"
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -0,0 +1,225 @@
 # Makefile for Sphinx documentation
 #
 # You can set these variables from the command line.
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = _build
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 .PHONY: help
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  html       to make standalone HTML files"
 	@echo "  dirhtml    to make HTML files named index.html in directories"
 	@echo "  singlehtml to make a single large HTML file"
 	@echo "  pickle     to make pickle files"
 	@echo "  json       to make JSON files"
 	@echo "  htmlhelp   to make HTML files and a HTML help project"
 	@echo "  qthelp     to make HTML files and a qthelp project"
 	@echo "  applehelp  to make an Apple Help Book"
 	@echo "  devhelp    to make HTML files and a Devhelp project"
 	@echo "  epub       to make an epub"
 	@echo "  epub3      to make an epub3"
 	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
 	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
 	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
 	@echo "  text       to make text files"
 	@echo "  man        to make manual pages"
 	@echo "  texinfo    to make Texinfo files"
 	@echo "  info       to make Texinfo files and run them through makeinfo"
 	@echo "  gettext    to make PO message catalogs"
 	@echo "  changes    to make an overview of all changed/added/deprecated items"
 	@echo "  xml        to make Docutils-native XML files"
 	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
 	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 	@echo "  coverage   to run coverage check of the documentation (if enabled)"
 	@echo "  dummy      to check syntax errors of document sources"
 .PHONY: clean
 clean:
 	rm -rf $(BUILDDIR)/*
 .PHONY: html
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 .PHONY: dirhtml
 dirhtml:
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
 .PHONY: singlehtml
 singlehtml:
 	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
 	@echo
 	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
 .PHONY: pickle
 pickle:
 	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
 	@echo
 	@echo "Build finished; now you can process the pickle files."
 .PHONY: json
 json:
 	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
 	@echo
 	@echo "Build finished; now you can process the JSON files."
 .PHONY: htmlhelp
 htmlhelp:
 	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
 	@echo
 	@echo "Build finished; now you can run HTML Help Workshop with the" \
 	      ".hhp project file in $(BUILDDIR)/htmlhelp."
 .PHONY: qthelp
 qthelp:
 	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
 	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/meta-raspberrypi.qhcp"
 	@echo "To view the help file:"
 	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/meta-raspberrypi.qhc"
 .PHONY: applehelp
 applehelp:
 	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
 	@echo
 	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
 	@echo "N.B. You won't be able to view it unless you put it in" \
 	      "~/Library/Documentation/Help or install it in your application" \
 	      "bundle."
 .PHONY: devhelp
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
 	@echo "# mkdir -p $$HOME/.local/share/devhelp/meta-raspberrypi"
 	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/meta-raspberrypi"
 	@echo "# devhelp"
 .PHONY: epub
 epub:
 	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
 	@echo
 	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
 .PHONY: epub3
 epub3:
 	$(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3
 	@echo
 	@echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3."
 .PHONY: latex
 latex:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo
 	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
 	@echo "Run \`make' in that directory to run these through (pdf)latex" \
 	      "(use \`make latexpdf' here to do that automatically)."
 .PHONY: latexpdf
 latexpdf:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo "Running LaTeX files through pdflatex..."
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 .PHONY: latexpdfja
 latexpdfja:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo "Running LaTeX files through platex and dvipdfmx..."
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 .PHONY: text
 text:
 	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
 	@echo
 	@echo "Build finished. The text files are in $(BUILDDIR)/text."
 .PHONY: man
 man:
 	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
 	@echo
 	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
 .PHONY: texinfo
 texinfo:
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
 	@echo
 	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
 	@echo "Run \`make' in that directory to run these through makeinfo" \
 	      "(use \`make info' here to do that automatically)."
 .PHONY: info
 info:
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
 	@echo "Running Texinfo files through makeinfo..."
 	make -C $(BUILDDIR)/texinfo info
 	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
 .PHONY: gettext
 gettext:
 	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
 	@echo
 	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
 .PHONY: changes
 changes:
 	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
 	@echo
 	@echo "The overview file is in $(BUILDDIR)/changes."
 .PHONY: linkcheck
 linkcheck:
 	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
 	@echo
 	@echo "Link check complete; look for any errors in the above output " \
 	      "or in $(BUILDDIR)/linkcheck/output.txt."
 .PHONY: doctest
 doctest:
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILDDIR)/doctest/output.txt."
 .PHONY: coverage
 coverage:
 	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
 	@echo "Testing of coverage in the sources finished, look at the " \
 	      "results in $(BUILDDIR)/coverage/python.txt."
 .PHONY: xml
 xml:
 	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
 	@echo
 	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
 .PHONY: pseudoxml
 pseudoxml:
 	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
 	@echo
 	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
 .PHONY: dummy
 dummy:
 	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy
 	@echo
 	@echo "Build finished. Dummy builder generates no files."
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -0,0 +1,343 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # meta-raspberrypi documentation build configuration file, created by
 # sphinx-quickstart on Tue May 23 09:51:24 2017.
 #
 # This file is execfile()d with the current directory set to its
 # containing dir.
 #
 # Note that not all possible configuration values are present in this
 # autogenerated file.
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 # -- General configuration ------------------------------------------------
 # If your documentation needs a minimal Sphinx version, state it here.
 #
 # needs_sphinx = '1.0'
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = []
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
 source_suffix = ['.rst', '.md']
 # The encoding of source files.
 #
 # source_encoding = 'utf-8-sig'
 # The master toctree document.
 master_doc = 'index'
 # General information about the project.
 project = 'meta-raspberrypi'
 copyright = '2017, meta-raspberrypi contributors'
 author = 'meta-raspberrypi contributors'
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
 version = 'master'
 # The full version, including alpha/beta/rc tags.
 release = 'master'
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
 language = None
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
 #
 # today = ''
 #
 # Else, today_fmt is used as the format for a strftime call.
 #
 # today_fmt = '%B %d, %Y'
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
 #
 # default_role = None
 # If true, '()' will be appended to :func: etc. cross-reference text.
 #
 # add_function_parentheses = True
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
 #
 # add_module_names = True
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
 #
 # show_authors = False
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
 # If true, keep warnings as "system message" paragraphs in the built documents.
 # keep_warnings = False
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
 # -- Options for HTML output ----------------------------------------------
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
 # html_theme = 'alabaster'
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 #
 # html_theme_options = {}
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
 #
 # html_title = 'meta-raspberrypi vmaster'
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #
 # html_short_title = None
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
 #
 # html_logo = None
 # The name of an image file (relative to this directory) to use as a favicon of
 # the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
 #
 # html_favicon = None
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
 #
 # html_extra_path = []
 # If not None, a 'Last updated on:' timestamp is inserted at every page
 # bottom, using the given strftime format.
 # The empty string is equivalent to '%b %d, %Y'.
 #
 # html_last_updated_fmt = None
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #
 # html_use_smartypants = True
 # Custom sidebar templates, maps document names to template names.
 #
 # html_sidebars = {}
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
 #
 # html_additional_pages = {}
 # If false, no module index is generated.
 #
 # html_domain_indices = True
 # If false, no index is generated.
 #
 # html_use_index = True
 # If true, the index is split into individual pages for each letter.
 #
 # html_split_index = False
 # If true, links to the reST sources are added to the pages.
 #
 # html_show_sourcelink = True
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
 #
 # html_show_sphinx = True
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
 #
 # html_show_copyright = True
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
 #
 # html_use_opensearch = ''
 # This is the file name suffix for HTML files (e.g. ".xhtml").
 # html_file_suffix = None
 # Language to be used for generating the HTML full-text search index.
 # Sphinx supports the following languages:
 #   'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
 #   'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr', 'zh'
 #
 # html_search_language = 'en'
 # A dictionary with options for the search language support, empty by default.
 # 'ja' uses this config value.
 # 'zh' user can custom change `jieba` dictionary path.
 #
 # html_search_options = {'type': 'default'}
 # The name of a javascript file (relative to the configuration directory) that
 # implements a search results scorer. If empty, the default will be used.
 #
 # html_search_scorer = 'scorer.js'
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'meta-raspberrypidoc'
 # -- Options for LaTeX output ---------------------------------------------
 latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
 }
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
    (master_doc, 'meta-raspberrypi.tex', 'meta-raspberrypi Documentation',
     'meta-raspberrypi contributors', 'manual'),
 ]
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
 #
 # latex_logo = None
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
 #
 # latex_use_parts = False
 # If true, show page references after internal links.
 #
 # latex_show_pagerefs = False
 # If true, show URL addresses after external links.
 #
 # latex_show_urls = False
 # Documents to append as an appendix to all manuals.
 #
 # latex_appendices = []
 # It false, will not define \strong, \code, 	itleref, \crossref ... but only
 # \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added
 # packages.
 #
 # latex_keep_old_macro_names = True
 # If false, no module index is generated.
 #
 # latex_domain_indices = True
 # -- Options for manual page output ---------------------------------------
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
    (master_doc, 'meta-raspberrypi', 'meta-raspberrypi Documentation',
     [author], 1)
 ]
 # If true, show URL addresses after external links.
 #
 # man_show_urls = False
 # -- Options for Texinfo output -------------------------------------------
 # Grouping the document tree into Texinfo files. List of tuples
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
    (master_doc, 'meta-raspberrypi', 'meta-raspberrypi Documentation',
     author, 'meta-raspberrypi', 'One line description of project.',
     'Miscellaneous'),
 ]
 # Documents to append as an appendix to all manuals.
 #
 # texinfo_appendices = []
 # If false, no module index is generated.
 #
 # texinfo_domain_indices = True
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
 #
 # texinfo_show_urls = 'footnote'
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #
 # texinfo_no_detailmenu = False
 source_parsers = {
    '.md': 'recommonmark.parser.CommonMarkParser',
 }
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -0,0 +1,109 @@
 # Contributing
 ## Mailing list
 The main communication tool in use is the Yocto Project mailing list:
 * <yocto@yoctoproject.org>
 * <https://lists.yoctoproject.org/listinfo/yocto>
 Feel free to ask any kind of questions but please always prepend your email
 subject with `[meta-raspberrypi]` as this is the global *Yocto* mailing
 list and not a dedicated *meta-raspberrypi* mailing list.
 ## Formatting patches
 First and foremost, all of the contributions to the layer must be compliant
 with the standard openembedded patch guidelines:
 * <http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines>
 In summary, your commit log messages should be formatted as follows:
    <layer-component>: <short log/statement of what needed to be changed>
    (Optional pointers to external resources, such as defect tracking)
    The intent of your change.
    (Optional: if it's not clear from above, how your change resolves
    the issues in the first part)
    Signed-off-by: Your Name <yourname@youremail.com>
 The `<layer-component>` is the layer component name that your changes affect.
 It is important that you choose it correctly. A simple guide for selecting a
 a good component name is the following:
 * For changes that affect *layer recipes*, please just use the **base names**
  of the affected recipes, separated by commas (`,`), as the component name.
  For example: use `omxplayer` instead of `omxplayer_git.bb`. If you are
  adding new recipe(s), just use the new recipe(s) base name(s). An example
  for changes to multiple recipes would be `userland,vc-graphics,wayland`.
 * For changes that affect the *layer documentation*, please just use `docs`
  as the component name.
 * For changes that affect *other files*, i.e. under the `conf` directory,
  please use the full path as the component name, e.g. `conf/layer.conf`.
 * For changes that affect the *layer itself* and do not fall into any of
  the above cases, please use `meta-raspberrypi` as the component name.
 A full example of a suitable commit log message is below:
    foobar: Adjusted the foo setting in bar
    When using foobar on systems with less than a gigabyte of RAM common
    usage patterns often result in an Out-of-memory condition causing
    slowdowns and unexpected application termination.
    Low-memory systems should continue to function without running into
    memory-starvation conditions with minimal cost to systems with more
    available memory.  High-memory systems will be less able to use the
    full extent of the system, a dynamically tunable option may be best,
    long-term.
    The foo setting in bar was decreased from X to X-50% in order to
    ensure we don't exhaust all system memory with foobar threads.
    Signed-off-by: Joe Developer <joe.developer@example.com>
 A common issue during patch reviewing is commit log formatting, please review
 the above formatting guidelines carefully before sending your patches.
 ## Sending patches
 The preferred method to contribute to this project is to send pull
 requests to the GitHub mirror of the layer:
 * <https://github.com/agherzan/meta-raspberrypi>
 **In addition**, you may send patches for review to the above specified
 mailing list. In this case, when creating patches using `git` please make
 sure to use the following formatting for the message subject:
    git format-patch -s --subject-prefix='meta-raspberrypi][PATCH' origin
 Then, for sending patches to the mailing list, you may use this command:
    git send-email --to yocto@yoctoproject.org <generated patch>
 ## GitHub issues
 In order to manage and track the layer issues more efficiently, the
 GitHub issues facility is used by this project:
 * <https://github.com/agherzan/meta-raspberrypi/issues>
 If you submit patches that have a GitHub issue associated, please make sure to
 use standard GitHub keywords, e.g. `closes`, `resolves` or `fixes`, before the
 "Signed-off-by" tag to close the relevant issues automatically:
    foobar: Adjusted the foo setting in bar
    Fixes: #324
    Signed-off-by: Joe Developer <joe.developer@example.com>
 More information on the available GitHub close keywords can be found here:
 * <https://help.github.com/articles/closing-issues-using-keywords>
--- a/docs/extra-apps.md
+++ b/docs/extra-apps.md
@@ -0,0 +1,9 @@
 # Extra apps
 ## omxplayer
 omxplayer depends on libav which has a commercial license. So in order to be
 able to compile omxplayer you will need to whiteflag the commercial
 license in your local.conf:
    LICENSE_FLAGS_WHITELIST = "commercial"
--- a/docs/extra-build-config.md
+++ b/docs/extra-build-config.md
@@ -0,0 +1,273 @@
 # Optional build configuration
 There are a set of ways in which a user can influence different paramenters of
 the build. We list here the ones that are closely related to this BSP or
 specific to it. For the rest please check:
 <http://www.yoctoproject.org/docs/latest/ref-manual/ref-manual.html>
 ## Compressed deployed files
 1. Overwrite IMAGE_FSTYPES in local.conf
    * `IMAGE_FSTYPES = "tar.bz2 ext3.xz"`
 2. Overwrite SDIMG_ROOTFS_TYPE in local.conf
    * `SDIMG_ROOTFS_TYPE = "ext3.xz"`
 Accommodate the values above to your own needs (ex: ext3 / ext4).
 ## GPU memory
 * `GPU_MEM`: GPU memory in megabyte. Sets the memory split between the ARM and
  GPU. ARM gets the remaining memory. Min 16. Default 64.
 * `GPU_MEM_256`: GPU memory in megabyte for the 256MB Raspberry Pi. Ignored by
  the 512MB RP. Overrides gpu_mem. Max 192. Default not set.
 * `GPU_MEM_512`: GPU memory in megabyte for the 512MB Raspberry Pi. Ignored by
  the 256MB RP. Overrides gpu_mem. Max 448. Default not set.
 * `GPU_MEM_1024`: GPU memory in megabyte for the 1024MB Raspberry Pi. Ignored by
  the 256MB/512MB RP. Overrides gpu_mem. Max 944. Default not set.
 See: <https://www.raspberrypi.org/documentation/configuration/config-txt/memory.md>
 ## VC4
 By default, each machine uses `vc4` for graphics. This will in turn sets mesa as provider for `gl` libraries. `DISABLE_VC4GRAPHICS` can be set to `1` to disable this behaviour falling back to using `userland`. Be aware that `userland` has not support for 64-bit arch. If you disable `vc4` on a 64-bit Raspberry Pi machine, expect build breakage.
 ## Add purchased license codecs
 To add you own licenses use variables `KEY_DECODE_MPG2` and `KEY_DECODE_WVC1` in
 local.conf. Example:
    KEY_DECODE_MPG2 = "12345678"
    KEY_DECODE_WVC1 = "12345678"
 You can supply more licenses separated by comma. Example:
    KEY_DECODE_WVC1 = "0x12345678,0xabcdabcd,0x87654321"
 See: <https://www.raspberrypi.org/documentation/configuration/config-txt/codeclicence.md>
 ## Disable overscan
 By default the GPU adds a black border around the video output to compensate for
 TVs which cut off part of the image. To disable this set this variable in
 local.conf:
    DISABLE_OVERSCAN = "1"
 ## Disable splash screen
 By default a rainbow splash screen is shown after the GPU firmware is loaded.
 To disable this set this variable in local.conf:
    DISABLE_SPLASH = "1"
 ## Boot delay
 The Raspberry Pi waits a number of seconds after loading the GPU firmware and
 before loading the kernel. By default it is one second. This is useful if your
 SD card needs a while to get ready before Linux is able to boot from it.
 To remove (or adjust) this delay set these variables in local.conf:
    BOOT_DELAY = "0"
    BOOT_DELAY_MS = "0"
 ## Set overclocking options
 The Raspberry Pi can be overclocked. As of now overclocking up to the "Turbo
 Mode" is officially supported by the raspbery and does not void warranty. Check
 the config.txt for a detailed description of options and modes. The following
 variables are supported in local.conf: `ARM_FREQ`, `GPU_FREQ`, `CORE_FREQ`,
 `SDRAM_FREQ` and `OVER_VOLTAGE`.
 Example official settings for Turbo Mode in Raspberry Pi 2:
    ARM_FREQ = "1000"
    CORE_FREQ = "500"
    SDRAM_FREQ = "500"
    OVER_VOLTAGE = "6"
 See: <https://www.raspberrypi.org/documentation/configuration/config-txt/overclocking.md>
 ## HDMI and composite video options
 The Raspberry Pi can output video over HDMI or SDTV composite (the RCA connector).
 By default the video mode for these is autodetected on boot: the HDMI mode is
 selected according to the connected monitor's EDID information and the composite
 mode is defaulted to NTSC using a 4:3 aspect ratio. Check the config.txt for a
 detailed description of options and modes. The following variables are supported in
 local.conf: `HDMI_FORCE_HOTPLUG`, `HDMI_DRIVE`, `HDMI_GROUP`, `HDMI_MODE`,
 `CONFIG_HDMI_BOOST`, `SDTV_MODE`, `SDTV_ASPECT` and `DISPLAY_ROTATE`.
 Example to force HDMI output to 720p in CEA mode:
    HDMI_GROUP = "1"
    HDMI_MODE = "4"
 See: <https://www.raspberrypi.org/documentation/configuration/config-txt/video.md>
 ## Video camera support with V4L2 drivers
 Set this variable to enable support for the video camera (Linux 3.12.4+
 required):
    VIDEO_CAMERA = "1"
 ## Enable offline compositing support
 Set this variable to enable support for dispmanx offline compositing:
    DISPMANX_OFFLINE = "1"
 This will enable the firmware to fall back to off-line compositing of Dispmanx
 elements. Normally the compositing is done on-line, during scanout, but cannot
 handle too many elements. With off-line enabled, an off-screen buffer is
 allocated for compositing. When scene complexity (number and sizes
 of elements) is high, compositing will happen off-line into the buffer.
 Heavily recommended for Wayland/Weston.
 See: <http://wayland.freedesktop.org/raspberrypi.html>
 ## Enable kgdb over console support
 To add the kdbg over console (kgdboc) parameter to the kernel command line, set
 this variable in local.conf:
    ENABLE_KGDB = "1"
 ## Disable rpi boot logo
 To disable rpi boot logo, set this variable in local.conf:
    DISABLE_RPI_BOOT_LOGO = "1"
 ## Boot to U-Boot
 To have u-boot load kernel image, set in your local.conf:
    RPI_USE_U_BOOT = "1"
 This will select the appropriate image format for use with u-boot automatically.
 For further customisation the KERNEL_IMAGETYPE and KERNEL_BOOTCMD variables can
 be overridden to select the exact kernel image type (eg. zImage) and u-boot
 command (eg. bootz) to be used.
 ## Image with Initramfs
 To build an initramfs image:
 * Set this 3 kernel variables (in kernel's do_configure_prepend in linux-raspberrypi.inc after the line kernel_configure_variable LOCALVERSION "\"\""
 )
  - kernel_configure_variable BLK_DEV_INITRD y
  - kernel_configure_variable INITRAMFS_SOURCE ""
  - kernel_configure_variable RD_GZIP y
 * Set the yocto variables (e.g. in local.conf)
  - `INITRAMFS_IMAGE = "<name for your initramfs image>"`
  - `INITRAMFS_IMAGE_BUNDLE = "1"`
  - `BOOT_SPACE = "1073741"`
  - `INITRAMFS_MAXSIZE = "315400"`
  - `IMAGE_FSTYPES_pn-${INITRAMFS_IMAGE} = "${INITRAMFS_FSTYPES}"`
 ## Enable SPI bus
 When using device tree kernels, set this variable to enable the SPI bus:
    ENABLE_SPI_BUS = "1"
 ## Enable I2C
 When using device tree kernels, set this variable to enable I2C:
    ENABLE_I2C = "1"
 ## Enable PiTFT support
 Basic support for using PiTFT screens can be enabled by adding below in
 local.conf:
 * `MACHINE_FEATURES += "pitft"`
  - This will enable SPI bus and i2c device-trees, it will also setup
    framebuffer for console and x server on PiTFT.
 NOTE: To get this working the overlay for the PiTFT model must be build, added
 and specified as well (dtoverlay=<driver> in config.txt).
 Below is a list of currently supported PiTFT models in meta-raspberrypi, the
 modelname should be added as a MACHINE_FEATURES in local.conf like below:
    MACHINE_FEATURES += "pitft <modelname>"
 List of currently supported models:
 * pitft22
 * pitft28r
 * pitft35r
 ## Misc. display
 If you would like to use the Waveshare "C" 1024×600, 7 inch Capacitive Touch
 Screen LCD, HDMI interface (<http://www.waveshare.com/7inch-HDMI-LCD-C.htm>) Rev
 2.1, please set the following in your local.conf:
    WAVESHARE_1024X600_C_2_1 = "1"
 ## Enable UART
 RaspberryPi 0, 1, 2 and CM will have UART console enabled by default.
 RaspberryPi 0 WiFi and 3 does not have the UART enabled by default because this
 needs a fixed core frequency and enable_uart wil set it to the minimum. Certain
 operations - 60fps h264 decode, high quality deinterlace - which aren't
 performed on the ARM may be affected, and we wouldn't want to do that to users
 who don't want to use the serial port. Users who want serial console support on
 RaspberryPi 0 Wifi or 3 will have to explicitly set in local.conf:
    ENABLE_UART = "1"
 Ref.:
 * <https://github.com/raspberrypi/firmware/issues/553>
 * <https://github.com/RPi-Distro/repo/issues/22>
 ## Enable USB Peripheral (Gadget) support
 The standard USB driver only supports host mode operations.  Users who
 want to use gadget modules like g_ether should set the following in
 local.conf:
    ENABLE_DWC2_PERIPHERAL = "1"
 ## Enable Openlabs 802.15.4 radio module
 When using device tree kernels, set this variable to enable the 802.15.4 hat:
    ENABLE_AT86RF = "1"
 See: <https://openlabs.co/OSHW/Raspberry-Pi-802.15.4-radio>
 ## Enable CAN with Pican2
 In order to use Pican2 CAN module, set the following variables:
 	ENABLE_SPI_BUS = "1"
 	ENABLE_CAN = "1"
 See: <http://skpang.co.uk/catalog/pican2-canbus-board-for-raspberry-pi-23-p-1475.html>
 ## Manual additions to config.txt
 The `RPI_EXTRA_CONFIG` variable can be used to manually add additional lines to
 the `config.txt` file if there is not a specific option above for the
 configuration you need. To add multiple lines you must include `\n` separators.
 If double-quotes are needed in the lines you are adding you can use single
 quotes around the whole string.
 For example, to add a comment containing a double-quote and a configuration
 option:
    RPI_EXTRA_CONFIG = ' \n \
        # Raspberry Pi 7\" display/touch screen \n \
        lcd_rotate=2 \n \
        '
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -0,0 +1,26 @@
 .. meta-raspberrypi documentation master file, created by
   sphinx-quickstart on Tue May 23 09:51:24 2017.
   You can adapt this file completely to your liking, but it should at least
   contain the root `toctree` directive.
 Welcome to meta-raspberrypi's documentation!
 ============================================
 Contents:
 .. toctree::
   :maxdepth: 2
   readme
   layer-contents
   extra-build-config
   extra-apps
   contributing
 Indices and tables
 ==================
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
--- a/docs/layer-contents.md
+++ b/docs/layer-contents.md
@@ -0,0 +1,34 @@
 # Layer Contents
 ## Supported Machines
 * raspberrypi
 * raspberrypi0
 * raspberrypi0-wifi
 * raspberrypi2
 * raspberrypi3
 * raspberrypi3-64 (64 bit kernel & userspace)
 * raspberrypi-cm (dummy alias for raspberrypi)
 * raspberrypi-cm3
 Note: The raspberrypi3 machines include support for Raspberry Pi 3B+.
 ## Images
 * rpi-test-image
  * Image based on core-image-base which includes most of the packages in this
    layer and some media samples.
 For other uses it's recommended to base images on `core-image-minimal` or
 `core-image-base` as appropriate. The old image names (`rpi-hwup-image` and
 `rpi-basic-image`) are deprecated.
 ## WiFi and Bluetooth Firmware
 Be aware that the WiFi and Bluetooth firmware for the supported boards
 is not available in the base version of `linux-firmware` from OE-Core
 (poky). The files are added from Raspbian repositories in this layer's
 bbappends to that recipe. All machines define
 `MACHINE_EXTRA_RRECOMMENDS` to include the required wireless firmware;
 raspberrypi3 supports 3, 3B, and 3B+ and so include multiple firmware
 packages.
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -0,0 +1 @@
 ../README.md
--- a/dynamic-layers/networking-layer/recipes-support/drbd/drbd_%.bbappend
+++ b/dynamic-layers/networking-layer/recipes-support/drbd/drbd_%.bbappend
@@ -0,0 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_rpi = "(null)"
--- a/dynamic-layers/openembedded-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend
+++ b/dynamic-layers/openembedded-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend
@@ -0,0 +1 @@
 RDEPENDS_packagegroup-meta-oe-kernel_remove_rpi = "bpftool"
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -0,0 +1,19 @@
 PACKAGECONFIG_GL_rpi = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \
                        bb.utils.contains('DISTRO_FEATURES',     'opengl', 'eglfs gles2', \
                                                                       '', d), d)}"
 PACKAGECONFIG_GL_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}"
 PACKAGECONFIG_GL_append_rpi = " gbm"
 PACKAGECONFIG_FONTS_rpi = "fontconfig"
 PACKAGECONFIG_append_rpi = " libinput examples tslib xkb xkbcommon"
 PACKAGECONFIG_remove_rpi = "tests"
 OE_QTBASE_EGLFS_DEVICE_INTEGRATION_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'eglfs_brcm', d)}"
 do_configure_prepend_rpi() {
    # Add the appropriate EGLFS_DEVICE_INTEGRATION
    if [ "${@d.getVar('OE_QTBASE_EGLFS_DEVICE_INTEGRATION')}" != "" ]; then
        echo "EGLFS_DEVICE_INTEGRATION = ${OE_QTBASE_EGLFS_DEVICE_INTEGRATION}" >> ${S}/mkspecs/oe-device-extra.pri
    fi
 }
 RDEPENDS_${PN}_append_rpi = " userland"
 DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}"
--- a/files/custom-licenses/Broadcom-RPi
+++ b/files/custom-licenses/Broadcom-RPi
@@ -0,0 +1,29 @@
 Copyright (c) 2006, Broadcom Corporation.
 Copyright (c) 2015, Raspberry Pi (Trading) Ltd
 All rights reserved.
 Redistribution.  Redistribution and use in binary form, without
 modification, are permitted provided that the following conditions are
 met:
 * This software may only be used for the purposes of developing for, 
  running or using a Raspberry Pi device.
 * Redistributions must reproduce the above copyright notice and the
  following disclaimer in the documentation and/or other materials
  provided with the distribution.
 * Neither the name of Broadcom Corporation nor the names of its suppliers
  may be used to endorse or promote products derived from this software
  without specific prior written permission.
 DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
 CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
 BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
 OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGE.
--- a/recipes-bsp/armstubs/armstubs.bb
+++ b/recipes-bsp/armstubs/armstubs.bb
@@ -0,0 +1,32 @@
 DESCRIPTION = "Boot strap code that the GPU puts on memory to start running the boot loader"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://armstub.S;beginline=1;endline=26;md5=9888f34ac06a676129416c952a6a521e"
 inherit deploy nopackages
 include recipes-bsp/common/raspberrypi-tools.inc
 COMPATIBLE_MACHINE = "^rpi$"
 S = "${RPITOOLS_S}/armstubs"
 export CC8="${CC}"
 export LD8="${LD}"
 export OBJCOPY8="${OBJCOPY}"
 export OBJDUMP8="${OBJDUMP} -maarch64"
 do_compile() {
    [ -z "${ARMSTUB}" ] && bbfatal "No ARMSTUB defined for your machine."
    oe_runmake ${ARMSTUB}
 }
 do_deploy() {
    install -d ${DEPLOYDIR}/${PN}
    cp ${S}/armstub*.bin ${DEPLOYDIR}/${PN}
 }
 addtask deploy before do_build after do_install
 do_deploy[dirs] += "${DEPLOYDIR}/${PN}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
--- a/recipes-bsp/bootfiles/bcm2835-bootfiles.bb
+++ b/recipes-bsp/bootfiles/bcm2835-bootfiles.bb
@@ -1,15 +1,17 @@
 DESCRIPTION = "Closed source binary files to help boot the ARM on the BCM2835."
-LICENSE = "Proprietary"
+LICENSE = "Broadcom-RPi"
-LIC_FILES_CHKSUM = "file://LICENCE.broadcom;md5=e86e693d19572ee64cc8b17fb062faa9"
+LIC_FILES_CHKSUM = "file://LICENCE.broadcom;md5=c403841ff2837657b2ed8e5bb474ac8d"
-inherit deploy
+inherit deploy nopackages
-include recipes-bsp/common/firmware.inc
+include recipes-bsp/common/raspberrypi-firmware.inc
-RDEPENDS_${PN} = "rpi-config"
+INHIBIT_DEFAULT_DEPS = "1"
-COMPATIBLE_MACHINE = "raspberrypi"
+DEPENDS = "rpi-config"
 COMPATIBLE_MACHINE = "^rpi$"
 S = "${RPIFW_S}/boot"
@@ -32,7 +34,9 @@ do_deploy() {
    touch ${DEPLOYDIR}/${PN}/${PN}-${PV}.stamp
 }
-addtask deploy before do_package after do_install
+do_deploy[depends] += "rpi-config:do_deploy"
 addtask deploy before do_build after do_install
 do_deploy[dirs] += "${DEPLOYDIR}/${PN}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
--- a/recipes-bsp/bootfiles/rpi-config_git.bb
+++ b/recipes-bsp/bootfiles/rpi-config_git.bb
@@ -3,19 +3,29 @@ DESCRIPTION = "Commented config.txt file for the Raspberry Pi. \
               the ARM core is initialised. It can be used to set various \
               system configuration parameters."
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-COMPATIBLE_MACHINE = "raspberrypi"
+COMPATIBLE_MACHINE = "^rpi$"
-SRCREV = "5d2ca5f9bcb1b239c051e20c05a233fd79cf09d5"
+SRCREV = "648ffc470824c43eb0d16c485f4c24816b32cd6f"
 SRC_URI = "git://github.com/Evilpaul/RPi-config.git;protocol=git;branch=master \
          "
 S = "${WORKDIR}/git"
-PR = "r4"
+PR = "r5"
-inherit deploy
+INHIBIT_DEFAULT_DEPS = "1"
 PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
 PITFT22="${@bb.utils.contains("MACHINE_FEATURES", "pitft22", "1", "0", d)}"
 PITFT28r="${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "1", "0", d)}"
 PITFT35r="${@bb.utils.contains("MACHINE_FEATURES", "pitft35r", "1", "0", d)}"
 VC4GRAPHICS="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}"
 VC4DTBO ?= "vc4-kms-v3d"
 inherit deploy nopackages
 do_deploy() {
    install -d ${DEPLOYDIR}/bcm2835-bootfiles
@@ -23,25 +33,33 @@ do_deploy() {
    cp ${S}/config.txt ${DEPLOYDIR}/bcm2835-bootfiles/
    if [ -n "${KEY_DECODE_MPG2}" ]; then
-        sed -i '/#decode_MPG2/ c\decode_MPG2=${KEY_DECODE_MPG2}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        sed -i '/#decode_MPG2=/ c\decode_MPG2=${KEY_DECODE_MPG2}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${KEY_DECODE_WVC1}" ]; then
-        sed -i '/#decode_WVC1/ c\decode_WVC1=${KEY_DECODE_WVC1}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        sed -i '/#decode_WVC1=/ c\decode_WVC1=${KEY_DECODE_WVC1}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${DISABLE_OVERSCAN}" ]; then
-        sed -i '/#disable_overscan/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        sed -i '/#disable_overscan=/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ "${DISABLE_SPLASH}" = "1" ]; then
        sed -i '/#disable_splash=/ c\disable_splash=${DISABLE_SPLASH}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # Set overclocking options
    if [ -n "${ARM_FREQ}" ]; then
-        sed -i '/#arm_freq/ c\arm_freq=${ARM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        sed -i '/#arm_freq=/ c\arm_freq=${ARM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${GPU_FREQ}" ]; then
        sed -i '/#gpu_freq=/ c\gpu_freq=${GPU_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${CORE_FREQ}" ]; then
-        sed -i '/#core_freq/ c\core_freq=${CORE_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        sed -i '/#core_freq=/ c\core_freq=${CORE_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${SDRAM_FREQ}" ]; then
-        sed -i '/#sdram_freq/ c\sdram_freq=${SDRAM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        sed -i '/#sdram_freq=/ c\sdram_freq=${SDRAM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${OVER_VOLTAGE}" ]; then
-        sed -i '/#over_voltage/ c\over_voltage=${OVER_VOLTAGE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        sed -i '/#over_voltage=/ c\over_voltage=${OVER_VOLTAGE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # GPU memory
@@ -49,32 +67,152 @@ do_deploy() {
        sed -i '/#gpu_mem=/ c\gpu_mem=${GPU_MEM}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${GPU_MEM_256}" ]; then
-        sed -i '/#gpu_mem_256/ c\gpu_mem_256=${GPU_MEM_256}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        sed -i '/#gpu_mem_256=/ c\gpu_mem_256=${GPU_MEM_256}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${GPU_MEM_512}" ]; then
-        sed -i '/#gpu_mem_512/ c\gpu_mem_512=${GPU_MEM_512}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        sed -i '/#gpu_mem_512=/ c\gpu_mem_512=${GPU_MEM_512}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${GPU_MEM_1024}" ]; then
        sed -i '/#gpu_mem_1024=/ c\gpu_mem_1024=${GPU_MEM_1024}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # Set boot delay
    if [ -n "${BOOT_DELAY}" ]; then
        sed -i '/#boot_delay=/ c\boot_delay=${BOOT_DELAY}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${BOOT_DELAY_MS}" ]; then
        sed -i '/#boot_delay_ms=/ c\boot_delay_ms=${BOOT_DELAY_MS}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # Set HDMI and composite video options
    if [ -n "${HDMI_FORCE_HOTPLUG}" ]; then
        sed -i '/#hdmi_force_hotplug=/ c\hdmi_force_hotplug=${HDMI_FORCE_HOTPLUG}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${HDMI_DRIVE}" ]; then
        sed -i '/#hdmi_drive=/ c\hdmi_drive=${HDMI_DRIVE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${HDMI_GROUP}" ]; then
        sed -i '/#hdmi_group=/ c\hdmi_group=${HDMI_GROUP}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${HDMI_MODE}" ]; then
        sed -i '/#hdmi_mode=/ c\hdmi_mode=${HDMI_MODE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${CONFIG_HDMI_BOOST}" ]; then
        sed -i '/#config_hdmi_boost=/ c\config_hdmi_boost=${CONFIG_HDMI_BOOST}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${SDTV_MODE}" ]; then
        sed -i '/#sdtv_mode=/ c\sdtv_mode=${SDTV_MODE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${SDTV_ASPECT}" ]; then
        sed -i '/#sdtv_aspect=/ c\sdtv_aspect=${SDTV_ASPECT}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ -n "${DISPLAY_ROTATE}" ]; then
        sed -i '/#display_rotate=/ c\display_rotate=${DISPLAY_ROTATE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # Video camera support
-    if [ -n "${VIDEO_CAMERA}" ]; then
+    if [ "${VIDEO_CAMERA}" = "1" ]; then
        echo "# Enable video camera" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "start_x=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # Offline compositing support
-    if [ -n "${DISPMANX_OFFLINE}" ]; then
+    if [ "${DISPMANX_OFFLINE}" = "1" ]; then
        echo "# Enable offline compositing" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "dispmanx_offline=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # SPI bus support
-    if [ -n "${ENABLE_SPI_BUS}" ]; then
+    if [ "${ENABLE_SPI_BUS}" = "1" ] || [ "${PITFT}" = "1" ]; then
        echo "# Enable SPI bus" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "dtparam=spi=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # I2C support
    if [ "${ENABLE_I2C}" = "1" ] || [ "${PITFT}" = "1" ]; then
        echo "# Enable I2C" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "dtparam=i2c1=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "dtparam=i2c_arm=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # PiTFT22 display support
    if [ "${PITFT22}" = "1" ]; then
        echo "# Enable PITFT22 display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "dtoverlay=pitft22,rotate=270,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ "${PITFT28r}" = "1" ]; then
        echo "# Enable PITFT28r display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "dtoverlay=pitft28-resistive,rotate=90,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    if [ "${PITFT35r}" = "1" ]; then
        echo "# Enable PITFT35r display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "dtoverlay=pitft35-resistive,rotate=90,speed=42000000,fps=20" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # UART support
    if [ "${ENABLE_UART}" = "1" ]; then
        echo "# Enable UART" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "enable_uart=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # VC4 Graphics support
    if [ "${VC4GRAPHICS}" = "1" ]; then
        echo "# Enable VC4 Graphics" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "dtoverlay=${VC4DTBO}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # Waveshare "C" 1024x600 7" Rev2.1 IPS capacitive touch (http://www.waveshare.com/7inch-HDMI-LCD-C.htm)
    if [ "${WAVESHARE_1024X600_C_2_1}" = "1" ]; then
        echo "# Waveshare \"C\" 1024x600 7\" Rev2.1 IPS capacitive touch screen" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "max_usb_current=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "hdmi_group=2" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "hdmi_mode=87" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "hdmi_cvt 1024 600 60 6 0 0 0" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "hdmi_drive=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # DWC2 USB peripheral support
    if [ "${ENABLE_DWC2_PERIPHERAL}" = "1" ]; then
        echo "# Enable USB peripheral mode" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "dtoverlay=dwc2,dr_mode=peripheral" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # AT86RF23X support
    if [ "${ENABLE_AT86RF}" = "1" ]; then
        echo "# Enable AT86RF23X" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "dtoverlay=at86rf233,speed=3000000" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # ENABLE CAN
    if [ "${ENABLE_CAN}" = "1" ]; then
        echo "# Enable CAN" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "dtoverlay=mcp2515-can0,oscillator=16000000,interrupt=25" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    fi
    # Append extra config if the user has provided any
    printf "${RPI_EXTRA_CONFIG}\n" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    # Handle setup with armstub file
    if [ "${@bb.utils.contains("MACHINE_FEATURES", "armstub", "1", "0", d)}" = "1" ]; then
        echo "\n# ARM stub configuration" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        echo "armstub=${ARMSTUB}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
        case "${ARMSTUB}" in
            *-gic.bin)
                echo  "enable_gic=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
                ;;
        esac
    fi
 }
-addtask deploy before do_package after do_install
+do_deploy_append_raspberrypi3-64() {
    echo "# have a properly sized image" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    echo "disable_overscan=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    echo "# Enable audio (loads snd_bcm2835)" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
    echo "dtparam=audio=on" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
 }
 addtask deploy before do_build after do_install
 do_deploy[dirs] += "${DEPLOYDIR}/bcm2835-bootfiles"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
--- a/recipes-bsp/common/firmware.inc
+++ b/recipes-bsp/common/firmware.inc
@@ -1,8 +0,0 @@
 RPIFW_SRCREV ?= "f7108cfdc715f79c5fd051fb4c3ae6f4b1b01f23"
 RPIFW_DATE ?= "20151021"
 RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master"
 RPIFW_S ?= "${WORKDIR}/git"
 SRC_URI = "${RPIFW_SRC_URI}"
 SRCREV = "${RPIFW_SRCREV}"
 PV = "${RPIFW_DATE}"
--- a/recipes-bsp/common/raspberrypi-firmware.inc
+++ b/recipes-bsp/common/raspberrypi-firmware.inc
@@ -0,0 +1,10 @@
 RPIFW_DATE ?= "20191210"
 SRCREV ?= "9d6be5b07e81bdfb9c4b9a560e90fbc7477fdc6e"
 RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/${SRCREV}.tar.gz"
 RPIFW_S ?= "${WORKDIR}/firmware-${SRCREV}"
 SRC_URI = "${RPIFW_SRC_URI}"
 SRC_URI[md5sum] = "645e812765c8b4ca05d6cb47a1f67ab0"
 SRC_URI[sha256sum] = "484d52caed909fcafbf593cc3e726ea44a9218db7f0aeec843b825797eb9b0fc"
 PV = "${RPIFW_DATE}"
--- a/recipes-bsp/common/raspberrypi-tools.inc
+++ b/recipes-bsp/common/raspberrypi-tools.inc
@@ -0,0 +1,9 @@
 SRCREV ?= "76f64a28dc4685507d12f57fe5cfc89f6c32f8e6"
 RPITOOLS_SRC_URI ?= "https://github.com/raspberrypi/tools/archive/${SRCREV}.tar.gz"
 RPITOOLS_S ?= "${WORKDIR}/tools-${SRCREV}"
 SRC_URI = "${RPITOOLS_SRC_URI}"
 SRC_URI[md5sum] = "e2d4709b62e1536aeaaeabcbae82a03e"
 SRC_URI[sha256sum] = "5f1c5eb8af9dff71b7cae30ffa6541d689d269a7b86013b365215adfb4c1c27d"
 PV = "0.0+git${SRCREV}"
--- a/recipes-bsp/formfactor/formfactor/raspberrypi/machconfig
+++ b/recipes-bsp/formfactor/formfactor/raspberrypi/machconfig
--- a/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/recipes-bsp/formfactor/formfactor_0.0.bbappend
--- a/recipes-bsp/rpi-mkimage/rpi-mkimage/License
+++ b/recipes-bsp/rpi-mkimage/rpi-mkimage/License
@@ -1,25 +0,0 @@
 Copyright (c) 2012, Broadcom Europe Ltd
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
    * Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright
      notice, this list of conditions and the following disclaimer in the
      documentation and/or other materials provided with the distribution.
    * Neither the name of the copyright holder nor the
      names of its contributors may be used to endorse or promote products
      derived from this software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
+++ b/recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
@@ -1,17 +0,0 @@
 When using open, use path relative to imagetool-uncompressed.py
 Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
 Index: git/mkimage/imagetool-uncompressed.py
 ===================================================================
 --- a/mkimage/imagetool-uncompressed.py
 +++ b/mkimage/imagetool-uncompressed.py
@@ -18,7 +18,7 @@ re_line = re.compile(r"0x(?P<value>[0-9a
 mem = [0 for i in range(32768)]
 def load_to_mem(name, addr):
 -   f = open(name)
 +   f = open(os.path.dirname(__file__) + '/' + name)
    for l in f.readlines():
       m = re_line.match(l)
--- a/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
+++ b/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
@@ -1,22 +0,0 @@
 SUMMARY = "RaspberryPi tool to produce kernel.img"
 LICENSE = "Broadcom"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/License;md5=957f6640d5e2d2acfce73a36a56cb32f"
 SECTION = "bootloader"
 DEPENDS = "python"
 SRCREV = "f5642106425d430e1f82ee064121a5fd0e05a386"
 SRC_URI = " \
    git://github.com/raspberrypi/tools.git;branch=master;protocol=git \
    file://License \
    file://open-files-relative-to-script.patch \
 "
 S = "${WORKDIR}/git"
 do_install () {
    install -d ${D}${libexecdir}
    cp ./mkimage/* ${D}${libexecdir}
 }
 BBCLASSEXTEND = "native"
--- a/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.in
+++ b/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.in
@@ -0,0 +1,3 @@
 fdt addr ${fdt_addr} && fdt get value bootargs /chosen bootargs
 fatload mmc 0:1 ${kernel_addr_r} @@KERNEL_IMAGETYPE@@
@@KERNEL_BOOTCMD@@ ${kernel_addr_r} - ${fdt_addr}
--- a/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb
+++ b/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb
@@ -0,0 +1,26 @@
 SUMMARY = "U-boot boot scripts for Raspberry Pi"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 COMPATIBLE_MACHINE = "^rpi$"
 DEPENDS = "u-boot-mkimage-native"
 INHIBIT_DEFAULT_DEPS = "1"
 SRC_URI = "file://boot.cmd.in"
 do_compile() {
    sed -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \
        -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \
        "${WORKDIR}/boot.cmd.in" > "${WORKDIR}/boot.cmd"
    mkimage -A arm -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr
 }
 inherit deploy nopackages
 do_deploy() {
    install -d ${DEPLOYDIR}
    install -m 0644 boot.scr ${DEPLOYDIR}
 }
 addtask do_deploy after do_compile before do_build
--- a/recipes-bsp/u-boot/u-boot-2019.07/0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch
+++ b/recipes-bsp/u-boot/u-boot-2019.07/0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch
@@ -0,0 +1,104 @@
 From 5bf85d04b440ce874310e701abded823dc1864bc Mon Sep 17 00:00:00 2001
 From: Andrei Gherzan <andrei@balena.io>
 Date: Wed, 17 Jul 2019 15:32:11 +0100
 Subject: [PATCH 1/7] configs: rpi4: Add defconfigs for rpi4 (32/64)
 This defines a minimum defconfig for each of the two Raspberry Pi 4
 variants. One notable difference is that we don't have a embedded dt for
 this board given that the fw supplies us with one which we can reuse.
 Furthermore, the ram size is not queryable through mbox interface as the
 maximum reported size is 1G. The fw patches the dt with the right
 memory configuration and uboot uses it as it is. We avoid u-boot
 touching this configuration by making sure CONFIG_ARCH_FIXUP_FDT_MEMORY
 is deactivated.
 Signed-off-by: Andrei Gherzan <andrei@balena.io>
 Upstream-status: Pending
 ---
 configs/rpi_4_32b_defconfig | 33 +++++++++++++++++++++++++++++++++
 configs/rpi_4_defconfig     | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 configs/rpi_4_32b_defconfig
 create mode 100644 configs/rpi_4_defconfig
 diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
 new file mode 100644
 index 0000000000..a31a617a5f
 --- /dev/null
 +++ b/configs/rpi_4_32b_defconfig
@@ -0,0 +1,33 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_BCM283X=y
 +CONFIG_SYS_TEXT_BASE=0x00008000
 +CONFIG_TARGET_RPI_4_32B=y
 +CONFIG_SYS_MALLOC_F_LEN=0x2000
 +CONFIG_DISTRO_DEFAULTS=y
 +CONFIG_NR_DRAM_BANKS=1
 +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
 +CONFIG_OF_BOARD=y
 +CONFIG_OF_BOARD_SETUP=y
 +CONFIG_MISC_INIT_R=y
 +# CONFIG_DISPLAY_CPUINFO is not set
 +# CONFIG_DISPLAY_BOARDINFO is not set
 +CONFIG_SYS_PROMPT="U-Boot> "
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_CMD_GPIO=y
 +CONFIG_CMD_MMC=y
 +CONFIG_CMD_FS_UUID=y
 +CONFIG_ENV_FAT_INTERFACE="mmc"
 +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 +CONFIG_DM_KEYBOARD=y
 +CONFIG_DM_MMC=y
 +CONFIG_MMC_SDHCI=y
 +CONFIG_MMC_SDHCI_BCM2835=y
 +CONFIG_PINCTRL=y
 +# CONFIG_PINCTRL_GENERIC is not set
 +# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 +CONFIG_DM_VIDEO=y
 +CONFIG_SYS_WHITE_ON_BLACK=y
 +CONFIG_CONSOLE_SCROLL_LINES=10
 +CONFIG_PHYS_TO_BUS=y
 +CONFIG_OF_LIBFDT_OVERLAY=y
 diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
 new file mode 100644
 index 0000000000..da8c960a2a
 --- /dev/null
 +++ b/configs/rpi_4_defconfig
@@ -0,0 +1,33 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_BCM283X=y
 +CONFIG_SYS_TEXT_BASE=0x00080000
 +CONFIG_TARGET_RPI_4=y
 +CONFIG_SYS_MALLOC_F_LEN=0x2000
 +CONFIG_DISTRO_DEFAULTS=y
 +CONFIG_NR_DRAM_BANKS=1
 +# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
 +CONFIG_OF_BOARD=y
 +CONFIG_OF_BOARD_SETUP=y
 +CONFIG_MISC_INIT_R=y
 +# CONFIG_DISPLAY_CPUINFO is not set
 +# CONFIG_DISPLAY_BOARDINFO is not set
 +CONFIG_SYS_PROMPT="U-Boot> "
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_CMD_GPIO=y
 +CONFIG_CMD_MMC=y
 +CONFIG_CMD_FS_UUID=y
 +CONFIG_ENV_FAT_INTERFACE="mmc"
 +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 +CONFIG_DM_KEYBOARD=y
 +CONFIG_DM_MMC=y
 +CONFIG_MMC_SDHCI=y
 +CONFIG_MMC_SDHCI_BCM2835=y
 +CONFIG_PINCTRL=y
 +# CONFIG_PINCTRL_GENERIC is not set
 +# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 +CONFIG_DM_VIDEO=y
 +CONFIG_SYS_WHITE_ON_BLACK=y
 +CONFIG_CONSOLE_SCROLL_LINES=10
 +CONFIG_PHYS_TO_BUS=y
 +CONFIG_OF_LIBFDT_OVERLAY=y
 -- 
 2.22.0
--- a/recipes-bsp/u-boot/u-boot-2019.07/0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch
+++ b/recipes-bsp/u-boot/u-boot-2019.07/0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch
@@ -0,0 +1,105 @@
 From df2aa4c6be33b468adc09de337a055556d1f37fb Mon Sep 17 00:00:00 2001
 From: Matthias Brugger <mbrugger@suse.com>
 Date: Fri, 12 Jul 2019 18:20:53 +0200
 Subject: [PATCH 2/7] ARM: bcm283x: Add BCM283x_BASE define
 Devices of bcm283x have different base address, depending if they are on
 bcm2835 or bcm2836/7. Use BCM283x_BASE depending on the SoC you want to
 build and only add the offset in the header files.
 Signed-off-by: Matthias Brugger <mbrugger@suse.com>
 Signed-off-by: Andrei Gherzan <andrei@balena.io>
 Upstream-status: Pending
 ---
 arch/arm/mach-bcm283x/Kconfig              | 5 +++++
 arch/arm/mach-bcm283x/include/mach/mbox.h  | 6 +-----
 arch/arm/mach-bcm283x/include/mach/sdhci.h | 6 +-----
 arch/arm/mach-bcm283x/include/mach/timer.h | 6 +-----
 arch/arm/mach-bcm283x/include/mach/wdog.h  | 6 +-----
 5 files changed, 9 insertions(+), 20 deletions(-)
 diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
 index 3eb5a9a897..8e69914a83 100644
 --- a/arch/arm/mach-bcm283x/Kconfig
 +++ b/arch/arm/mach-bcm283x/Kconfig
@@ -141,4 +141,9 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "rpi"
 +config BCM283x_BASE
 +	hex
 +	default "0x20000000" if BCM2835
 +	default "0x3f000000" if BCM2836 || BCM2837
 +
 endmenu
 diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
 index e3a893e49c..e44c7577da 100644
 --- a/arch/arm/mach-bcm283x/include/mach/mbox.h
 +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
@@ -37,11 +37,7 @@
 /* Raw mailbox HW */
 -#ifndef CONFIG_BCM2835
 -#define BCM2835_MBOX_PHYSADDR	0x3f00b880
 -#else
 -#define BCM2835_MBOX_PHYSADDR	0x2000b880
 -#endif
 +#define BCM2835_MBOX_PHYSADDR	(CONFIG_BCM283x_BASE + 0x0000b880)
 struct bcm2835_mbox_regs {
 	u32 read;
 diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h
 index 5cb6ec3340..b443c379d8 100644
 --- a/arch/arm/mach-bcm283x/include/mach/sdhci.h
 +++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h
@@ -6,11 +6,7 @@
 #ifndef _BCM2835_SDHCI_H_
 #define _BCM2835_SDHCI_H_
 -#ifndef CONFIG_BCM2835
 -#define BCM2835_SDHCI_BASE 0x3f300000
 -#else
 -#define BCM2835_SDHCI_BASE 0x20300000
 -#endif
 +#define BCM2835_SDHCI_BASE (CONFIG_BCM283x_BASE + 0x00300000)
 int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq);
 diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h
 index 56b0c356bb..014355e759 100644
 --- a/arch/arm/mach-bcm283x/include/mach/timer.h
 +++ b/arch/arm/mach-bcm283x/include/mach/timer.h
@@ -6,11 +6,7 @@
 #ifndef _BCM2835_TIMER_H
 #define _BCM2835_TIMER_H
 -#ifndef CONFIG_BCM2835
 -#define BCM2835_TIMER_PHYSADDR	0x3f003000
 -#else
 -#define BCM2835_TIMER_PHYSADDR	0x20003000
 -#endif
 +#define BCM2835_TIMER_PHYSADDR	(CONFIG_BCM283x_BASE + 0x00003000)
 #define BCM2835_TIMER_CS_M3	(1 << 3)
 #define BCM2835_TIMER_CS_M2	(1 << 2)
 diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h
 index 99c88e5df7..00b5e06c3a 100644
 --- a/arch/arm/mach-bcm283x/include/mach/wdog.h
 +++ b/arch/arm/mach-bcm283x/include/mach/wdog.h
@@ -6,11 +6,7 @@
 #ifndef _BCM2835_WDOG_H
 #define _BCM2835_WDOG_H
 -#ifndef CONFIG_BCM2835
 -#define BCM2835_WDOG_PHYSADDR			0x3f100000
 -#else
 -#define BCM2835_WDOG_PHYSADDR			0x20100000
 -#endif
 +#define BCM2835_WDOG_PHYSADDR 			(CONFIG_BCM283x_BASE + 0x00100000)
 struct bcm2835_wdog_regs {
 	u32 unknown0[7];
 -- 
 2.22.0
--- a/recipes-bsp/u-boot/u-boot-2019.07/0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch
+++ b/recipes-bsp/u-boot/u-boot-2019.07/0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch
@@ -0,0 +1,108 @@
 From c03f551cab8fe38de8f0e1781f0e2e339419b003 Mon Sep 17 00:00:00 2001
 From: Andrei Gherzan <andrei@balena.io>
 Date: Wed, 17 Jul 2019 15:33:01 +0100
 Subject: [PATCH 3/7] arm: mach-bcm283x: Define configs for RaspberryPi 4
 Define two target configs for Raspberry Pi 4 (32 and 64bit) and the
 corresponding BCM2838* configs.
 Be aware of the current limitation in firmware which requires an
 explicit configuration to force the arm in 64bit mode when the
 respective target is used.
 Signed-off-by: Andrei Gherzan <andrei@balena.io>
 Signed-off-by: Matthias Brugger <mbrugger@suse.com>
 Upstream-status: Pending
 ---
 arch/arm/mach-bcm283x/Kconfig | 62 +++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
 index 8e69914a83..09a5b42bbb 100644
 --- a/arch/arm/mach-bcm283x/Kconfig
 +++ b/arch/arm/mach-bcm283x/Kconfig
@@ -26,6 +26,23 @@ config BCM2837_64B
 	select BCM2837
 	select ARM64
 +config BCM2838
 +	bool "Broadcom BCM2838 SoC support"
 +	depends on ARCH_BCM283X
 +
 +config BCM2838_32B
 +	bool "Broadcom BCM2838 SoC 32-bit support"
 +	depends on ARCH_BCM283X
 +	select BCM2838
 +	select ARMV7_LPAE
 +	select CPU_V7A
 +
 +config BCM2838_64B
 +	bool "Broadcom BCM2838 SoC 64-bit support"
 +	depends on ARCH_BCM283X
 +	select BCM2838
 +	select ARM64
 +
 menu "Broadcom BCM283X family"
 	depends on ARCH_BCM283X
@@ -127,6 +144,50 @@ config TARGET_RPI_3
 	  This option creates a build targeting the ARMv8/AArch64 ISA.
 	select BCM2837_64B
 +config TARGET_RPI_4_32B
 +	bool "Raspberry Pi 4 32-bit build"
 +	help
 +	  Support for all BCM2838-based Raspberry Pi variants, such as
 +	  the RPi 4 model B, in AArch32 (32-bit) mode.
 +
 +	  This option assumes the VideoCore firmware is configured to use the
 +	  mini UART (rather than PL011) for the serial console. This is the
 +	  default on the RPi 4. To enable the UART console, the following non-
 +	  default option must be present in config.txt: enable_uart=1. This is
 +	  required for U-Boot to operate correctly, even if you only care
 +	  about the HDMI/usbkbd console.
 +
 +	  Due to hardware incompatibilities, this can't be used with
 +	  BCM283/5/6/7.
 +
 +	  This option creates a build targeting the ARMv7/AArch32 ISA.
 +	select BCM2838_32B
 +
 +config TARGET_RPI_4
 +	bool "Raspberry Pi 4 64-bit build"
 +	help
 +	  Support for all BCM2838-based Raspberry Pi variants, such as
 +	  the RPi 4 model B, in AArch64 (64-bit) mode.
 +
 +	  This option assumes the VideoCore firmware is configured to use the
 +	  mini UART (rather than PL011) for the serial console. This is the
 +	  default on the RPi 4. To enable the UART console, the following non-
 +	  default option must be present in config.txt: enable_uart=1. This is
 +	  required for U-Boot to operate correctly, even if you only care
 +	  about the HDMI/usbkbd console.
 +
 +	  Due to hardware incompatibilities, this can't be used with
 +	  BCM283/5/6/7.
 +
 +	  Also, due to a bug in firmware, switching to 64bit mode doesn't
 +	  happen automatically based on the kernel's image filename. See
 +	  https://github.com/raspberrypi/firmware/issues/1193 for more details.
 +	  Until that is resolved, the configuration (config.txt) needs to
 +	  explicitly set: arm_64bit=1.
 +
 +	  This option creates a build targeting the ARMv8/AArch64 ISA.
 +	select BCM2838_64B
 +
 endchoice
 config SYS_BOARD
@@ -145,5 +206,6 @@ config BCM283x_BASE
 	hex
 	default "0x20000000" if BCM2835
 	default "0x3f000000" if BCM2836 || BCM2837
 +	default "0xfe000000" if BCM2838
 endmenu
 -- 
 2.22.0
--- a/recipes-bsp/u-boot/u-boot-2019.07/0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch
+++ b/recipes-bsp/u-boot/u-boot-2019.07/0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch
@@ -0,0 +1,33 @@
 From 12fbbd5bc12e225b19d3b4cb193a1bf3d9fa752a Mon Sep 17 00:00:00 2001
 From: Andrei Gherzan <andrei@balena.io>
 Date: Wed, 17 Jul 2019 15:34:18 +0100
 Subject: [PATCH 4/7] rpi: Add entry for Raspberry Pi 4 model B
 The Raspebrry Pi 4 uses the new revision code scheme as documented by
 the foundation. This change adds an entry for this board as well.
 Signed-off-by: Andrei Gherzan <andrei@balena.io>
 Upstream-status: Pending
 ---
 board/raspberrypi/rpi/rpi.c | 5 +++++
 1 file changed, 5 insertions(+)
 diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
 index 617c892dde..92c6534da6 100644
 --- a/board/raspberrypi/rpi/rpi.c
 +++ b/board/raspberrypi/rpi/rpi.c
@@ -148,6 +148,11 @@ static const struct rpi_model rpi_models_new_scheme[] = {
 		DTB_DIR "bcm2837-rpi-cm3.dtb",
 		false,
 	},
 +	[0x11] = {
 +		"4 Model B",
 +		DTB_DIR "bcm2838-rpi-4-b.dtb",
 +		true,
 +	},
 };
 static const struct rpi_model rpi_models_old_scheme[] = {
 -- 
 2.22.0
--- a/recipes-bsp/u-boot/u-boot-2019.07/0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch
+++ b/recipes-bsp/u-boot/u-boot-2019.07/0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch
@@ -0,0 +1,30 @@
 From fd99a249e6faf234066a6b5da2ed34aaead3d6d9 Mon Sep 17 00:00:00 2001
 From: Andrei Gherzan <andrei@balena.io>
 Date: Fri, 12 Jul 2019 11:26:10 +0100
 Subject: [PATCH 5/7] arm: bcm283x: Include definition for additional emmc
 clock
 This clock has a different mbox ID so have this included in the relevant
 header file.
 Signed-off-by: Andrei Gherzan <andrei@balena.io>
 Upstream-status: Pending
 ---
 arch/arm/mach-bcm283x/include/mach/mbox.h | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
 index e44c7577da..f2a98acddd 100644
 --- a/arch/arm/mach-bcm283x/include/mach/mbox.h
 +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
@@ -230,6 +230,7 @@ struct bcm2835_mbox_tag_set_power_state {
 #define BCM2835_MBOX_CLOCK_ID_SDRAM	8
 #define BCM2835_MBOX_CLOCK_ID_PIXEL	9
 #define BCM2835_MBOX_CLOCK_ID_PWM	10
 +#define BCM2835_MBOX_CLOCK_ID_EMMC2	12
 struct bcm2835_mbox_tag_get_clock_rate {
 	struct bcm2835_mbox_tag_hdr tag_hdr;
 -- 
 2.22.0
--- a/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch
+++ b/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch
@@ -0,0 +1,53 @@
 From 1f42758fe69648340cfae6cae98e667b88923cf6 Mon Sep 17 00:00:00 2001
 From: Matthias Brugger <mbrugger@suse.com>
 Date: Wed, 10 Jul 2019 13:24:36 +0200
 Subject: [PATCH 6/7] mmc: bcm2835_sdhci: Add support for bcm2711 device
 The bcm2711 has two emmc controller. The difference is the clocks
 they use. Add support for the second emmc contoller.
 Signed-off-by: Matthias Brugger <mbrugger@suse.com>
 Signed-off-by: Andrei Gherzan <andrei@balena.io>
 Upstream-status: Pending
 ---
 drivers/mmc/bcm2835_sdhci.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
 diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
 index 08bddd410e..e68dec3be7 100644
 --- a/drivers/mmc/bcm2835_sdhci.c
 +++ b/drivers/mmc/bcm2835_sdhci.c
@@ -178,12 +178,13 @@ static int bcm2835_sdhci_probe(struct udevice *dev)
 	fdt_addr_t base;
 	int emmc_freq;
 	int ret;
 +	int clock_id = (int)dev_get_driver_data(dev);
 	base = devfdt_get_addr(dev);
 	if (base == FDT_ADDR_T_NONE)
 		return -EINVAL;
 -	ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC);
 +	ret = bcm2835_get_mmc_clock(clock_id);
 	if (ret < 0) {
 		debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret);
 		return ret;
@@ -228,7 +229,14 @@ static int bcm2835_sdhci_probe(struct udevice *dev)
 }
 static const struct udevice_id bcm2835_sdhci_match[] = {
 -	{ .compatible = "brcm,bcm2835-sdhci" },
 +	{
 +		.compatible = "brcm,bcm2835-sdhci",
 +		.data = BCM2835_MBOX_CLOCK_ID_EMMC
 +	},
 +	{
 +		.compatible = "brcm,bcm2711-emmc2",
 +		.data = BCM2835_MBOX_CLOCK_ID_EMMC2
 +	},
 	{ /* sentinel */ }
 };
 -- 
 2.22.0
--- a/recipes-bsp/u-boot/u-boot-2019.07/0007-rpi-Add-memory-map-for-bcm2838.patch
+++ b/recipes-bsp/u-boot/u-boot-2019.07/0007-rpi-Add-memory-map-for-bcm2838.patch
@@ -0,0 +1,62 @@
 From 76b656349a6786fa81cf69ac7762c31675cd567e Mon Sep 17 00:00:00 2001
 From: Andrei Gherzan <andrei@balena.io>
 Date: Fri, 12 Jul 2019 14:27:31 +0100
 Subject: [PATCH 7/7] rpi: Add memory map for bcm2838
 Define the memory map for the BCM2838 based on the dt configuration
 available in the Raspberry Pi kernel fork.
 Signed-off-by: Andrei Gherzan <andrei@balena.io>
 Upstream-status: Pending
 ---
 board/raspberrypi/rpi/rpi.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)
 diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
 index 92c6534da6..bddf2a578d 100644
 --- a/board/raspberrypi/rpi/rpi.c
 +++ b/board/raspberrypi/rpi/rpi.c
@@ -249,7 +249,8 @@ static uint32_t rev_type;
 static const struct rpi_model *model;
 #ifdef CONFIG_ARM64
 -static struct mm_region bcm2837_mem_map[] = {
 +#ifndef CONFIG_BCM2838
 +static struct mm_region bcm283x_mem_map[] = {
 	{
 		.virt = 0x00000000UL,
 		.phys = 0x00000000UL,
@@ -268,8 +269,28 @@ static struct mm_region bcm2837_mem_map[] = {
 		0,
 	}
 };
 -
 -struct mm_region *mem_map = bcm2837_mem_map;
 +#else
 +static struct mm_region bcm283x_mem_map[] = {
 +	{
 +		.virt = 0x00000000UL,
 +		.phys = 0x00000000UL,
 +		.size = 0xfe000000UL,
 +		.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
 +			 PTE_BLOCK_INNER_SHARE
 +	}, {
 +		.virt = 0xfe000000UL,
 +		.phys = 0xfe000000UL,
 +		.size = 0x01800000UL,
 +		.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
 +			 PTE_BLOCK_NON_SHARE |
 +			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
 +	}, {
 +		/* List terminator */
 +		0,
 +	}
 +};
 +#endif
 +struct mm_region *mem_map = bcm283x_mem_map;
 #endif
 int dram_init(void)
 -- 
 2.22.0
--- a/recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend
+++ b/recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend
@@ -0,0 +1,2 @@
 # Apply the same patches for rpi4 as u-boot recipe
 require u-boot-rpi4-${PV}.inc
--- a/recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc
+++ b/recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc
@@ -0,0 +1,12 @@
 FILESEXTRAPATHS_prepend_raspberrypi4 := "${THISDIR}/u-boot-2019.07:"
 UBOOT_RPI4_SUPPORT_PATCHES = " \
    file://0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch \
    file://0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch \
    file://0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch \
    file://0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch \
    file://0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch \
    file://0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch \
    file://0007-rpi-Add-memory-map-for-bcm2838.patch \
 "
 SRC_URI_append_raspberrypi4 = "${UBOOT_RPI4_SUPPORT_PATCHES}"
--- a/recipes-bsp/u-boot/u-boot-rpi_git.bb
+++ b/recipes-bsp/u-boot/u-boot-rpi_git.bb
@@ -1,29 +0,0 @@
 DESCRIPTION = "U-Boot port for RaspberryPi"
 require recipes-bsp/u-boot/u-boot.inc
 DEPENDS += "rpi-mkimage-native"
 PROVIDES += "u-boot"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 SRCREV = "6709570cdc947c2a546f96d571551acf4474778c"
 SRC_URI = "git://github.com/gonzoua/u-boot-pi.git;branch=rpi"
 S = "${WORKDIR}/git"
 UBOOT_MACHINE = "rpi_b"
 UBOOT_MAKE_TARGET = "u-boot.bin"
 UBOOT_SUFFIX = "img"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "raspberrypi"
 do_compile_append() {
    # Create kernel.img from uboot.bin and name it u-boot.img
    ${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/imagetool-uncompressed.py u-boot.bin
    mv kernel.img u-boot.img
 }
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -0,0 +1 @@
 DEPENDS_append_rpi = " rpi-u-boot-scr"
--- a/recipes-bsp/u-boot/u-boot_2019.07.bbappend
+++ b/recipes-bsp/u-boot/u-boot_2019.07.bbappend
@@ -0,0 +1,2 @@
 # Apply the same patches for rpi4 as u-boot recipe
 require u-boot-rpi4-${PV}.inc
--- a/recipes-connectivity/bluez5/bluez5/0001-bcm43xx-Add-bcm43xx-3wire-variant.patch
+++ b/recipes-connectivity/bluez5/bluez5/0001-bcm43xx-Add-bcm43xx-3wire-variant.patch
@@ -0,0 +1,26 @@
 From b4f2b77472aeb967d3a7595e8a965785c7a37c87 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 16 Feb 2016 16:40:46 +0000
 Subject: [PATCH 1/4] bcm43xx: Add bcm43xx-3wire variant
 ---
 tools/hciattach.c | 3 +++
 1 file changed, 3 insertions(+)
 diff --git a/tools/hciattach.c b/tools/hciattach.c
 index 59a76a7..5861d33 100644
 --- a/tools/hciattach.c
 +++ b/tools/hciattach.c
@@ -1144,6 +1144,9 @@ struct uart_t uart[] = {
 	{ "bcm43xx",    0x0000, 0x0000, HCI_UART_H4,   115200, 3000000,
 				FLOW_CTL, DISABLE_PM, NULL, bcm43xx, NULL  },
 +	{ "bcm43xx-3wire",    0x0000, 0x0000, HCI_UART_3WIRE, 115200, 3000000,
 +				0, DISABLE_PM, NULL, bcm43xx, NULL  },
 +
 	{ "ath3k",    0x0000, 0x0000, HCI_UART_ATH3K, 115200, 115200,
 			FLOW_CTL, DISABLE_PM, NULL, ath3k_ps, ath3k_pm  },
 -- 
 1.9.1
--- a/recipes-connectivity/bluez5/bluez5/0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
+++ b/recipes-connectivity/bluez5/bluez5/0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
@@ -0,0 +1,37 @@
 From e145c9621f976063e5c573db1f2053d906f63427 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 16 Feb 2016 16:39:09 +0000
 Subject: [PATCH 2/4] bcm43xx: The UART speed must be reset after the firmware download
 ---
 tools/hciattach_bcm43xx.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 diff --git a/tools/hciattach_bcm43xx.c b/tools/hciattach_bcm43xx.c
 index 81f38cb..0b792e0 100644
 --- a/tools/hciattach_bcm43xx.c
 +++ b/tools/hciattach_bcm43xx.c
@@ -366,11 +366,8 @@ int bcm43xx_init(int fd, int def_speed, int speed, struct termios *ti,
 		return -1;
 	if (bcm43xx_locate_patch(FIRMWARE_DIR, chip_name, fw_path)) {
 -		fprintf(stderr, "Patch not found, continue anyway\n");
 +		fprintf(stderr, "Patch not found for %s, continue anyway\n", chip_name);
 	} else {
 -		if (bcm43xx_set_speed(fd, ti, speed))
 -			return -1;
 -
 		if (bcm43xx_load_firmware(fd, fw_path))
 			return -1;
@@ -380,6 +377,7 @@ int bcm43xx_init(int fd, int def_speed, int speed, struct termios *ti,
 			return -1;
 		}
 +		sleep(1);
 		if (bcm43xx_reset(fd))
 			return -1;
 	}
 -- 
 1.9.1
--- a/recipes-connectivity/bluez5/bluez5/0003-Increase-firmware-load-timeout-to-30s.patch
+++ b/recipes-connectivity/bluez5/bluez5/0003-Increase-firmware-load-timeout-to-30s.patch
@@ -0,0 +1,25 @@
 From d41dc2046dd08d8c95197f677e224506f5b39bdd Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Wed, 20 Jan 2016 16:00:37 +0000
 Subject: [PATCH 3/4] Increase firmware load timeout to 30s
 ---
 tools/hciattach.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/tools/hciattach.c b/tools/hciattach.c
 index 5861d33..4141796 100644
 --- a/tools/hciattach.c
 +++ b/tools/hciattach.c
@@ -1293,7 +1293,7 @@ int main(int argc, char *argv[])
 {
 	struct uart_t *u = NULL;
 	int detach, printpid, raw, opt, i, n, ld, err;
 -	int to = 10;
 +	int to = 30;
 	int init_speed = 0;
 	int send_break = 0;
 	pid_t pid;
 -- 
 1.9.1
--- a/recipes-connectivity/bluez5/bluez5/0004-Move-the-43xx-firmware-into-lib-firmware.patch
+++ b/recipes-connectivity/bluez5/bluez5/0004-Move-the-43xx-firmware-into-lib-firmware.patch
@@ -0,0 +1,25 @@
 From 76681284b0ea49852041fdb97a35175089a08781 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 23 Feb 2016 17:52:29 +0000
 Subject: [PATCH 4/4] Move the 43xx firmware into /lib/firmware
 ---
 tools/hciattach_bcm43xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/tools/hciattach_bcm43xx.c b/tools/hciattach_bcm43xx.c
 index 0b792e0..207f668 100644
 --- a/tools/hciattach_bcm43xx.c
 +++ b/tools/hciattach_bcm43xx.c
@@ -43,7 +43,7 @@
 #include "hciattach.h"
 #ifndef FIRMWARE_DIR
 -#define FIRMWARE_DIR "/etc/firmware"
 +#define FIRMWARE_DIR "/lib/firmware"
 #endif
 #define FW_EXT ".hcd"
 -- 
 1.9.1
--- a/recipes-connectivity/bluez5/bluez5_%.bbappend
+++ b/recipes-connectivity/bluez5/bluez5_%.bbappend
@@ -0,0 +1,10 @@
 FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:"
 SRC_URI_append_rpi = "\
    file://0001-bcm43xx-Add-bcm43xx-3wire-variant.patch \
    file://0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch \
    file://0003-Increase-firmware-load-timeout-to-30s.patch \
    file://0004-Move-the-43xx-firmware-into-lib-firmware.patch \
 "
 RDEPENDS_${PN}_append_rpi = " pi-bluetooth"
--- a/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch
+++ b/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch
@@ -0,0 +1,28 @@
 From af91c96951a11f81f5cea88a0010161592c89310 Mon Sep 17 00:00:00 2001
 From: "Peter A. Bigot" <pab@pabigot.com>
 Date: Wed, 14 Nov 2018 09:19:51 -0600
 Subject: [PATCH] bthelper: correct path for hciconfig under Yocto
 Upstream-Status: Inapproprate [OE-specific]
 Signed-off-by: Peter A. Bigot <pab@pabigot.com>
 ---
 usr/bin/bthelper | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/usr/bin/bthelper b/usr/bin/bthelper
 index 255fdeb..4e1a1a4 100755
 --- a/usr/bin/bthelper
 +++ b/usr/bin/bthelper
@@ -10,7 +10,7 @@ fi
 dev="$1"
 # Need to bring hci up before looking at MAC as it can be all zeros during init
 -/bin/hciconfig "$dev" up
 -/bin/hciconfig "$dev" |grep -q "BD Address: B8:27:EB:" || exit 0
 +/usr/bin/hciconfig "$dev" up
 +/usr/bin/hciconfig "$dev" |grep -q "BD Address: B8:27:EB:" || exit 0
 /usr/bin/hcitool -i "$dev" cmd 0x3f 0x1c 0x01 0x02 0x00 0x01 0x01 > /dev/null
 -- 
 2.17.1
--- a/recipes-connectivity/pi-bluetooth/pi-bluetooth_git.bb
+++ b/recipes-connectivity/pi-bluetooth/pi-bluetooth_git.bb
@@ -0,0 +1,46 @@
 SUMMARY = "Script to properly configure BT-HCI on Raspberry Pi"
 HOMEPAGE = "https://github.com/RPi-Distro/pi-bluetooth"
 SECTION = "kernel"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "\
    file://debian/copyright;md5=6af8de3c8ee71f8e91e9b22f84ff2022 \
 "
 SRC_URI = "\
    git://github.com/RPi-Distro/pi-bluetooth \
    file://0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch \
 "
 SRCREV = "2e1a393955910aea67bbf3c921be35a66e8a8fbe"
 PV = "1.1+git${SRCPV}"
 S = "${WORKDIR}/git"
 # hciuart.service replaces what was brcm43438.service 
 inherit systemd
 SYSTEMD_SERVICE_${PN} = "\
    hciuart.service \
    bthelper@.service \
 "
 inherit allarch
 do_install() {
    install -d ${D}${sysconfdir}/udev/rules.d
    install -m 0644 ${S}/lib/udev/rules.d/* ${D}${sysconfdir}/udev/rules.d
    install -d ${D}${bindir}
    install -m 0755 ${S}/usr/bin/bthelper ${D}${bindir}
    install -m 0755 ${S}/usr/bin/btuart ${D}${bindir}
    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
        install -d ${D}${systemd_system_unitdir}
        install -m 0644 ${S}/debian/pi-bluetooth.bthelper@.service ${D}${systemd_system_unitdir}/bthelper@.service
        install -m 0644 ${S}/debian/pi-bluetooth.hciuart.service ${D}${systemd_system_unitdir}/hciuart.service
    fi
 }
 FILES_${PN} = "\
    ${bindir} \
    ${sysconfdir} \
    ${systemd_unitdir}/system \
 "
--- a/recipes-core/images/rpi-basic-image.bb
+++ b/recipes-core/images/rpi-basic-image.bb
@@ -1,6 +1,15 @@
-# Base this image on rpi-hwup-image
+# Base this image on core-image-minimal
-include rpi-hwup-image.bb
+include recipes-core/images/core-image-minimal.bb
 # Include modules in rootfs
 IMAGE_INSTALL += " \
 	kernel-modules \
 	"
 SPLASH = "psplash-raspberrypi"
 IMAGE_FEATURES += "ssh-server-dropbear splash"
 do_image_prepend() {
    bb.warn("The image 'rpi-basic-image' is deprecated, please use 'core-image-base' instead")
 }
--- a/recipes-core/images/rpi-hwup-image.bb
+++ b/recipes-core/images/rpi-hwup-image.bb
@@ -5,3 +5,7 @@ include recipes-core/images/core-image-minimal.bb
 IMAGE_INSTALL += " \
 	kernel-modules \
 	"
 do_image_prepend() {
    bb.warn("The image 'rpi-hwup-image' is deprecated, please use 'core-image-base' instead")
 }
--- a/recipes-core/images/rpi-test-image.bb
+++ b/recipes-core/images/rpi-test-image.bb
@@ -1,4 +1,6 @@
-# Base this image on rpi-basic-image
+# Base this image on core-image-base
-include rpi-basic-image.bb
+include recipes-core/images/core-image-base.bb
 COMPATIBLE_MACHINE = "^rpi$"
 IMAGE_INSTALL_append = " packagegroup-rpi-test"
--- a/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
+++ b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
@@ -0,0 +1,2 @@
 # mesa-demos needs gles1 and userland driver does not have it, works ok with vc4 graphics driver
 X11GLTOOLS_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}"
--- a/recipes-core/packagegroups/packagegroup-rpi-test.bb
+++ b/recipes-core/packagegroups/packagegroup-rpi-test.bb
@@ -1,20 +1,30 @@
 DESCRIPTION = "RaspberryPi Test Packagegroup"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 inherit packagegroup
 COMPATIBLE_MACHINE = "^rpi$"
 OMXPLAYER  = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'omxplayer', d)}"
 RDEPENDS_${PN} = "\
-    omxplayer \
+    ${OMXPLAYER} \
    bcm2835-tests \
    wiringpi \
    rpio \
    rpi-gpio \
    pi-blaster \
    python3-rtimu \
    python3-sense-hat \
    connman \
    connman-client \
    wireless-regdb \
    bluez5 \
 "
 RRECOMMENDS_${PN} = "\
    bigbuckbunny-1080p \
    bigbuckbunny-480p \
    bigbuckbunny-720p \
    ${MACHINE_EXTRA_RRECOMMENDS} \
 "
--- a/recipes-core/psplash/psplash_%.bbappend
+++ b/recipes-core/psplash/psplash_%.bbappend
@@ -0,0 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SPLASH_IMAGES_append_rpi = " file://psplash-raspberrypi-img.h;outsuffix=raspberrypi"
 ALTERNATIVE_PRIORITY_psplash-raspberrypi[psplash] = "200"
--- a/recipes-core/psplash/psplash_git.bbappend
+++ b/recipes-core/psplash/psplash_git.bbappend
@@ -1,2 +0,0 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SPLASH_IMAGES += "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi"
--- a/recipes-core/udev/udev-rules-rpi.bb
+++ b/recipes-core/udev/udev-rules-rpi.bb
@@ -0,0 +1,18 @@
 DESCRIPTION = "udev rules for Raspberry Pi Boards"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 SRC_URI = " \
 	file://99-com.rules \
 	file://can.rules \
 	"
 S = "${WORKDIR}"
 INHIBIT_DEFAULT_DEPS = "1"
 do_install () {
    install -d ${D}${sysconfdir}/udev/rules.d
    install -m 0644 ${WORKDIR}/99-com.rules ${D}${sysconfdir}/udev/rules.d/
    install -m 0644 ${WORKDIR}/can.rules ${D}${sysconfdir}/udev/rules.d/
 }
--- a/recipes-core/udev/udev-rules-rpi/99-com.rules
+++ b/recipes-core/udev/udev-rules-rpi/99-com.rules
@@ -0,0 +1,21 @@
 KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
 	ALIASES=/proc/device-tree/aliases; \
 	if cmp -s $ALIASES/uart0 $ALIASES/serial0; then \
 		echo 0;\
 	elif cmp -s $ALIASES/uart0 $ALIASES/serial1; then \
 		echo 1; \
 	else \
 		exit 1; \
 	fi\
 '", SYMLINK+="serial%c"
 KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
 	ALIASES=/proc/device-tree/aliases; \
 	if cmp -s $ALIASES/uart1 $ALIASES/serial0; then \
 		echo 0; \
 	elif cmp -s $ALIASES/uart1 $ALIASES/serial1; then \
 		echo 1; \
 	else \
 		exit 1; \
 	fi \
 '", SYMLINK+="serial%c"
--- a/recipes-core/udev/udev-rules-rpi/can.rules
+++ b/recipes-core/udev/udev-rules-rpi/can.rules
@@ -0,0 +1 @@
 SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/3f204000.spi/spi_master/spi0/spi0.0/net/can0", RUN+="/sbin/ip link set can0 up type can bitrate 500000"
--- a/recipes-core/udev/udev-rules-udisks-rpi/80-udisks-rpi.rules
+++ b/recipes-core/udev/udev-rules-udisks-rpi/80-udisks-rpi.rules
@@ -0,0 +1,10 @@
 ##############################################################################################################
 # Partitions which desktops should not display
 #
 # boot partition
 ENV{ID_FS_TYPE}=="vfat", ENV{ID_FS_LABEL}=="raspberrypi", \
  ENV{UDISKS_PRESENTATION_HIDE}="1", ENV{UDISKS_IGNORE}="1"
 ##############################################################################################################
--- a/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb
+++ b/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb
@@ -0,0 +1,13 @@
 DESCRIPTION = "add udisk/udev rule to hide boot partition from udev"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 SRC_URI = "file://80-udisks-rpi.rules"
 INHIBIT_DEFAULT_DEPS = "1"
 do_install () {
 	install -d ${D}${base_libdir}/udev/rules.d
 	install -m 644 ${WORKDIR}/80-udisks-rpi.rules ${D}${base_libdir}/udev/rules.d
 }
 FILES_${PN} = "${base_libdir}/udev/rules.d"
--- a/recipes-devtools/bcm2835/bcm2835_1.52.bb
+++ b/recipes-devtools/bcm2835/bcm2835_1.52.bb
@@ -8,12 +8,12 @@ AUTHOR = "Mike McCauley (mikem@open.com.au)"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-COMPATIBLE_MACHINE = "raspberrypi"
+COMPATIBLE_MACHINE = "^rpi$"
 SRC_URI = "http://www.airspayce.com/mikem/bcm2835/bcm2835-${PV}.tar.gz"
-SRC_URI[md5sum] = "3a40c01ee7d81fbff80c54fbe1a351b5"
+SRC_URI[md5sum] = "b5dc426b4ff258bb1397442f98e40236"
-SRC_URI[sha256sum] = "fc6b0412525e6b7e85aeffec67e2d01a99fb906346620041e6684d59ea5517a7"
+SRC_URI[sha256sum] = "b9fd10f7a80aadaed28a77168709b7c519568a63b6e98d0a50e9c5fe31bea6bb"
 inherit autotools
@@ -21,7 +21,7 @@ do_compile_append() {
    # Now compiling the examples provided by the package
    mkdir -p ${B}/examples
    for file in `ls ${S}/examples`; do
-        ${CC} ${S}/examples/${file}/${file}.c -o ${B}/examples/${file} -Bstatic -L${B}/src -lbcm2835 -I${S}/src
+        ${CC} ${LDFLAGS} ${S}/examples/${file}/${file}.c -o ${B}/examples/${file} -Bstatic -L${B}/src -lbcm2835 -I${S}/src
    done
 }
@@ -35,6 +35,8 @@ do_install_append() {
 PACKAGES += "${PN}-tests"
 RDEPENDS_${PN}-dev = ""
 FILES_${PN} = ""
 FILES_${PN}-tests = "${libdir}/${BPN}"
 FILES_${PN}-dbg += "${libdir}/${BPN}/.debug"
--- a/recipes-devtools/pi-blaster/files/0001-pi-blaster-Include-sys-sysmacros.h-for-makedev.patch
+++ b/recipes-devtools/pi-blaster/files/0001-pi-blaster-Include-sys-sysmacros.h-for-makedev.patch
@@ -0,0 +1,32 @@
 From 6a6b705ff5cba960c54bdb4d4bcdaa3b00a854a2 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 11 Aug 2018 10:24:24 -0700
 Subject: [PATCH] pi-blaster: Include sys/sysmacros.h for makedev()
 In glibc 2.28+ this header is not included indirectly anymore
 fixes
 ld: pi-blaster.o: in function `mbox_open':
 pi-blaster.c:(.text+0x28): undefined reference to `makedev'
 collect2: error: ld returned 1 exit status
 Upstream-Status: Submitted [https://github.com/sarfata/pi-blaster/pull/100]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 pi-blaster.c | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/pi-blaster.c b/pi-blaster.c
 index 6cfd010..fc4e686 100644
 --- a/pi-blaster.c
 +++ b/pi-blaster.c
@@ -41,6 +41,7 @@ static char VERSION[] = "SNAPSHOT";
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 +#include <sys/sysmacros.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 #include "mailbox.h"
--- a/recipes-devtools/pi-blaster/files/remove-initscript-lsb-dependency.patch
+++ b/recipes-devtools/pi-blaster/files/remove-initscript-lsb-dependency.patch
@@ -1,13 +1,28 @@
-Remove dependencies on LSB functions
+From 1338f98a279616f4e5e9ea30a25d1dfa0c7df5d6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petter=20Mab=C3=A4cker?= <petter@technux.se>
 Date: Sun, 4 Jun 2017 12:22:40 +0200
 Subject: [PATCH] Remove dependencies on LSB functions
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 See this as a rebase of the previous 'Remove dependencies on LSB
 functions patch' with only minor modifications from the original version,
 based on the work done by Alex Lennon <ajlennon@dynamicdevices.co.uk> in
 '25fd817 pi-blaster: Added recipe'.
 Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Alex Lennon <ajlennon@dynamicdevices.co.uk>
+Signed-off-by: Petter Mabäcker <petter@technux.se>
 ---
 debian/pi-blaster.init | 38 +++++++-------------------------------
 1 file changed, 7 insertions(+), 31 deletions(-)
-diff -ur git.org/pi-blaster.boot.sh git/pi-blaster.boot.sh
+diff --git a/debian/pi-blaster.init b/debian/pi-blaster.init
--- git.org/pi-blaster.boot.sh	2014-05-20 14:49:44.378582168 +0100
+index b142d70..01a686c 100644
-+++ git/pi-blaster.boot.sh	2014-05-20 14:51:08.330582386 +0100
+--- a/debian/pi-blaster.init
-@@ -28,12 +28,12 @@
+++ b/debian/pi-blaster.init
@@ -28,12 +28,12 @@ SCRIPTNAME=/etc/init.d/$NAME
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 # Load the VERBOSE setting and other rcS variables
@@ -22,7 +37,7 @@ diff -ur git.org/pi-blaster.boot.sh git/pi-blaster.boot.sh
 #
 # Function that starts the daemon/service
-@@ -77,48 +77,23 @@
+@@ -77,48 +77,24 @@ do_stop()
 case "$1" in
   start)
@@ -52,6 +67,7 @@ diff -ur git.org/pi-blaster.boot.sh git/pi-blaster.boot.sh
 	# 'force-reload' alias
 	#
 -	log_daemon_msg "Restarting $DESC" "$NAME"
 +	echo "Restarting $DESC" "$NAME"
 	do_stop
 -	case "$?" in
 -	  0|1)
@@ -67,11 +83,14 @@ diff -ur git.org/pi-blaster.boot.sh git/pi-blaster.boot.sh
 -		log_end_msg 1
 -		;;
 -	esac
-+	do_start
+    do_start
 	;;
   *)
 -	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-+	echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
 	exit 3
 	;;
 esac
 -- 
 1.9.1
--- a/recipes-devtools/pi-blaster/pi-blaster.inc
+++ b/recipes-devtools/pi-blaster/pi-blaster.inc
@@ -1,21 +0,0 @@
 DESCRIPTION = "This project enables PWM on the GPIO pins you request of a Raspberry Pi."
 HOMEPAGE = "https://github.com/sarfata/pi-blaster/"
 SECTION = "devel/libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://README.md;beginline=157;endline=170;md5=f20832f31126609af5a7bf2340014540"
 SRC_URI = "git://github.com/sarfata/pi-blaster \
           file://remove-initscript-lsb-dependency.patch \
 "
 S = "${WORKDIR}/git"
 inherit update-rc.d autotools
 INITSCRIPT_PACKAGES = "${PN}"
 INITSCRIPT_NAME_${PN} = "${PN}.boot.sh"
 INITSCRIPT_PARAMS_${PN} = "defaults 15 85"
 COMPATIBLE_MACHINE = "raspberrypi"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
--- a/recipes-devtools/pi-blaster/pi-blaster_git.bb
+++ b/recipes-devtools/pi-blaster/pi-blaster_git.bb
@@ -1,3 +1,24 @@
-require pi-blaster.inc
+DESCRIPTION = "This project enables PWM on the GPIO pins you request of a Raspberry Pi."
 HOMEPAGE = "https://github.com/sarfata/pi-blaster/"
 SECTION = "devel/libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://README.md;beginline=244;endline=268;md5=86d10e4bcf4b4014d306dde7c1d2a80d"
-SRCREV = "ec5e1b4c6191d8f9a538497dbbb86f9cf0de7016"
+SRC_URI = "git://github.com/sarfata/pi-blaster \
           file://remove-initscript-lsb-dependency.patch \
           file://0001-pi-blaster-Include-sys-sysmacros.h-for-makedev.patch \
           "
 S = "${WORKDIR}/git"
 SRCREV = "e981aa5d7624c75a4d4afcddcbd235f25e32ffe4"
 inherit update-rc.d autotools
 INITSCRIPT_PACKAGES = "${PN}"
 INITSCRIPT_NAME_${PN} = "${PN}.boot.sh"
 INITSCRIPT_PARAMS_${PN} = "defaults 15 85"
 COMPATIBLE_MACHINE = "^rpi$"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
--- a/recipes-devtools/python/python3-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch
+++ b/recipes-devtools/python/python3-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch
@@ -0,0 +1,33 @@
 From c3aa4af56652b403e304ea5f321acfe289e42922 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 30 Jan 2016 16:07:14 -0800
 Subject: [PATCH] include asm/ioctl.h for ioctl() define
 also fixes errors e.g.
 ../../RTIMULib/RTIMUHal.cpp:208:29: error: '_IOC_SIZEBITS' was not
 declared in this scope
         return ioctl(m_SPI, SPI_IOC_MESSAGE(1), &wrIOC);
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 Upstream-Status: Submitted
 RTIMULib/RTIMUHal.cpp | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/RTIMULib/RTIMUHal.cpp b/RTIMULib/RTIMUHal.cpp
 index f9c3d15..d968326 100644
 --- a/RTIMULib/RTIMUHal.cpp
 +++ b/RTIMULib/RTIMUHal.cpp
@@ -29,6 +29,7 @@
 #if !defined(WIN32) && !defined(__APPLE__)
 #include <linux/spi/spidev.h>
 +#include <asm/ioctl.h>
 RTIMUHal::RTIMUHal()
 {
 -- 
 2.7.0
--- a/recipes-devtools/python/python3-rtimu_git.bb
+++ b/recipes-devtools/python/python3-rtimu_git.bb
@@ -0,0 +1,15 @@
 DESCRIPTION = "RTIMULib is a C++ and Python library that makes it easy to use 9-dof and \
 10-dof IMUs with embedded Linux systems"
 HOMEPAGE = "https://github.com/RPi-Distro/RTIMULib/"
 SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://../../LICENSE;md5=96cdecb41125f498958e09b72faf318e"
 SRC_URI = "git://github.com/RPi-Distro/RTIMULib.git;protocol=http;branch=master \
           file://0001-include-asm-ioctl.h-for-ioctl-define.patch;patchdir=../.. \
          "
 SRCREV = "b949681af69b45f0f7f4bb53b6770037b5b02178"
 S = "${WORKDIR}/git/Linux/python/"
 inherit setuptools3
--- a/recipes-devtools/python/python3-sense-hat_2.2.0.bb
+++ b/recipes-devtools/python/python3-sense-hat_2.2.0.bb
@@ -0,0 +1,24 @@
 SUMMARY = "Python module to control the Raspberry Pi Sense HAT used in the Astro Pi mission"
 HOMEPAGE = "https://github.com/RPi-Distro/python-sense-hat"
 SECTION = "devel/python"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=d80fe312e1ff5fbd97369b093bf21cda"
 inherit setuptools3 pypi
 PYPI_PACKAGE = "sense-hat"
 SRC_URI[md5sum] = "69929250cb72349a8a82edf2584b1d83"
 SRC_URI[sha256sum] = "f000998d042d96ed722d459312e1bebd0107f9f3015cd34b3e4fabcab9c800af"
 DEPENDS += " \
    jpeg \
    zlib \
    freetype \
    "
 RDEPENDS_${PN} += " \
    ${PYTHON_PN}-numpy \
    ${PYTHON_PN}-rtimu \
    ${PYTHON_PN}-imaging \
    "
--- a/recipes-devtools/python/rpi-gpio/0001-Remove-nested-functions.patch
+++ b/recipes-devtools/python/rpi-gpio/0001-Remove-nested-functions.patch
@@ -0,0 +1,294 @@
 From 23d7ab77865f8b17042f5cd4c6720cca475e0eb5 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 13 Jan 2016 14:27:10 -0800
 Subject: [PATCH] Remove nested functions
 nested functions are not supported on llvm/clang compiler, replacing
 them helps make code portable and be compilable with non-gcc compilers
 additionally fix the diagnostic messages clang reported
 source/c_gpio.c:130:18: warning: comparison of distinct pointer types
 ('volatile uint32_t *' (aka 'volatile unsigned int *') an
 d 'void *') [-Wcompare-distinct-pointer-types]
    if (gpio_map < MAP_FAILED)
        ~~~~~~~~ ^ ~~~~~~~~~~
        source/c_gpio.c:89:13: warning: variable 'peri_base' is used
 uninitialized whenever 'if' condition is false [-Wsometimes-uninit
 ialized]
        if (fread(buf, 1, sizeof buf, fp) == sizeof buf) {
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 source/c_gpio.c:116:17: note: uninitialized use occurs here
    gpio_base = peri_base + GPIO_BASE_OFFSET;
                ^~~~~~~~~
 source/c_gpio.c:89:9: note: remove the 'if' if its condition is always
 true
        if (fread(buf, 1, sizeof buf, fp) == sizeof buf) {
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 source/c_gpio.c:64:23: note: initialize the variable 'peri_base' to
 silence this warning
    uint32_t peri_base;
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 Upstream-Status: Submitted
 source/c_gpio.c  |   6 +--
 source/py_gpio.c | 135 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 71 insertions(+), 70 deletions(-)
 diff --git a/source/c_gpio.c b/source/c_gpio.c
 index c96a2b0..b69880f 100644
 --- a/source/c_gpio.c
 +++ b/source/c_gpio.c
@@ -61,7 +61,7 @@ int setup(void)
 {
     int mem_fd;
     uint8_t *gpio_mem;
 -    uint32_t peri_base;
 +    uint32_t peri_base = 0;
     uint32_t gpio_base;
     unsigned char buf[4];
     FILE *fp;
@@ -73,7 +73,7 @@ int setup(void)
     if ((mem_fd = open("/dev/gpiomem", O_RDWR|O_SYNC)) > 0)
     {
         gpio_map = (uint32_t *)mmap(NULL, BLOCK_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, mem_fd, 0);
 -        if ((uint32_t)gpio_map < 0) {
 +        if (gpio_map == MAP_FAILED) {
             return SETUP_MMAP_FAIL;
         } else {
             return SETUP_OK;
@@ -127,7 +127,7 @@ int setup(void)
     gpio_map = (uint32_t *)mmap( (void *)gpio_mem, BLOCK_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_FIXED, mem_fd, gpio_base);
 -    if ((uint32_t)gpio_map < 0)
 +    if (gpio_map == MAP_FAILED)
         return SETUP_MMAP_FAIL;
     return SETUP_OK;
 diff --git a/source/py_gpio.c b/source/py_gpio.c
 index d54cc7f..007bad5 100644
 --- a/source/py_gpio.c
 +++ b/source/py_gpio.c
@@ -69,6 +69,20 @@ static int mmap_gpio_mem(void)
       return 0;
    }
 }
 +static inline int cleanup_one(unsigned int gpio)
 +{
 +   // clean up any /sys/class exports
 +   event_cleanup(gpio);
 +
 +   // set everything back to input
 +   if (gpio_direction[gpio] != -1) {
 +      setup_gpio(gpio, INPUT, PUD_OFF);
 +      gpio_direction[gpio] = -1;
 +      return 1;
 +   }
 +   return 0;
 +}
 +
 // python function cleanup(channel=None)
 static PyObject *py_cleanup(PyObject *self, PyObject *args, PyObject *kwargs)
@@ -83,19 +97,6 @@ static PyObject *py_cleanup(PyObject *self, PyObject *args, PyObject *kwargs)
    PyObject *tempobj;
    static char *kwlist[] = {"channel", NULL};
 -   void cleanup_one(void)
 -   {
 -      // clean up any /sys/class exports
 -      event_cleanup(gpio);
 -
 -      // set everything back to input
 -      if (gpio_direction[gpio] != -1) {
 -         setup_gpio(gpio, INPUT, PUD_OFF);
 -         gpio_direction[gpio] = -1;
 -         found = 1;
 -      }
 -   }
 -
    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O", kwlist, &chanlist))
       return NULL;
@@ -140,7 +141,7 @@ static PyObject *py_cleanup(PyObject *self, PyObject *args, PyObject *kwargs)
       } else if (channel != -666) {    // channel was an int indicating single channel
          if (get_gpio_number(channel, &gpio))
             return NULL;
 -         cleanup_one();
 +         found = cleanup_one(gpio);
       } else {  // channel was a list/tuple
          for (i=0; i<chancount; i++) {
             if (chanlist) {
@@ -169,7 +170,7 @@ static PyObject *py_cleanup(PyObject *self, PyObject *args, PyObject *kwargs)
             if (get_gpio_number(channel, &gpio))
                return NULL;
 -            cleanup_one();
 +            found = cleanup_one(gpio);
          }
       }
    }
@@ -182,6 +183,37 @@ static PyObject *py_cleanup(PyObject *self, PyObject *args, PyObject *kwargs)
    Py_RETURN_NONE;
 }
 +static inline int setup_one(unsigned int *gpio, int channel, int pud, int direction, int initial) {
 +   if (get_gpio_number(channel, gpio))
 +      return 0;
 +
 +   int func = gpio_function(*gpio);
 +   if (gpio_warnings &&                             // warnings enabled and
 +       ((func != 0 && func != 1) ||                 // (already one of the alt functions or
 +       (gpio_direction[*gpio] == -1 && func == 1)))  // already an output not set from this program)
 +   {
 +      PyErr_WarnEx(NULL, "This channel is already in use, continuing anyway.  Use GPIO.setwarnings(False) to disable warnings.", 1);
 +   }
 +
 +   // warn about pull/up down on i2c channels
 +   if (gpio_warnings) {
 +      if (rpiinfo.p1_revision == 0) { // compute module - do nothing
 +      } else if ((rpiinfo.p1_revision == 1 && (*gpio == 0 || *gpio == 1)) ||
 +                 (*gpio == 2 || *gpio == 3)) {
 +         if (pud == PUD_UP || pud == PUD_DOWN)
 +            PyErr_WarnEx(NULL, "A physical pull up resistor is fitted on this channel!", 1);
 +      }
 +   }
 +
 +   if (direction == OUTPUT && (initial == LOW || initial == HIGH)) {
 +      output_gpio(*gpio, initial);
 +   }
 +   setup_gpio(*gpio, direction, pud);
 +   gpio_direction[*gpio] = direction;
 +   return 1;
 +}
 +
 +
 // python function setup(channel(s), direction, pull_up_down=PUD_OFF, initial=None)
 static PyObject *py_setup_channel(PyObject *self, PyObject *args, PyObject *kwargs)
 {
@@ -195,37 +227,6 @@ static PyObject *py_setup_channel(PyObject *self, PyObject *args, PyObject *kwar
    int pud = PUD_OFF + PY_PUD_CONST_OFFSET;
    int initial = -1;
    static char *kwlist[] = {"channel", "direction", "pull_up_down", "initial", NULL};
 -   int func;
 -
 -   int setup_one(void) {
 -      if (get_gpio_number(channel, &gpio))
 -         return 0;
 -
 -      func = gpio_function(gpio);
 -      if (gpio_warnings &&                             // warnings enabled and
 -          ((func != 0 && func != 1) ||                 // (already one of the alt functions or
 -          (gpio_direction[gpio] == -1 && func == 1)))  // already an output not set from this program)
 -      {
 -         PyErr_WarnEx(NULL, "This channel is already in use, continuing anyway.  Use GPIO.setwarnings(False) to disable warnings.", 1);
 -      }
 -
 -      // warn about pull/up down on i2c channels
 -      if (gpio_warnings) {
 -         if (rpiinfo.p1_revision == 0) { // compute module - do nothing
 -         } else if ((rpiinfo.p1_revision == 1 && (gpio == 0 || gpio == 1)) ||
 -                    (gpio == 2 || gpio == 3)) {
 -            if (pud == PUD_UP || pud == PUD_DOWN)
 -               PyErr_WarnEx(NULL, "A physical pull up resistor is fitted on this channel!", 1);
 -         }
 -      }
 -
 -      if (direction == OUTPUT && (initial == LOW || initial == HIGH)) {
 -         output_gpio(gpio, initial);
 -      }
 -      setup_gpio(gpio, direction, pud);
 -      gpio_direction[gpio] = direction;
 -      return 1;
 -   }
    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi|ii", kwlist, &chanlist, &direction, &pud, &initial))
       return NULL;
@@ -290,7 +291,7 @@ static PyObject *py_setup_channel(PyObject *self, PyObject *args, PyObject *kwar
    } else if (chantuple) {
        chancount = PyTuple_Size(chantuple);
    } else {
 -       if (!setup_one())
 +       if (!setup_one(&gpio, channel, pud, direction, initial))
           return NULL;
        Py_RETURN_NONE;
    }
@@ -320,12 +321,29 @@ static PyObject *py_setup_channel(PyObject *self, PyObject *args, PyObject *kwar
           return NULL;
       }
 -      if (!setup_one())
 +      if (!setup_one(&gpio, channel, pud, direction, initial))
          return NULL;
    }
    Py_RETURN_NONE;
 }
 +static inline int output_val(unsigned int *gpio, int channel, int value) {
 +   if (get_gpio_number(channel, gpio))
 +       return 0;
 +
 +   if (gpio_direction[*gpio] != OUTPUT)
 +   {
 +      PyErr_SetString(PyExc_RuntimeError, "The GPIO channel has not been set up as an OUTPUT");
 +      return 0;
 +   }
 +
 +   if (check_gpio_priv())
 +      return 0;
 +
 +   output_gpio(*gpio, value);
 +   return 1;
 +}
 +
 // python function output(channel(s), value(s))
 static PyObject *py_output_gpio(PyObject *self, PyObject *args)
@@ -342,23 +360,6 @@ static PyObject *py_output_gpio(PyObject *self, PyObject *args)
    int chancount = -1;
    int valuecount = -1;
 -   int output(void) {
 -      if (get_gpio_number(channel, &gpio))
 -          return 0;
 -
 -      if (gpio_direction[gpio] != OUTPUT)
 -      {
 -         PyErr_SetString(PyExc_RuntimeError, "The GPIO channel has not been set up as an OUTPUT");
 -         return 0;
 -      }
 -
 -      if (check_gpio_priv())
 -         return 0;
 -
 -      output_gpio(gpio, value);
 -      return 1;
 -   }
 -
    if (!PyArg_ParseTuple(args, "OO", &chanlist, &valuelist))
        return NULL;
@@ -416,7 +417,7 @@ static PyObject *py_output_gpio(PyObject *self, PyObject *args)
    }
    if (chancount == -1) {
 -      if (!output())
 +      if (!output_val(&gpio, channel, value))
          return NULL;
       Py_RETURN_NONE;
    }
@@ -472,7 +473,7 @@ static PyObject *py_output_gpio(PyObject *self, PyObject *args)
               return NULL;
           }
       }
 -      if (!output())
 +      if (!output_val(&gpio, channel, value))
          return NULL;
    }
 -- 
 2.7.0
--- a/recipes-devtools/python/rpi-gpio_0.5.11.bb
+++ b/recipes-devtools/python/rpi-gpio_0.5.11.bb
@@ -1,19 +0,0 @@
 DESCRIPTION = "A module to control Raspberry Pi GPIO channels"
 HOMEPAGE = "http://code.google.com/p/raspberry-gpio-python/"
 SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=9b95630a648966b142f1a0dcea001cb7"
 SRCNAME = "RPi.GPIO"
 SRC_URI = "\
          http://pypi.python.org/packages/source/R/RPi.GPIO/${SRCNAME}-${PV}.tar.gz \
          "
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 inherit distutils
 COMPATIBLE_MACHINE = "raspberrypi"
 SRC_URI[md5sum] = "9dc3dab6ce2b7ccb833a866efb392821"
 SRC_URI[sha256sum] = "8d6f02da7f90e24512ad80ee4ccf34ef33687c88c47326f100cf7ac4d7ae4bf3"
--- a/recipes-devtools/python/rpi-gpio_0.6.3.bb
+++ b/recipes-devtools/python/rpi-gpio_0.6.3.bb
@@ -0,0 +1,14 @@
 DESCRIPTION = "A module to control Raspberry Pi GPIO channels"
 HOMEPAGE = "http://code.google.com/p/raspberry-gpio-python/"
 SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=9b95630a648966b142f1a0dcea001cb7"
 PYPI_PACKAGE = "RPi.GPIO"
 inherit pypi distutils
 SRC_URI += "file://0001-Remove-nested-functions.patch"
 SRC_URI[md5sum] = "e4abe1cfb5eacebe53078032256eb837"
 SRC_URI[sha256sum] = "a5fc0eb5e401963b6c0a03650da6b42c4005f02d962b81241d96c98d0a578516"
 COMPATIBLE_MACHINE = "^rpi$"
--- a/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch
+++ b/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch
@@ -0,0 +1,30 @@
 From c86bfacc98d58244f532626954ed00d84ecfa82d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 30 Jan 2016 17:12:37 -0800
 Subject: [PATCH] include sys/types.h explicitly for getting caddr_t definition
 Helps fixing build on musl where sys/types.h is not included indirectly
 as happening on glibc
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 Upstream-Status: Submitted
 source/c_gpio/c_gpio.c | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/source/c_gpio/c_gpio.c b/source/c_gpio/c_gpio.c
 index 25a04ca..70df632 100644
 --- a/source/c_gpio/c_gpio.c
 +++ b/source/c_gpio/c_gpio.c
@@ -29,6 +29,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <fcntl.h>
 +#include <sys/types.h>
 #include <sys/mman.h>
 #include "c_gpio.h"
 -- 
 2.7.0
--- a/recipes-devtools/python/rpio_0.10.0.bb
+++ b/recipes-devtools/python/rpio_0.10.0.bb
@@ -5,16 +5,19 @@ SECTION = "devel/python"
 LICENSE = "LGPLv3+"
 LIC_FILES_CHKSUM = "file://README.rst;beginline=41;endline=53;md5=d5d95d7486a4d98c999675c23196b25a"
-SRCNAME = "RPIO"
+PYPI_PACKAGE = "RPIO"
 inherit pypi
-SRC_URI = "\
+SRC_URI += "file://0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch"
          http://pypi.python.org/packages/source/R/RPIO/${SRCNAME}-${PV}.tar.gz \
          "
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 inherit setuptools
-COMPATIBLE_MACHINE = "raspberrypi"
+COMPATIBLE_MACHINE = "^rpi$"
 RDEPENDS_${PN} = "\
    python-logging \
    python-threading \
 "
 SRC_URI[md5sum] = "cefc45422833dcafcd59b78dffc540f4"
 SRC_URI[sha256sum] = "b89f75dec9de354681209ebfaedfe22b7c178aacd91a604a7bd6d92024e4cf7e"
--- a/recipes-devtools/raspi-gpio/raspi-gpio_git.bb
+++ b/recipes-devtools/raspi-gpio/raspi-gpio_git.bb
@@ -0,0 +1,16 @@
 DESCRIPTION = "Tool to help debug / hack at the BCM283x GPIO"
 HOMEPAGE = "https://github.com/RPi-Distro/raspi-gpio"
 SECTION = "devel/libs"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a14affa234debc057b47cdca615b2192"
 COMPATIBLE_MACHINE = "^rpi$"
 inherit autotools
 SRCREV = "2df7b8684e2e36b080cda315d78d5ba16f8f18b0"
 SRC_URI = "git://github.com/RPi-Distro/raspi-gpio.git;protocol=https;branch=master \
          "
 S = "${WORKDIR}/git"
--- a/recipes-devtools/wiringPi/wiringpi_git.bb
+++ b/recipes-devtools/wiringPi/wiringpi_git.bb
@@ -1,34 +0,0 @@
 DESCRIPTION = "A library to control Raspberry Pi GPIO channels"
 HOMEPAGE = "https://projects.drogon.net/raspberry-pi/wiringpi/"
 SECTION = "devel/libs"
 LICENSE = "LGPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02"
 # tag 2.29
 SRCREV = "d79506694d7ba1c3da865d095238289d6175057d"
 S = "${WORKDIR}/git"
 SRC_URI = "\
          git://git.drogon.net/wiringPi \
          file://0001-Add-initial-cross-compile-support.patch \
          "
 COMPATIBLE_MACHINE = "raspberrypi"
 CFLAGS_prepend = "-I${S}/wiringPi -I${S}/devLib"
 EXTRA_OEMAKE += "'INCLUDE_DIR=${D}${includedir}' 'LIB_DIR=${D}${libdir}'"
 EXTRA_OEMAKE += "'DESTDIR=${D}/usr' 'PREFIX=""'"
 do_compile() {
    oe_runmake -C devLib
    oe_runmake -C wiringPi
    oe_runmake -C gpio 'LDFLAGS=${LDFLAGS} -L${S}/wiringPi -L${S}/devLib'
 }
 do_install() {
    oe_runmake -C devLib install
    oe_runmake -C wiringPi install
    oe_runmake -C gpio install
 }
--- a/recipes-devtools/wiringpi/files/0001-Add-initial-cross-compile-support.patch
+++ b/recipes-devtools/wiringpi/files/0001-Add-initial-cross-compile-support.patch
@@ -1,24 +1,33 @@
-From 6d85e6cc3ab97c3f060e5e0a8e3f1945a14c86ba Mon Sep 17 00:00:00 2001
+From 32f3cad3c41161693659a902062fa0c01c0338ed Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <gianfranco.costamagna@abinsula.com>
+From: ErikHH <erik.hoogeveen@outlook.com>
-Date: Mon, 12 Oct 2015 12:15:51 +0200
+Date: Thu, 20 Dec 2018 15:33:45 +0100
-Subject: [PATCH] Add initial cross compile support (rebase from Petter Mabäcker <petter@technux.se> version)
+Subject: [PATCH 1/1] Add initial cross compile support
 Signed-off-by: ErikHH <erik.hoogeveen@outlook.com>
 ---
- devLib/Makefile             |   54 ++++++++++++++++++++++++-------------------
+ devLib/Makefile             | 55 +++++++++++++++++++++----------------
- examples/Gertboard/Makefile |   22 +++++++++++-------
+ examples/Gertboard/Makefile | 22 +++++++++------
- examples/Makefile           |   22 +++++++++++-------
+ examples/Makefile           | 22 +++++++++------
- examples/PiFace/Makefile    |   22 +++++++++++-------
+ examples/PiFace/Makefile    | 22 +++++++++------
- examples/PiGlow/Makefile    |    4 ++--
+ examples/PiGlow/Makefile    |  4 +--
- examples/q2w/Makefile       |    4 ++--
+ examples/q2w/Makefile       |  4 +--
- gpio/Makefile               |   29 ++++++++++++-----------
+ gpio/Makefile               | 29 +++++++++----------
- wiringPi/Makefile           |   50 +++++++++++++++++++++------------------
+ wiringPi/Makefile           | 47 +++++++++++++++++--------------
- 8 files changed, 119 insertions(+), 88 deletions(-)
+ 8 files changed, 119 insertions(+), 86 deletions(-)
 diff --git a/devLib/Makefile b/devLib/Makefile
-index 0fb0033..cbea759 100644
+index cf665d6..d193a9d 100644
 --- a/devLib/Makefile
 +++ b/devLib/Makefile
-@@ -31,15 +31,19 @@ ifneq ($V,1)
+@@ -22,6 +22,7 @@
 #################################################################################
 VERSION=$(shell cat ../VERSION)
 +DYN_VERS_MAJ=$(word 1,$(subst ., ,$(VERSION)))
 DESTDIR?=/usr
 PREFIX?=/local
@@ -31,15 +32,19 @@ ifneq ($V,1)
 Q ?= @
 endif
@@ -46,12 +55,12 @@ index 0fb0033..cbea759 100644
 LIBS    =
-@@ -66,16 +70,16 @@ $(STATIC):	$(OBJ)
+@@ -68,16 +73,16 @@ $(STATIC):	$(OBJ)
 $(DYNAMIC):	$(OBJ)
 	$Q echo "[Link (Dynamic)]"
 -	$Q $(CC) -shared -Wl,-soname,libwiringPiDev.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ)
-+	$Q $(CC) -shared -Wl,-soname,$(BASE_NAME).so.$(DYN_VERS_MAJ) -o $(BASE_NAME).so -lpthread $(OBJ)
+	$Q $(CC) -shared $(LDFLAGS) -Wl,-soname,$(BASE_NAME).so.$(DYN_VERS_MAJ) -o $(BASE_NAME).so -lpthread $(OBJ)
 .c.o:
 	$Q echo [Compile] $<
@@ -66,7 +75,7 @@ index 0fb0033..cbea759 100644
 .PHONY:	tags
 tags:	$(SRC)
-@@ -86,22 +90,22 @@ tags:	$(SRC)
+@@ -88,22 +93,22 @@ tags:	$(SRC)
 .PHONY:	install
 install:	$(DYNAMIC)
 	$Q echo "[Install Headers]"
@@ -99,7 +108,7 @@ index 0fb0033..cbea759 100644
 .PHONY:	install-deb
 install-deb:	$(DYNAMIC)
-@@ -116,9 +120,11 @@ install-deb:	$(DYNAMIC)
+@@ -118,9 +123,11 @@ install-deb:	$(DYNAMIC)
 .PHONY:	uninstall
 uninstall:
 	$Q echo "[UnInstall]"
@@ -148,7 +157,7 @@ index 1939ad6..98d1415 100644
 # Should not alter anything below this line
 ###############################################################################
 diff --git a/examples/Makefile b/examples/Makefile
-index e6b9b71..931b167 100644
+index 6d87885..8623816 100644
 --- a/examples/Makefile
 +++ b/examples/Makefile
@@ -26,14 +26,20 @@ ifneq ($V,1)
@@ -162,7 +171,7 @@ index e6b9b71..931b167 100644
 -CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
 -
 -LDFLAGS	= -L/usr/local/lib
-LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
+-LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm -lcrypt -lrt
 +DESTDIR?=/usr
 +PREFIX?=/local
 +
@@ -176,12 +185,12 @@ index e6b9b71..931b167 100644
 +CFLAGS	?= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
 +
 +LDFLAGS	?= -L$(LIB_DIR)
-+LDLIBS    ?= -lwiringPi -lwiringPiDev -lpthread -lm
+LDLIBS    ?= -lwiringPi -lwiringPiDev -lpthread -lm -lcrypt -lrt
 # Should not alter anything below this line
 ###############################################################################
 diff --git a/examples/PiFace/Makefile b/examples/PiFace/Makefile
-index 4685adc..cfaf902 100644
+index f937c14..ad030b3 100644
 --- a/examples/PiFace/Makefile
 +++ b/examples/PiFace/Makefile
@@ -26,14 +26,20 @@ ifneq ($V,1)
@@ -214,7 +223,7 @@ index 4685adc..cfaf902 100644
 # Should not alter anything below this line
 ###############################################################################
 diff --git a/examples/PiGlow/Makefile b/examples/PiGlow/Makefile
-index acd4818..dabd64e 100644
+index f182db7..d1ea74f 100644
 --- a/examples/PiGlow/Makefile
 +++ b/examples/PiGlow/Makefile
@@ -29,10 +29,10 @@ endif
@@ -231,7 +240,7 @@ index acd4818..dabd64e 100644
 # Should not alter anything below this line
 diff --git a/examples/q2w/Makefile b/examples/q2w/Makefile
-index 6f50fa0..c5e9f6e 100644
+index 8f773bf..14aa6e4 100644
 --- a/examples/q2w/Makefile
 +++ b/examples/q2w/Makefile
@@ -29,10 +29,10 @@ endif
@@ -248,7 +257,7 @@ index 6f50fa0..c5e9f6e 100644
 ###############################################################################
 diff --git a/gpio/Makefile b/gpio/Makefile
-index 7dcd090..83ec454 100644
+index 9ec160d..a294242 100644
 --- a/gpio/Makefile
 +++ b/gpio/Makefile
@@ -30,13 +30,17 @@ ifneq ($V,1)
@@ -259,7 +268,7 @@ index 7dcd090..83ec454 100644
 -DEBUG	= -O2
 -CC	= gcc
 -INCLUDE	= -I$(DESTDIR)$(PREFIX)/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+-CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
 +INCLUDE_DIR?=$(DESTDIR)$(PREFIX)/include
 +LIB_DIR?=$(DESTDIR)$(PREFIX)/lib
 +BIN_DIR?=$(DESTDIR)$(PREFIX)/bin
@@ -269,10 +278,10 @@ index 7dcd090..83ec454 100644
 +DEBUG	?= -O2
 +CC	?= gcc
 +INCLUDE	?= -I$(INCLUDE_DIR)
-+CFLAGS	?= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	?= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
 +
 +LDFLAGS	?= -L$(LIB_DIR)
- LIBS    = -lwiringPi -lwiringPiDev -lpthread
+ LIBS    = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt
 # May not need to  alter anything below this line
@@ -72,13 +76,10 @@ tags:	$(SRC)
@@ -284,8 +293,8 @@ index 7dcd090..83ec454 100644
 -	$Q chown root.root	$(DESTDIR)$(PREFIX)/bin/gpio
 -	$Q chmod 4755		$(DESTDIR)$(PREFIX)/bin/gpio
 -endif
-	$Q mkdir -p		$(DESTDIR)$(PREFIX)/man/man1
+-	$Q mkdir -p		$(DESTDIR)$(PREFIX)/share/man/man1
-	$Q cp gpio.1		$(DESTDIR)$(PREFIX)/man/man1
+-	$Q cp gpio.1		$(DESTDIR)$(PREFIX)/share/man/man1
 +	$Q install -d $(BIN_DIR)
 +	$Q install -m 4755 -o root -g root gpio $(BIN_DIR)
 +	$Q install -d $(DESTDIR)$(PREFIX)/share/man/man1
@@ -293,20 +302,24 @@ index 7dcd090..83ec454 100644
 .PHONY:	install-deb
 install-deb:	gpio
-@@ -89,7 +90,7 @@ install-deb:	gpio
+@@ -91,7 +92,7 @@ install-deb:	gpio
 .PHONY:	uninstall
 uninstall:
 	$Q echo "[UnInstall]"
 -	$Q rm -f $(DESTDIR)$(PREFIX)/bin/gpio
 +	$Q rm -f $(BIN_DIR)/gpio
- 	$Q rm -f $(DESTDIR)$(PREFIX)/man/man1/gpio.1
+ 	$Q rm -f $(DESTDIR)$(PREFIX)/share/man/man1/gpio.1
 .PHONY:	depend
 diff --git a/wiringPi/Makefile b/wiringPi/Makefile
-index 6bbcc5d..5355b74 100644
+index 287fa58..3423d3f 100644
 --- a/wiringPi/Makefile
 +++ b/wiringPi/Makefile
-@@ -25,19 +25,23 @@ VERSION=$(shell cat ../VERSION)
+@@ -22,25 +22,30 @@
 #################################################################################
 VERSION=$(shell cat ../VERSION)
 +DYN_VERS_MAJ=$(word 1,$(subst ., ,$(VERSION)))
 DESTDIR?=/usr
 PREFIX?=/local
@@ -334,19 +347,24 @@ index 6bbcc5d..5355b74 100644
 +CC	?= gcc
 +INCLUDE	?= -I.
 DEFS	= -D_GNU_SOURCE
- CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
+-CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
 -#CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC
 +CFLAGS	= $(DEBUG) $(DEFS) $(INCLUDE) -Wformat=2 -Wall -Wextra -Winline -pipe -fPIC
 +#CFLAGS	= $(DEBUG) $(DEFS) $(INCLUDE) -Wformat=2 -Wall -Wextra -Wconversion -Winline -pipe -fPIC
-@@ -89,17 +93,17 @@ $(STATIC):	$(OBJ)
+ LIBS    = -lm -lpthread -lrt -lcrypt
@@ -75,17 +80,17 @@ static:
 $(DYNAMIC):	$(OBJ)
 	$Q echo "[Link (Dynamic)]"
-	$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) -lpthread $(OBJ)
+-	$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ)
-+	$Q $(CC) -shared -Wl,-soname,$(BASE_NAME).so.$(DYN_VERS_MAJ) -o $(BASE_NAME).so -lpthread $(OBJ)
+	$Q $(CC) $(LDFLAGS) -shared -Wl,-soname,$(BASE_NAME).so.$(DYN_VERS_MAJ) -o $(BASE_NAME).so $(OBJ) $(LIBS)
 .c.o:
 	$Q echo [Compile] $<
 -	$Q $(CC) -c $(CFLAGS) $< -o $@
-+	$Q $(CC) -c $(CFLAGS) -fPIC $< -o $@
+	$Q $(CC) $(CFLAGS) $(LIBS) -c $< -o $@
 .PHONY:	clean
@@ -357,7 +375,7 @@ index 6bbcc5d..5355b74 100644
 .PHONY:	tags
 tags:	$(SRC)
-@@ -110,22 +114,22 @@ tags:	$(SRC)
+@@ -96,13 +101,13 @@ tags:	$(SRC)
 .PHONY:	install
 install:	$(DYNAMIC)
 	$Q echo "[Install Headers]"
@@ -375,22 +393,9 @@ index 6bbcc5d..5355b74 100644
 +	$Q ln -sf $(DYNAMIC)						$(LIB_DIR)/$(BASE_NAME).so
 +	$Q ln -sf $(DYNAMIC)						$(LIB_DIR)/$(BASE_NAME).so.$(DYN_VERS_MAJ)
 .PHONY:	install-static
 install-static:	$(STATIC)
 	$Q echo "[Install Headers]"
 -	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/include
 -	$Q install -m 0644 $(HEADERS)					$(DESTDIR)$(PREFIX)/include
 +	$Q install -m 0755 -d						$(INCLUDE_DIR)
 +	$Q install -m 0644 $(HEADERS)					$(INCLUDE_DIR)
 	$Q echo "[Install Static Lib]"
 -	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
 -	$Q install -m 0755 libwiringPi.a					$(DESTDIR)$(PREFIX)/lib
 +	$Q install -m 0755 -d						$(LIB_DIR)
 +	$Q install -m 0755 $(STATIC)					$(LIB_DIR)
 .PHONY:	install-deb
 install-deb:	$(DYNAMIC)
-@@ -140,9 +144,11 @@ install-deb:	$(DYNAMIC)
+@@ -117,9 +122,11 @@ install-deb:	$(DYNAMIC)
 .PHONY:	uninstall
 uninstall:
 	$Q echo "[UnInstall]"
@@ -406,5 +411,5 @@ index 6bbcc5d..5355b74 100644
 .PHONY:	depend
 -- 
-2.1.4
+2.19.1
--- a/recipes-graphics/cairo/cairo_%.bbappend
+++ b/recipes-graphics/cairo/cairo_%.bbappend
@@ -0,0 +1,3 @@
 PACKAGECONFIG_GLESV2 = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'glesv2', d)}"
 PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' egl ${PACKAGECONFIG_GLESV2}', d)}"
--- a/recipes-graphics/kmscube/kmscube_%.bbappend
+++ b/recipes-graphics/kmscube/kmscube_%.bbappend
@@ -0,0 +1,2 @@
 # userland driver EGL implementation does not have all needed bits for it so remove it from build
 COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}"
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -0,0 +1,2 @@
 # mesa-demos need libgles1 and userland driver does not have it
 COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}"
--- a/recipes-graphics/mesa/mesa-gl_%.bbappend
+++ b/recipes-graphics/mesa/mesa-gl_%.bbappend
@@ -0,0 +1,6 @@
 PACKAGECONFIG_append_rpi = " gbm"
 PROVIDES_append_rpi = " virtual/libgbm"
 do_install_append_rpi() {
    rm -rf ${D}${includedir}/KHR/khrplatform.h
 }
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -0,0 +1,6 @@
 # DRI3 note:
 # With oe-core commit 8509e2e1a87578882b71948ccef3b50ccf1228b3 dri3 is set
 # as default. To state out clearly that Raspi needs dri3 and to avoid surprises
 # in case oe-core changes this default, we set dri3 explicitly.
 PACKAGECONFIG_append_rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}"
 DRIDRIVERS_class-target_rpi = ""
--- a/recipes-graphics/piglit/piglit_%.bbappend
+++ b/recipes-graphics/piglit/piglit_%.bbappend
@@ -0,0 +1,5 @@
 # mesa-demos need libgles1 and userland driver does not have it so remove it from piglit rdeps
 RDEPENDS_${PN}_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}"
 # it needs EGL >= 11 but userland says it provided version 10, remove it from build
 # | --   Requested 'egl >= 11.0' but version of EGL is 10
 COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}"
--- a/recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch
+++ b/recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch
@@ -0,0 +1,208 @@
 From ccb7f6f1a2bc491a24c0402616a2d24b85e3933a Mon Sep 17 00:00:00 2001
 From: Dom Cobley <dc4@broadcom.com>
 Date: Tue, 9 Jul 2013 09:26:26 -0400
 Subject: [PATCH 01/19] Allow applications to set next resource handle
 This patch adds provisions in userland to
 let apps callers set the next rendereing dispmanx resource.
 It's useful for implementing, say, a buffer carousel.
 ---
 interface/khronos/common/khrn_client_rpc.h |  2 ++
 interface/khronos/common/khrn_int_ids.h    |  2 ++
 interface/khronos/egl/egl_client.c         | 30 +++++++++++++++++++---
 interface/khronos/egl/egl_client_surface.c | 24 ++++++++++++++++-
 interface/khronos/egl/egl_client_surface.h |  3 ++-
 interface/khronos/egl/egl_int_impl.h       |  5 ++--
 6 files changed, 59 insertions(+), 7 deletions(-)
 diff --git a/interface/khronos/common/khrn_client_rpc.h b/interface/khronos/common/khrn_client_rpc.h
 index dc4351d..10ea060 100644
 --- a/interface/khronos/common/khrn_client_rpc.h
 +++ b/interface/khronos/common/khrn_client_rpc.h
@@ -685,6 +685,7 @@ static INLINE void rpc_call12_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id
 static INLINE void rpc_call13_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, void *out)               { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);      rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
 static INLINE void rpc_call14_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
 static INLINE void rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, uint32_t p13, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
 +static INLINE void rpc_call16_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, uint32_t p13, uint32_t p14, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
 #endif
 #define RPC_CALL1_OUT_CTRL(fn, thread, id, out)                                               rpc_call1_out_ctrl(thread, id, out)
@@ -702,6 +703,7 @@ static INLINE void rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id
 #define RPC_CALL13_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, out)      rpc_call13_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, out)
 #define RPC_CALL14_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, out) rpc_call14_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, out)
 #define RPC_CALL15_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, out) rpc_call15_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, out)
 +#define RPC_CALL16_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, out) rpc_call16_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, out)
 # if !defined(__SYMBIAN32__)  //use functions defined in khrpc.cpp
 static INLINE uint32_t rpc_call1_out_ctrl_res(CLIENT_THREAD_STATE_T *thread,uint32_t id, void *out)                                                                                                                       { uint32_t res; rpc_begin(thread); RPC_CALL(thread, id);                                     res = rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_RES | RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); return res; }
 diff --git a/interface/khronos/common/khrn_int_ids.h b/interface/khronos/common/khrn_int_ids.h
 index 8378f4a..ec961e0 100644
 --- a/interface/khronos/common/khrn_int_ids.h
 +++ b/interface/khronos/common/khrn_int_ids.h
@@ -367,6 +367,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #define EGLINTCREATESURFACE_ID            0x4000
 +#define EGLINTCREATESURFACE_ID_V2         0x4100
 #define EGLINTCREATEGLES11_ID             0x4001
 #define EGLINTCREATEGLES20_ID             0x4002
 #define EGLINTCREATEVG_ID                 0x4003
@@ -377,6 +378,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define EGLINTMAKECURRENT_ID              0x4008
 #define EGLINTFLUSHANDWAIT_ID             0x4009
 #define EGLINTSWAPBUFFERS_ID              0x400a
 +#define EGLINTSWAPBUFFERS_ID_V2           0x410a
 #define EGLINTSELECTMIPMAP_ID             0x400b
 #define EGLINTFLUSH_ID                    0x400c
 #define EGLINTGETCOLORDATA_ID             0x400d
 diff --git a/interface/khronos/egl/egl_client.c b/interface/khronos/egl/egl_client.c
 index 9d617c8..b8bb374 100644
 --- a/interface/khronos/egl/egl_client.c
 +++ b/interface/khronos/egl/egl_client.c
@@ -162,6 +162,17 @@ static void egl_current_release(CLIENT_PROCESS_STATE_T *process, EGL_CURRENT_T *
 void egl_gl_flush_callback(bool wait);
 void egl_vg_flush_callback(bool wait);
 +#include "interface/vmcs_host/vc_dispmanx_types.h"
 +/**HACKHACK - give us the ability to inject a DispmanX 
 + * resource handle into the CreateWindowSurface and 
 + * SwapBuffers calls */ 
 +static DISPMANX_RESOURCE_HANDLE_T next_resource_handle;
 +
 +EGLAPI EGLBoolean EGLAPIENTRY eglSetNextResourceHandle(DISPMANX_RESOURCE_HANDLE_T handle)
 +{
 +   next_resource_handle = handle;
 +}
 +
 /*
 TODO: do an RPC call to make sure the Khronos vll is loaded (and that it stays loaded until eglTerminate)
 Also affects global image (and possibly others?)
@@ -644,7 +655,8 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig c
                                 false,
                                 EGL_NO_TEXTURE,
                                 EGL_NO_TEXTURE,
 -                                0, 0);
 +                                0, 0,
 +                                next_resource_handle);
                if (surface) {
                   if (khrn_pointer_map_insert(&process->surfaces, process->next_surface, surface)) {
@@ -889,7 +901,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig
                              mipmap_texture,
                              texture_format,
                              texture_target,
 -                             0, 0);
 +                             0, 0, 0);
             if (surface) {
                if (khrn_pointer_map_insert(&process->surfaces, process->next_surface, surface)) {
@@ -1031,7 +1043,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig c
                                    false,
                                    EGL_NO_TEXTURE,
                                    EGL_NO_TEXTURE,
 -                                   pixmap, ((server_handle[0] == 0) && (server_handle[1] == (uint32_t)(-1))) ? NULL : server_handle);
 +                                   pixmap, ((server_handle[0] == 0) && (server_handle[1] == (uint32_t)(-1))) ? NULL : server_handle, 0);
                      if (surface) {
                         if (khrn_pointer_map_insert(&process->surfaces, process->next_surface, surface)) {
@@ -2303,6 +2315,18 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf)
                vcos_log_trace("eglSwapBuffers server call");
 +               if (next_resource_handle)
 +               RPC_CALL7(eglIntSwapBuffers_impl,
 +                     thread,
 +                     EGLINTSWAPBUFFERS_ID_V2,
 +                     RPC_UINT(surface->serverbuffer),
 +                     RPC_UINT(surface->width),
 +                     RPC_UINT(surface->height),
 +                     RPC_UINT(surface->internal_handle),
 +                     RPC_UINT(surface->swap_behavior == EGL_BUFFER_PRESERVED ? 1 : 0),
 +                     RPC_UINT(khrn_platform_get_window_position(surface->win)),
 +                     RPC_INT(next_resource_handle));
 +               else
                RPC_CALL6(eglIntSwapBuffers_impl,
                      thread,
                      EGLINTSWAPBUFFERS_ID,
 diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c
 index 6846dfa..128325e 100644
 --- a/interface/khronos/egl/egl_client_surface.c
 +++ b/interface/khronos/egl/egl_client_surface.c
@@ -314,7 +314,8 @@ EGL_SURFACE_T *egl_surface_create(
    EGLenum texture_format,
    EGLenum texture_target,
    EGLNativePixmapType pixmap,
 -   const uint32_t *pixmap_server_handle)
 +   const uint32_t *pixmap_server_handle,
 +   DISPMANX_RESOURCE_HANDLE_T next_resource_handle)
 {
    KHRN_IMAGE_FORMAT_T color;
    KHRN_IMAGE_FORMAT_T depth;
@@ -473,6 +474,27 @@ EGL_SURFACE_T *egl_surface_create(
 #endif
          uint32_t results[3];
 +         if (next_resource_handle)
 +         RPC_CALL16_OUT_CTRL(eglIntCreateSurface_impl,
 +                             thread,
 +                             EGLINTCREATESURFACE_ID_V2,
 +                             RPC_UINT(serverwin),
 +                             RPC_UINT(buffers),
 +                             RPC_UINT(width),
 +                             RPC_UINT(height),
 +                             RPC_UINT(color),
 +                             RPC_UINT(depth),
 +                             RPC_UINT(mask),
 +                             RPC_UINT(multi),
 +                             RPC_UINT(largest_pbuffer),
 +                             RPC_UINT(mipmap_texture),
 +                             RPC_UINT(config_depth_bits),
 +                             RPC_UINT(config_stencil_bits),
 +                             RPC_UINT(sem_name),
 +                             RPC_UINT(type),
 +                             RPC_INT(next_resource_handle),
 +                             results);
 +         else
          RPC_CALL15_OUT_CTRL(eglIntCreateSurface_impl,
                              thread,
                              EGLINTCREATESURFACE_ID,
 diff --git a/interface/khronos/egl/egl_client_surface.h b/interface/khronos/egl/egl_client_surface.h
 index c99d44c..b5bf70a 100644
 --- a/interface/khronos/egl/egl_client_surface.h
 +++ b/interface/khronos/egl/egl_client_surface.h
@@ -322,7 +322,8 @@ extern EGL_SURFACE_T *egl_surface_create(
    EGLenum texture_format,
    EGLenum texture_target,
    EGLNativePixmapType pixmap,
 -   const uint32_t *pixmap_server_handle);
 +   const uint32_t *pixmap_server_handle,
 +   DISPMANX_RESOURCE_HANDLE_T next_resource_handle);
 extern EGL_SURFACE_T *egl_surface_from_vg_image(
    VGImage vg_handle,
    EGLSurface name,
 diff --git a/interface/khronos/egl/egl_int_impl.h b/interface/khronos/egl/egl_int_impl.h
 index 8a5734c..51b3580 100644
 --- a/interface/khronos/egl/egl_int_impl.h
 +++ b/interface/khronos/egl/egl_int_impl.h
@@ -56,7 +56,8 @@ FN(int, eglIntCreateSurface_impl, (
    uint32_t config_stencil_bits,
    uint32_t sem,
    uint32_t type,
 -   uint32_t *results))
 +   uint32_t *results,
 +   DISPMANX_RESOURCE_HANDLE_T next_resource_handle))
 FN(int, eglIntCreatePbufferFromVGImage_impl, (
    VGImage vg_handle,
@@ -110,7 +111,7 @@ FN(void, eglIntMakeCurrent_impl, (uint32_t pid_0, uint32_t pid_1, uint32_t glver
 FN(int, eglIntFlushAndWait_impl, (uint32_t flushgl, uint32_t flushvg))
 FN(void, eglIntFlush_impl, (uint32_t flushgl, uint32_t flushvg))
 -FN(void, eglIntSwapBuffers_impl, (EGL_SURFACE_ID_T s, uint32_t width, uint32_t height, uint32_t handle, uint32_t preserve, uint32_t position))
 +FN(void, eglIntSwapBuffers_impl, (EGL_SURFACE_ID_T s, uint32_t width, uint32_t height, uint32_t handle, uint32_t preserve, uint32_t position, DISPMANX_RESOURCE_HANDLE_T new_back_buffer))
 FN(void, eglIntSelectMipmap_impl, (EGL_SURFACE_ID_T s, int level))
 FN(void, eglIntGetColorData_impl, (EGL_SURFACE_ID_T s, KHRN_IMAGE_FORMAT_T format, uint32_t width, uint32_t height, int32_t stride, uint32_t y_offset, void *data))
 -- 
 2.22.0
--- a/Show More
+++ b/Show More
`@@ -1,3 +1,3 @@`
	`# RaspberryPi BSP default versions`	`# RaspberryPi BSP default versions`

	`PREFERRED_VERSION_linux-raspberrypi ?= "4.1.%"`	`PREFERRED_VERSION_linux-raspberrypi ??= "4.19.%"`
		`@@ -0,0 +1,3 @@`
							`FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"`

							`COMPATIBLE_MACHINE_rpi = "(null)"`
		`@@ -0,0 +1 @@`
							`RDEPENDS_packagegroup-meta-oe-kernel_remove_rpi = "bpftool"`
		`@@ -0,0 +1,2 @@`
							`# Apply the same patches for rpi4 as u-boot recipe`
							`require u-boot-rpi4-${PV}.inc`
		`@@ -0,0 +1,2 @@`
							`# mesa-demos needs gles1 and userland driver does not have it, works ok with vc4 graphics driver`
							`X11GLTOOLS_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}"`
		`@@ -1,2 +0,0 @@`
			`FILESEXTRAPATHS_prepend := "${THISDIR}/files:"`
			`SPLASH_IMAGES += "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi"`
		`@@ -0,0 +1 @@`
							`SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/3f204000.spi/spi_master/spi0/spi0.0/net/can0", RUN+="/sbin/ip link set can0 up type can bitrate 500000"`
		`@@ -0,0 +1,3 @@`
							`PACKAGECONFIG_GLESV2 = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'glesv2', d)}"`

							`PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' egl ${PACKAGECONFIG_GLESV2}', d)}"`
		`@@ -0,0 +1,2 @@`
							`# userland driver EGL implementation does not have all needed bits for it so remove it from build`
							`COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}"`
		`@@ -0,0 +1,2 @@`
							`# mesa-demos need libgles1 and userland driver does not have it`
							`COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}"`