meta-raspberrypi: subtree update:853ccd7440..d1f191ed30
Khem Raj (3):
layer.conf: Drop gatesgarth and add honister to LAYERSERIES_COMPAT
gitignore: Ignore .pyc files
tune-arm1176jzf-s.inc: Rework to match oe-core
Mike Looijmans (3):
raspberrypi-firmware: Update to 2021-02-25
linux-raspberrypi: Upgrade to 5.10.17
rpi-base: Add missing overlay_map.dtb and vc4-kms-v3d-pi4.dtbo
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ic9ac546a343a39b164b8322a310265e118d79ea6
diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc
index 8b33a0f..572fe22 100644
--- a/meta-raspberrypi/conf/machine/include/rpi-base.inc
+++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc
@@ -15,6 +15,7 @@
"
RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
+ overlays/overlay_map.dtb \
overlays/at86rf233.dtbo \
overlays/disable-bt.dtbo \
overlays/dwc2.dtbo \
@@ -44,6 +45,7 @@
overlays/rpi-poe.dtbo \
overlays/vc4-fkms-v3d.dtbo \
overlays/vc4-kms-v3d.dtbo \
+ overlays/vc4-kms-v3d-pi4.dtbo \
overlays/vc4-kms-dsi-7inch.dtbo \
overlays/w1-gpio.dtbo \
overlays/w1-gpio-pullup.dtbo \
@@ -110,17 +112,17 @@
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'):
+ if dtb.endswith('dtbo') or base == 'overlay_map.dtb':
# overlay dtb:
# eg: overlays/hifiberry-amp.dtbo has:
# DEPLOYDIR file: hifiberry-amp.dtbo
# destination: overlays/hifiberry-amp.dtbo
return '{};{}'.format(base, dtb)
+ elif dtb.endswith('dtb'):
+ # eg: whatever/bcm2708-rpi-b.dtb has:
+ # DEPLOYDIR file: bcm2708-rpi-b.dtb
+ # destination: bcm2708-rpi-b.dtb
+ return base
return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb])