kernel fixes

After '6392a63 rpi-base.inc: Use KERNEL_DEVICETREE by default' was introduced, kernel versions < 3.18 might not be buildable. Since full device tree support was introduced in 3.18 this change ensures that all kernel < 3.18 will automatically disable device tree.

Signed-off-by Petter Mabäcker <[email protected]>

---
 classes/linux-raspberrypi-base.bbclass     | 29
+++++++++++++++++++++++++++++
 classes/sdcard_image-rpi.bbclass           |  6 ++++--
 recipes-kernel/linux/linux-raspberrypi.inc |  4 +++-
 3 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 classes/linux-raspberrypi-base.bbclass

classes/linux-raspberrypi-base.bbclass new file +29 -0

new file mode 100644
index 0000000..4bcadd0
@@ -0,0 +1,29 @@
+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

classes/sdcard_image-rpi.bbclass +1 -1

index 1ff664d..ca94566 100644
@@ -1,4 +1,5 @@
 inherit image_types
+inherit linux-raspberrypi-base
 
 #
 # Create an image that can by written onto a SD card using dd.

@@ -88,7 +89,8 @@ IMAGE_CMD_rpi-sdimg () {
        ROOTFS_SIZE_ALIGNED=$(expr ${ROOTFS_SIZE_ALIGNED} -
 ${ROOTFS_SIZE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
        SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} +
 ${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE_ALIGNED})
 
-       echo "Creating filesystem with Boot partition

${BOOT_SPACE_ALIGNED} KiB and RootFS ${ROOTFS_SIZE_ALIGNED} KiB"

# Initialize sdcard image file
dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}

classes/sdcard_image-rpi.bbclass +0 -0

