[yocto] [meta-raspberrypi] [PATCH] ds1307-rtc-overlay.dtb has been removed from the kernel tree, and most overlays have been moved to the dts/overlays directory

[Herve Jourdain]

Hi,

 

Actually, the situation is slightly more complex than I initially supposed :
not only were some .dtb deleted, but also most were moved to the < overlays
> subdirectory.

This is true for the kernel after git
739c586c87576fb8ef151b5843ebed76c43a5221:
https://github.com/raspberrypi/linux/commit/739c586c87576fb8ef151b5843ebed76
c43a5221 

The following patch is making the whole thing compiling, and seems to
install them in the right places, but I'm not sure I'm creating the
directory needed for compiling the overlays at the best of places.

Anyway, here it goes:

 

Signed-off-by: herve.jourdain at neuf.fr <mailto:herve.jourdain at neuf.fr> 

 

--- meta-raspberrypi/conf/machine/include/rpi-base.inc     2015-05-19
10:34:22.099500543 +0800

+++ meta-raspberrypi.new/conf/machine/include/rpi-base.inc 2015-06-17
02:34:11.538069350 +0800

@@ -23,18 +23,17 @@

     bcm2708-rpi-b-plus.dtb \

     bcm2709-rpi-2-b.dtb \

     \

-    ds1307-rtc-overlay.dtb \

-    hifiberry-amp-overlay.dtb \

-    hifiberry-dac-overlay.dtb \

-    hifiberry-dacplus-overlay.dtb \

-    hifiberry-digi-overlay.dtb \

-    iqaudio-dac-overlay.dtb \

-    iqaudio-dacplus-overlay.dtb \

-    lirc-rpi-overlay.dtb \

-    pcf8523-rtc-overlay.dtb \

-    pps-gpio-overlay.dtb \

-    w1-gpio-overlay.dtb \

-    w1-gpio-pullup-overlay.dtb \

+    overlays/hifiberry-amp-overlay.dtb \

+    overlays/hifiberry-dac-overlay.dtb \

+    overlays/hifiberry-dacplus-overlay.dtb \

+    overlays/hifiberry-digi-overlay.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"

--- meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
2015-05-19 10:34:22.103500543 +0800

+++ meta-raspberrypi.new/recipes-kernel/linux/linux-raspberrypi.inc
2015-06-17 04:34:03.562361029 +0800

@@ -42,6 +42,9 @@

 do_install_prepend() {

     install -d ${D}/lib/firmware

+    if [ -n "${KERNEL_DEVICETREE}" ]; then

+          mkdir -p ${B}/arch/${ARCH}/boot/dts/overlays

+    fi

}

 do_deploy_append() {

 

Regards

 

From: Herve Jourdain [mailto:herve.jourdain at neuf.fr] 
Sent: mercredi 17 juin 2015 04:57
To: 'yocto at yoctoproject.org'
Subject: [meta-raspberrypi] ds1307-rtc-overlay.dtb has been removed from the
kernel tree

 

Hi,

 

I'm not sure about the formalism of submitting patches to this list, so I
hope you will forgive any misstep.

 

Recently, the RaspberryPi kernel has removed some "deprecated" DTB overlays
from the kernel tree, causing the meta-raspberrypi layer to fail at compile
time.

The failure message is:

No rule to make target `arch/arm/boot/dts/ds1307-rtc-overlay.dtb'.  Stop.

 

The DTB overlays that have been deleted are:

ds1307-rtc-overlay

pf2127-rtc-overlay

pcf8523-rtc-overlay

pfc8563-rtc-overlay

 

They've been replaced by: i2c-rtc-overlay

 

Therefore, the file conf/machine/include/rpi-base.inc must be modified to
accommodate those changes.

 

The proposed patch is:

--- meta-raspberrypi/conf/machine/include/rpi-base.inc     2015-06-10
12:59:09.069237631 +0800

+++ meta-raspberrypi.new/conf/machine/include/rpi-base.inc 2015-06-17
01:11:58.125869271 +0800

@@ -23,15 +23,14 @@

     bcm2708-rpi-b-plus.dtb \

     bcm2709-rpi-2-b.dtb \

     \

-    ds1307-rtc-overlay.dtb \

     hifiberry-amp-overlay.dtb \

     hifiberry-dac-overlay.dtb \

     hifiberry-dacplus-overlay.dtb \

     hifiberry-digi-overlay.dtb \

+    i2c-rtc-overlay.dtb \

     iqaudio-dac-overlay.dtb \

     iqaudio-dacplus-overlay.dtb \

     lirc-rpi-overlay.dtb \

-    pcf8523-rtc-overlay.dtb \

     pps-gpio-overlay.dtb \

     w1-gpio-overlay.dtb \

     w1-gpio-pullup-overlay.dtb \

Signed-off-by: herve.jourdain at neuf.fr <mailto:herve.jourdain at neuf.fr> 

 

Regards

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20150617/d7dd1f34/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: meta-raspberrypi-dtb-changes.patch
Type: application/octet-stream
Size: 1538 bytes
Desc: not available
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20150617/d7dd1f34/attachment.obj>