meta-raspberrypi: sumo refresh 05f21adb99..ade31d6d01

Update meta-raspberrypi to sumo HEAD.

Andrei Gherzan (4):
      raspberrypi3-64.conf: Include cm3 dtb
      linux-raspberrypi: Update to v4.14.58
      rpi-base.inc: Split overlays and dtbs from KERNEL_DEVICETREE
      raspberrypi3-64.conf: Define only the dtb files that are available for arch64

Anton Gerasimov (3):
      rpi-base.inc: install at86rf233 overlay
      rpi-config: load at86rf233 overlay
      docs: document support for 802.15.4 hat

Eduardo Abinader (1):
      config_git.bb: Remove extra space

Hugo Hromic (5):
      formfactor: use `rpi` instead of `raspberrypi` to apply to all rpi machines
      meta-raspberrypi: use `_%` suffix instead of specific versions for bbappends
      pi-bluetooth: use `_git` suffix in recipe filename
      meta-raspberrypi: use generic licenses in ${COMMON_LICENSE_DIR} from Poky
      wiringpi: use lower-case in recipe directory name

Khem Raj (2):
      firmware: Update to 20180619 release
      linux-raspberrypi: Update to 4.14.52+

Martin Jansa (3):
      sdcard_image-rpi.bbclass: copy the DTB files with canonical name
      sdcard_image-rpi: add dependency on rpi-u-boot-scr
      sdcard_image-rpi.bbclass: use 4 spaces for indentation instead of mix of tabs and spaces

Steve Pavao (1):
      rpi-hwup-image.bb: Modified the warning message in do_image_prepend()

Change-Id: If6ee02907ad0f08816eb4d5dad9c92f0d93e252c
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

2 files changed, 19 insertions, 31 deletions

diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc
index d76495a68..2af15886b 100644
--- a/meta-raspberrypi/conf/machine/include/rpi-base.inc
+++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc
@@ -14,16 +14,7 @@ XSERVER = " \
     ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xf86-video-modesetting", "xf86-video-fbdev", d)} \
     "
 
-KERNEL_DEVICETREE ?= " \
-    bcm2708-rpi-0-w.dtb \
-    bcm2708-rpi-b.dtb \
-    bcm2708-rpi-b-plus.dtb \
-    bcm2709-rpi-2-b.dtb \
-    bcm2710-rpi-3-b.dtb \
-    bcm2710-rpi-3-b-plus.dtb \
-    bcm2708-rpi-cm.dtb \
-    bcm2710-rpi-cm3.dtb \
-    \
+RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
     overlays/dwc2.dtbo \
     overlays/hifiberry-amp.dtbo \
     overlays/hifiberry-dac.dtbo \
@@ -43,6 +34,23 @@ KERNEL_DEVICETREE ?= " \
     overlays/pi3-disable-bt.dtbo \
     overlays/pi3-miniuart-bt.dtbo \
     overlays/vc4-kms-v3d.dtbo \
+    overlays/at86rf233.dtbo \
+    "
+
+RPI_KERNEL_DEVICETREE ?= " \
+    bcm2708-rpi-0-w.dtb \
+    bcm2708-rpi-b.dtb \
+    bcm2708-rpi-b-plus.dtb \
+    bcm2709-rpi-2-b.dtb \
+    bcm2710-rpi-3-b.dtb \
+    bcm2710-rpi-3-b-plus.dtb \
+    bcm2708-rpi-cm.dtb \
+    bcm2710-rpi-cm3.dtb \
+    "
+
+KERNEL_DEVICETREE ?= " \
+    ${RPI_KERNEL_DEVICETREE} \
+    ${RPI_KERNEL_DEVICETREE_OVERLAYS} \
     "
 
 # By default:
diff --git a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf
index 5163320da..fb21b122c 100644
--- a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf
+++ b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf
@@ -14,30 +14,10 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 require conf/machine/include/arm/arch-armv8.inc
 include conf/machine/include/rpi-base.inc
 
-KERNEL_DEVICETREE = " \
+RPI_KERNEL_DEVICETREE = " \
     broadcom/bcm2710-rpi-3-b.dtb \
     broadcom/bcm2710-rpi-3-b-plus.dtb \
     broadcom/bcm2837-rpi-3-b.dtb \
-    \
-    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/lirc-rpi.dtbo \
-    overlays/pitft22.dtbo \
-    overlays/pitft28-resistive.dtbo \
-    overlays/pitft35-resistive.dtbo \
-    overlays/pps-gpio.dtbo \
-    overlays/rpi-ft5406.dtbo \
-    overlays/w1-gpio.dtbo \
-    overlays/w1-gpio-pullup.dtbo \
-    overlays/pi3-disable-bt.dtbo \
-    overlays/pi3-miniuart-bt.dtbo \
-    overlays/vc4-kms-v3d.dtbo \
-    overlays/vc4-fkms-v3d.dtbo \
     "
 
 SERIAL_CONSOLE ?= "115200 ttyS0"