@@ -112,7 +114,7 @@ IMAGE_CMD_rpi-sdimg () {
                mcopy -i ${WORKDIR}/boot.img -s

${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::uImage

                ;;
        *)

classes/sdcard_image-rpi.bbclass +1 -1

-               if test -n "${KERNEL_DEVICETREE}"; then
+               if test -n "${DTS}"; then
                        # Copy board device trees to root folder
                        for DTB in ${DT_ROOT}; do
                                DTB_BASE_NAME=`basename ${DTB} .dtb`

recipes-kernel/linux/linux-raspberrypi.inc +1 -0

index 84d4f9e..7e36408 100644
@@ -1,4 +1,5 @@
 require linux.inc
+inherit linux-raspberrypi-base
 
 DESCRIPTION = "Linux Kernel for Raspberry Pi"
 SECTION = "kernel"

@@ -26,7 +27,8 @@ UDEV_GE_141 ?= "1"
 # See

http://www.yoctoproject.org/docs/current/bitbake-user-manual/bitbake-user-manual.html#anonymous-python-functions
python __anonymous () {
kerneltype = d.getVar('KERNEL_IMAGETYPE', True)

recipes-kernel/linux/linux-raspberrypi.inc +2 -1

-    kerneldt = d.getVar('KERNEL_DEVICETREE', True)
+    kerneldt = get_dts(d, d.getVar('LINUX_VERSION', True))
+    d.setVar("KERNEL_DEVICETREE", kerneldt)
 
     # Add dependency to 'rpi-mkimage-native' package only if RPi

bootloader is used with DT-enable kernel
if kerneldt:
--
1.9.1

--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

Hello Petter,

On Fri, May 8, 2015 at 11:49 PM, Petter Mabäcker <[email protected] <mailto:[email protected]>> wrote:

After '6392a63 rpi-base.inc: Use KERNEL_DEVICETREE by default' was introduced, kernel versions < 3.18 might not be buildable. Since full device tree support was introduced in 3.18 this change ensures that all
kernel < 3.18 will automatically disable device tree.

Signed-off-by Petter Mabäcker <[email protected]

<mailto:[email protected]>>
---
classes/linux-raspberrypi-base.bbclass | 29
+++++++++++++++++++++++++++++
classes/sdcard_image-rpi.bbclass | 6 ++++--
recipes-kernel/linux/linux-raspberrypi.inc | 4 +++- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 classes/linux-raspberrypi-base.bbclass

diff --git a/classes/linux-raspberrypi-base.bbclass b/classes/linux-raspberrypi-base.bbclass new file mode 100644
index 0000000..4bcadd0
--- /dev/null
+++ b/classes/linux-raspberrypi-base.bbclass @@ -0,0 +1,29 @@
+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
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 1ff664d..ca94566 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -1,4 +1,5 @@
inherit image_types
+inherit linux-raspberrypi-base

#
# Create an image that can by written onto a SD card using dd.
@@ -88,7 +89,8 @@ IMAGE_CMD_rpi-sdimg () {
ROOTFS_SIZE_ALIGNED=$(expr ${ROOTFS_SIZE_ALIGNED} -
${ROOTFS_SIZE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} +
${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE_ALIGNED})

- echo "Creating filesystem with Boot partition
${BOOT_SPACE_ALIGNED} KiB and RootFS ${ROOTFS_SIZE_ALIGNED} KiB"

Why do you remove this line? Maybe by mistake?

+ # Check if we are building with device tree support
+ DTS="${@get_dts(d, None)}"

Aren't we able to use the same variable name, KERNEL_DEVICETREE? What that be a little clearer?

            # Initialize sdcard image file
            dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}
    @@ -112,7 +114,7 @@ IMAGE_CMD_rpi-sdimg () {
                    mcopy -i ${WORKDIR}/boot.img -s
    ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin
    ::uImage
                    ;;
            *)
    -               if test -n "${KERNEL_DEVICETREE}"; then
    +               if test -n "${DTS}"; then
                            # Copy board device trees to root folder
                            for DTB in ${DT_ROOT}; do
                                    DTB_BASE_NAME=`basename ${DTB} .dtb`
    diff --git a/recipes-kernel/linux/linux-raspberrypi.inc
    b/recipes-kernel/linux/linux-raspberrypi.inc
    index 84d4f9e..7e36408 100644
    --- a/recipes-kernel/linux/linux-raspberrypi.inc
    +++ b/recipes-kernel/linux/linux-raspberrypi.inc
    @@ -1,4 +1,5 @@
     require linux.inc
    +inherit linux-raspberrypi-base

     DESCRIPTION = "Linux Kernel for Raspberry Pi"
     SECTION = "kernel"
    @@ -26,7 +27,8 @@ UDEV_GE_141 ?= "1"
     # See
    http://www.yoctoproject.org/docs/current/bitbake-user-manual/bitbake-user-manual.html#anonymous-python-functions
     python __anonymous () {
         kerneltype = d.getVar('KERNEL_IMAGETYPE', True)
    -    kerneldt = d.getVar('KERNEL_DEVICETREE', True)
    +    kerneldt = get_dts(d, d.getVar('LINUX_VERSION', True))
    +    d.setVar("KERNEL_DEVICETREE", kerneldt)

         # Add dependency to 'rpi-mkimage-native' package only if RPi
    bootloader is used with DT-enable kernel
         if kerneldt:
    --
    1.9.1

    --
    _______________________________________________
    yocto mailing list
    [email protected] <mailto:[email protected]>
    https://lists.yoctoproject.org/listinfo/yocto

Signature · 3 lines

*Andrei Gherzan*
*e: */[email protected] <mailto:[email protected]>/
/*w:* /www.gherzan.ro <http://www.gherzan.ro>

Hi Andrei,

See answers inline.

BR,
Petter

On 05/10/2015 12:16 PM, Andrei Gherzan wrote:

Hello Petter,

Quoted 68 lines · Petter Mabäcker

After '6392a63 rpi-base.inc: Use KERNEL_DEVICETREE by default' was introduced, kernel versions < 3.18 might not be buildable. Since full device tree support was introduced in 3.18 this change ensures that all kernel < 3.18 will automatically disable device tree.

Signed-off-by Petter Mabäcker <[email protected]>

---
 classes/linux-raspberrypi-base.bbclass     | 29
+++++++++++++++++++++++++++++
 classes/sdcard_image-rpi.bbclass           |  6 ++++--
 recipes-kernel/linux/linux-raspberrypi.inc |  4 +++-
 3 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 classes/linux-raspberrypi-base.bbclass

classes/linux-raspberrypi-base.bbclass new file +29 -0

new file mode 100644
index 0000000..4bcadd0
@@ -0,0 +1,29 @@
+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

classes/sdcard_image-rpi.bbclass +1 -1

index 1ff664d..ca94566 100644
@@ -1,4 +1,5 @@
 inherit image_types
+inherit linux-raspberrypi-base
 
 #
 # Create an image that can by written onto a SD card using dd.

@@ -88,7 +89,8 @@ IMAGE_CMD_rpi-sdimg () {
        ROOTFS_SIZE_ALIGNED=$(expr ${ROOTFS_SIZE_ALIGNED} -
 ${ROOTFS_SIZE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
        SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} +
 ${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE_ALIGNED})
 
-       echo "Creating filesystem with Boot partition

Quoted 2 lines

${BOOT_SPACE_ALIGNED} KiB and RootFS ${ROOTFS_SIZE_ALIGNED} KiB"

Why do you remove this line? Maybe by mistake?

Yes this is by mistake, thanks for finding it. Will send up a new version with this fixed.

Don't bother. I'll fix it before merging.

classes/sdcard_image-rpi.bbclass IMAGE_CMD_rpi-sdimg () { · line 93

Quoted 3 lines

classes/sdcard_image-rpi.bbclass +2 -0

+       # Check if we are building with device tree support
+       DTS="${@get_dts(d, None)}"

Aren't we able to use the same variable name, KERNEL_DEVICETREE? What
that be a little clearer?

No, at least i couldn't get this working. When trying to set the environment variable KERNEL_DEVICETREE in this context the values was only ignored. Don't know if the image recipe (or at least the IMAGE_CMD func) are doing something special. Perhaps it's possible to use 'eval' or something similar to enforce the expansion of the variable. If you have any good advice please share them, otherwise I can at least write some comment about this.

On Sun, May 10, 2015 at 4:20 PM, Petter Mabäcker <[email protected] <mailto:[email protected]>> wrote:

    Hi Andrei,

    See answers inline.

    BR,
    Petter


    On 05/10/2015 12:16 PM, Andrei Gherzan wrote:

Quoted 80 lines

Hello Petter,

On Fri, May 8, 2015 at 11:49 PM, Petter Mabäcker <[email protected] <mailto:[email protected]>> wrote:

After '6392a63 rpi-base.inc: Use KERNEL_DEVICETREE by default' was
introduced, kernel versions < 3.18 might not be buildable. Since full
device tree support was introduced in 3.18 this change ensures that all
kernel < 3.18 will automatically disable device tree.

Signed-off-by Petter Mabäcker <[email protected]

<mailto:[email protected]>>
---
classes/linux-raspberrypi-base.bbclass | 29
+++++++++++++++++++++++++++++
classes/sdcard_image-rpi.bbclass | 6 ++++-- recipes-kernel/linux/linux-raspberrypi.inc | 4 +++- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 classes/linux-raspberrypi-base.bbclass

diff --git a/classes/linux-raspberrypi-base.bbclass b/classes/linux-raspberrypi-base.bbclass new file mode 100644
index 0000000..4bcadd0
--- /dev/null
+++ b/classes/linux-raspberrypi-base.bbclass @@ -0,0 +1,29 @@
+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
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 1ff664d..ca94566 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -1,4 +1,5 @@
inherit image_types
+inherit linux-raspberrypi-base

#
# Create an image that can by written onto a SD card using dd.
@@ -88,7 +89,8 @@ IMAGE_CMD_rpi-sdimg () {
ROOTFS_SIZE_ALIGNED=$(expr ${ROOTFS_SIZE_ALIGNED} -
${ROOTFS_SIZE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} +
${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE_ALIGNED})

- echo "Creating filesystem with Boot partition
${BOOT_SPACE_ALIGNED} KiB and RootFS ${ROOTFS_SIZE_ALIGNED} KiB"

Quoted 1 line

Why do you remove this line? Maybe by mistake?

Yes this is by mistake, thanks for finding it. Will send up a new version with this fixed.

Don't bother. I'll fix it before merging.

Quoted 7 lines

+ # Check if we are building with device tree support
+ DTS="${@get_dts(d, None)}"

Aren't we able to use the same variable name, KERNEL_DEVICETREE? What that be a little clearer?

No, at least i couldn't get this working. When trying to set the environment variable KERNEL_DEVICETREE in this context the values was only ignored. Don't know if the image recipe (or at least the IMAGE_CMD func) are doing something special. Perhaps it's possible to use 'eval' or something similar to enforce the expansion of the variable. If you have any good advice please share them, otherwise I can at least write some comment about this.

I'll try it a little. But I didn't expect this. Will see. Otherwise this is fine.

Signature · 4 lines

-- 
*Andrei Gherzan*
*e: */[email protected] <mailto:[email protected]>/
/*w:* /www.gherzan.ro <http://www.gherzan.ro>

classes/sdcard_image-rpi.bbclass +2 -0

+       # Check if we are building with device tree support
+       DTS="${@get_dts(d, None)}"
 
        # Initialize sdcard image file
        dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}

meta-raspberrypi currently supports too many versions in order to ensure that all of them are frequently tested and updated. Change to only support latest stable + 2 long term versions.

[Support #59]

Signed-off-by Petter Mabäcker <[email protected]>

Add basic support for Linux 3.14, cherry-pick changes from 3.18.y in order to solve some debugfs warnings and get better support for i2s for BCM2708.

- 3.14 lacks BCM2709 support and will not by default be able to use for raspberry pi 2.

Below warnings still exists they are harmless and exists due to that snd_soc_pcm512x is triggered to be loaded twice. The problem is solved after device tree support for the driver was introduced in 3.18.y and no easy solution exists to solve this problem on older kernel versions (see
https://github.com/raspberrypi/linux/issues/662 for more info).

pcm512x 1-004c: Failed to reset device: -5
pcm512x: probe of 1-004c failed with error

Remove sl030raspberrypii2ckernel.patch since it will not apply anymore and its content seems to be obsolite after cherry-picking '558d0bf Fix grabbing lock from atomic context in i2c driver'.

[Support #57]

Update linux-raspberrypi_3.12 to latest revision.

Remove sl030raspberrypii2ckernel.patch since it will not apply anymore and its content seems to be obsolite after
'558d0bf Fix grabbing lock from atomic context in i2c driver' was merged to 3.12.

[Support #60]

Signed-off-by Petter Mabäcker <[email protected]>

Hi Petter,

Quoted 1 line

+ #

I started to

to this

for DTS

which use

move

DT_OVERLAYS =

'${DT_ALL}', d)}"
DT_ROOT

...

Andrei