[meta-raspberrypi][PATCH 0/3] Kernel update and getVar cleanup

[meta-raspberrypi][PATCH 0/3] Kernel update and getVar cleanup

[Paul Barker]

These patches have been boot tested for both raspberrypi and raspberrypi3.

The first patch in the series probably breaks things for the morty branch. I'm
also proposing we drop support for linux-raspberrypi v4.1 as it's currently
broken on master. We should create a morty branch for meta-raspberrypi before
applying these patches.

Any objections to dropping linux-raspberrypi v4.1 or making a morty branch at
this point?

Paul Barker (3):
  Remove True option to getVar calls
  linux-raspberrypi: Drop v4.1
  linux-raspberrypi: Upgrade to v4.4.39

 classes/linux-raspberrypi-base.bbclass             |   4 +-
 .../0001-dts-add-overlay-for-pitft22.patch         | 110 ---------------------
 ...ove-unused-sm_cache_map_vector-definition.patch |  31 ------
 .../linux-raspberrypi-4.1/0003-fix-gcc6.patch      |  78 ---------------
 recipes-kernel/linux/linux-raspberrypi.inc         |   4 +-
 recipes-kernel/linux/linux-raspberrypi_4.1.bb      |  12 ---
 recipes-kernel/linux/linux-raspberrypi_4.4.bb      |   4 +-
 7 files changed, 6 insertions(+), 237 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.1/0001-dts-add-overlay-for-pitft22.patch
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.1/0002-vmcs-Remove-unused-sm_cache_map_vector-definition.patch
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.1/0003-fix-gcc6.patch
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi_4.1.bb

-- 
2.1.4

[meta-raspberrypi][PATCH 1/3] Remove True option to getVar calls

[Paul Barker]

getVar() now defaults to expanding by default.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 classes/linux-raspberrypi-base.bbclass     | 4 ++--
 recipes-kernel/linux/linux-raspberrypi.inc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/linux-raspberrypi-base.bbclass b/classes/linux-raspberrypi-base.bbclass
index dc2330a..e925d4e 100644
--- a/classes/linux-raspberrypi-base.bbclass
+++ b/classes/linux-raspberrypi-base.bbclass
@@ -3,8 +3,8 @@ inherit linux-kernel-base
 def get_dts(d, ver=None):
     import re
 
-    staging_dir = d.getVar("STAGING_KERNEL_BUILDDIR", True)
-    dts = d.getVar("KERNEL_DEVICETREE", True)
+    staging_dir = d.getVar("STAGING_KERNEL_BUILDDIR")
+    dts = d.getVar("KERNEL_DEVICETREE")
 
     # d.getVar() might return 'None' as a normal string
     # leading to 'is None' check isn't enough.
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index 98229d9..19ebefb 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -32,8 +32,8 @@ KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r",
 # Set programmatically some variables during recipe parsing
 # 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 = get_dts(d, d.getVar('LINUX_VERSION', True))
+    kerneltype = d.getVar('KERNEL_IMAGETYPE')
+    kerneldt = get_dts(d, d.getVar('LINUX_VERSION'))
     d.setVar("KERNEL_DEVICETREE", kerneldt)
 }
 
-- 
2.1.4

[meta-raspberrypi][PATCH 2/3] linux-raspberrypi: Drop v4.1

[Paul Barker]

The linux-raspberrypi 4.1 recipe has been broken for a while, probably since
09b76a43f6f6852406de385a45f472c52b6a8571. It should now be safe to drop this
version.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 .../0001-dts-add-overlay-for-pitft22.patch         | 110 ---------------------
 ...ove-unused-sm_cache_map_vector-definition.patch |  31 ------
 .../linux-raspberrypi-4.1/0003-fix-gcc6.patch      |  78 ---------------
 recipes-kernel/linux/linux-raspberrypi_4.1.bb      |  12 ---
 4 files changed, 231 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.1/0001-dts-add-overlay-for-pitft22.patch
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.1/0002-vmcs-Remove-unused-sm_cache_map_vector-definition.patch
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.1/0003-fix-gcc6.patch
 delete mode 100644 recipes-kernel/linux/linux-raspberrypi_4.1.bb

diff --git a/recipes-kernel/linux/linux-raspberrypi-4.1/0001-dts-add-overlay-for-pitft22.patch b/recipes-kernel/linux/linux-raspberrypi-4.1/0001-dts-add-overlay-for-pitft22.patch
deleted file mode 100644
index e6e0a84..0000000
--- a/recipes-kernel/linux/linux-raspberrypi-4.1/0001-dts-add-overlay-for-pitft22.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From a28bd410022b32a64e208f04b45add6326990332 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petter=20Mab=C3=A4cker?= <petter@technux.se>
-Date: Fri, 8 Jan 2016 09:02:44 +0100
-Subject: [PATCH] dts: add overlay for pitft22
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Add the pitft22 overlay from adafruit Adafruit-Pi-Kernel-o-Matic repo:
-https://github.com/adafruit/Adafruit-Pi-Kernel-o-Matic
-
-Signed-off-by: Petter Mabäcker <petter@technux.se>
----
- arch/arm/boot/dts/overlays/Makefile            |  1 +
- arch/arm/boot/dts/overlays/pitft22-overlay.dts | 69 ++++++++++++++++++++++++++
- 2 files changed, 70 insertions(+)
- create mode 100755 arch/arm/boot/dts/overlays/pitft22-overlay.dts
-
-diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 1a60e9c..a2535a2 100644
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -37,6 +37,7 @@ dtb-$(RPI_DT_OVERLAYS) += mmc-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += mz61581-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += piscreen-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += piscreen2r-overlay.dtb
-+dtb-$(RPI_DT_OVERLAYS) += pitft22-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += pitft28-capacitive-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += pitft28-resistive-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb
-diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
-new file mode 100755
-index 0000000..894ba22
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
-@@ -0,0 +1,69 @@
-+/*
-+ * Device Tree overlay for pitft by Adafruit
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+        compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
-+
-+        fragment@0 {
-+                target = <&spi0>;
-+                __overlay__ {
-+                        status = "okay";
-+
-+                        spidev@0{
-+                                status = "disabled";
-+                        };
-+
-+                        spidev@1{
-+                                status = "disabled";
-+                        };
-+                };
-+        };
-+
-+        fragment@1 {
-+                target = <&gpio>;
-+                __overlay__ {
-+                        pitft_pins: pitft_pins {
-+                                brcm,pins = <25>;
-+                                brcm,function = <1>; /* out */
-+                                brcm,pull = <0>; /* none */
-+                        };
-+                };
-+        };
-+
-+        fragment@2 {
-+                target = <&spi0>;
-+                __overlay__ {
-+                        /* needed to avoid dtc warning */
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+
-+                        pitft: pitft@0{
-+                                compatible = "ilitek,ili9340";
-+                                reg = <0>;
-+                                pinctrl-names = "default";
-+                                pinctrl-0 = <&pitft_pins>;
-+
-+                                spi-max-frequency = <32000000>;
-+                                rotate = <90>;
-+                                fps = <25>;
-+                                bgr;
-+                                buswidth = <8>;
-+                                dc-gpios = <&gpio 25 0>;
-+                                debug = <0>;
-+                        };
-+
-+                };
-+        };
-+
-+        __overrides__ {
-+                speed =   <&pitft>,"spi-max-frequency:0";
-+                rotate =  <&pitft>,"rotate:0";
-+                fps =     <&pitft>,"fps:0";
-+                debug =   <&pitft>,"debug:0";
-+        };
-+};
--- 
-1.9.1
-
diff --git a/recipes-kernel/linux/linux-raspberrypi-4.1/0002-vmcs-Remove-unused-sm_cache_map_vector-definition.patch b/recipes-kernel/linux/linux-raspberrypi-4.1/0002-vmcs-Remove-unused-sm_cache_map_vector-definition.patch
deleted file mode 100644
index 8d4a900..0000000
--- a/recipes-kernel/linux/linux-raspberrypi-4.1/0002-vmcs-Remove-unused-sm_cache_map_vector-definition.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-The code using it also ifdef'ed with 0, anyyd gcc 6
-complains
-
-error: 'sm_cache_map_vector' defined but not used
-
-The code using it also ifdef'ed out
-
-Upstream-status: Denied [https://github.com/raspberrypi/linux/pull/1528]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- drivers/char/broadcom/vc_sm/vmcs_sm.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/char/broadcom/vc_sm/vmcs_sm.c
-+++ b/drivers/char/broadcom/vc_sm/vmcs_sm.c
-@@ -197,12 +197,14 @@ struct SM_STATE_T {
- static struct SM_STATE_T *sm_state;
- static int sm_inited;
- 
-+#if 0
- static const char *const sm_cache_map_vector[] = {
- 	"(null)",
- 	"host",
- 	"videocore",
- 	"host+videocore",
- };
-+#endif
- 
- /* ---- Private Function Prototypes -------------------------------------- */
- 
diff --git a/recipes-kernel/linux/linux-raspberrypi-4.1/0003-fix-gcc6.patch b/recipes-kernel/linux/linux-raspberrypi-4.1/0003-fix-gcc6.patch
deleted file mode 100644
index 61ec2fb..0000000
--- a/recipes-kernel/linux/linux-raspberrypi-4.1/0003-fix-gcc6.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Fix compile with GCC6
-
-Upstream-status: Denied [https://github.com/raspberrypi/linux/pull/1528]
-
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-
-Index: source/include/linux/compiler-gcc6.h
-===================================================================
---- /dev/null
-+++ source/include/linux/compiler-gcc6.h
-@@ -0,0 +1,67 @@
-+#ifndef __LINUX_COMPILER_H
-+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
-+#endif
-+
-+#define __used				__attribute__((__used__))
-+#define __must_check			__attribute__((warn_unused_result))
-+#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
-+
-+/* Mark functions as cold. gcc will assume any path leading to a call
-+   to them will be unlikely.  This means a lot of manual unlikely()s
-+   are unnecessary now for any paths leading to the usual suspects
-+   like BUG(), printk(), panic() etc. [but let's keep them for now for
-+   older compilers]
-+
-+   Early snapshots of gcc 4.3 don't support this and we can't detect this
-+   in the preprocessor, but we can live with this because they're unreleased.
-+   Maketime probing would be overkill here.
-+
-+   gcc also has a __attribute__((__hot__)) to move hot functions into
-+   a special section, but I don't see any sense in this right now in
-+   the kernel context */
-+#define __cold			__attribute__((__cold__))
-+
-+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
-+
-+#ifndef __CHECKER__
-+# define __compiletime_warning(message) __attribute__((warning(message)))
-+# define __compiletime_error(message) __attribute__((error(message)))
-+#endif /* __CHECKER__ */
-+
-+/*
-+ * Mark a position in code as unreachable.  This can be used to
-+ * suppress control flow warnings after asm blocks that transfer
-+ * control elsewhere.
-+ *
-+ * Early snapshots of gcc 4.5 don't support this and we can't detect
-+ * this in the preprocessor, but we can live with this because they're
-+ * unreleased.  Really, we need to have autoconf for the kernel.
-+ */
-+#define unreachable() __builtin_unreachable()
-+
-+/* Mark a function definition as prohibited from being cloned. */
-+#define __noclone	__attribute__((__noclone__))
-+
-+/*
-+ * Tell the optimizer that something else uses this function or variable.
-+ */
-+#define __visible __attribute__((externally_visible))
-+
-+/*
-+ * GCC 'asm goto' miscompiles certain code sequences:
-+ *
-+ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
-+ *
-+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
-+ *
-+ * (asm goto is automatically volatile - the naming reflects this.)
-+ */
-+#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
-+
-+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
-+#define __HAVE_BUILTIN_BSWAP32__
-+#define __HAVE_BUILTIN_BSWAP64__
-+#define __HAVE_BUILTIN_BSWAP16__
-+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
-+
-+#define KASAN_ABI_VERSION 4
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.1.bb b/recipes-kernel/linux/linux-raspberrypi_4.1.bb
deleted file mode 100644
index 87c77b8..0000000
--- a/recipes-kernel/linux/linux-raspberrypi_4.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-
-LINUX_VERSION ?= "4.1.21"
-
-SRCREV = "ff45bc0e8917c77461b2901e2743e6339bb70413"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.1.y \
-           file://0001-dts-add-overlay-for-pitft22.patch \
-           file://0002-vmcs-Remove-unused-sm_cache_map_vector-definition.patch \
-           file://0003-fix-gcc6.patch \
-          "
-
-require linux-raspberrypi.inc
-- 
2.1.4

[meta-raspberrypi][PATCH 3/3] linux-raspberrypi: Upgrade to v4.4.39

[Paul Barker]

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 recipes-kernel/linux/linux-raspberrypi_4.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-raspberrypi_4.4.bb b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
index 35a72d7..3317c02 100644
--- a/recipes-kernel/linux/linux-raspberrypi_4.4.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
@@ -1,8 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 
-LINUX_VERSION ?= "4.4.35"
+LINUX_VERSION ?= "4.4.39"
 
-SRCREV = "5d765c8b5782de7ed49f623c107f1b395429b560"
+SRCREV = "5e46914b3417fe9ff42546dcacd0f41f9a0fb172"
 SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \
            file://0001-fix-dtbo-rules.patch \
 "
-- 
2.1.4

Re: [meta-raspberrypi][PATCH 0/3] Kernel update and getVar cleanup

[Paul Barker]

On Mon,  2 Jan 2017 13:20:10 +0000
Paul Barker <paul@paulbarker.me.uk> wrote:

> These patches have been boot tested for both raspberrypi and raspberrypi3.
> 
> The first patch in the series probably breaks things for the morty branch. I'm
> also proposing we drop support for linux-raspberrypi v4.1 as it's currently
> broken on master. We should create a morty branch for meta-raspberrypi before
> applying these patches.
> 
> Any objections to dropping linux-raspberrypi v4.1 or making a morty branch at
> this point?
> 
> Paul Barker (3):
>   Remove True option to getVar calls
>   linux-raspberrypi: Drop v4.1
>   linux-raspberrypi: Upgrade to v4.4.39
> 
>  classes/linux-raspberrypi-base.bbclass             |   4 +-
>  .../0001-dts-add-overlay-for-pitft22.patch         | 110 ---------------------
>  ...ove-unused-sm_cache_map_vector-definition.patch |  31 ------
>  .../linux-raspberrypi-4.1/0003-fix-gcc6.patch      |  78 ---------------
>  recipes-kernel/linux/linux-raspberrypi.inc         |   4 +-
>  recipes-kernel/linux/linux-raspberrypi_4.1.bb      |  12 ---
>  recipes-kernel/linux/linux-raspberrypi_4.4.bb      |   4 +-
>  7 files changed, 6 insertions(+), 237 deletions(-)
>  delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.1/0001-dts-add-overlay-for-pitft22.patch
>  delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.1/0002-vmcs-Remove-unused-sm_cache_map_vector-definition.patch
>  delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.1/0003-fix-gcc6.patch
>  delete mode 100644 recipes-kernel/linux/linux-raspberrypi_4.1.bb
> 

Ping on this patch series.

Re: [meta-raspberrypi][PATCH 0/3] Kernel update and getVar cleanup

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1802 bytes --]

On Mon, Jan 16, 2017 at 07:15:23AM +0000, Paul Barker wrote:
> On Mon,  2 Jan 2017 13:20:10 +0000
> Paul Barker <paul@paulbarker.me.uk> wrote:
>
> > These patches have been boot tested for both raspberrypi and raspberrypi3.
> >
> > The first patch in the series probably breaks things for the morty branch. I'm
> > also proposing we drop support for linux-raspberrypi v4.1 as it's currently
> > broken on master. We should create a morty branch for meta-raspberrypi before
> > applying these patches.
> >
> > Any objections to dropping linux-raspberrypi v4.1 or making a morty branch at
> > this point?
> >
> > Paul Barker (3):
> >   Remove True option to getVar calls
> >   linux-raspberrypi: Drop v4.1
> >   linux-raspberrypi: Upgrade to v4.4.39
> >
> >  classes/linux-raspberrypi-base.bbclass             |   4 +-
> >  .../0001-dts-add-overlay-for-pitft22.patch         | 110 ---------------------
> >  ...ove-unused-sm_cache_map_vector-definition.patch |  31 ------
> >  .../linux-raspberrypi-4.1/0003-fix-gcc6.patch      |  78 ---------------
> >  recipes-kernel/linux/linux-raspberrypi.inc         |   4 +-
> >  recipes-kernel/linux/linux-raspberrypi_4.1.bb      |  12 ---
> >  recipes-kernel/linux/linux-raspberrypi_4.4.bb      |   4 +-
> >  7 files changed, 6 insertions(+), 237 deletions(-)
> >  delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.1/0001-dts-add-overlay-for-pitft22.patch
> >  delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.1/0002-vmcs-Remove-unused-sm_cache_map_vector-definition.patch
> >  delete mode 100644 recipes-kernel/linux/linux-raspberrypi-4.1/0003-fix-gcc6.patch
> >  delete mode 100644 recipes-kernel/linux/linux-raspberrypi_4.1.bb
> >
>
> Ping on this patch series.

On it right now.

--
Andrei Gherzan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 849 bytes --]

Re: [meta-raspberrypi][PATCH 0/3] Kernel update and getVar cleanup

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 607 bytes --]

On Mon, Jan 02, 2017 at 01:20:10PM +0000, Paul Barker wrote:
> These patches have been boot tested for both raspberrypi and raspberrypi3.
>
> The first patch in the series probably breaks things for the morty branch. I'm
> also proposing we drop support for linux-raspberrypi v4.1 as it's currently
> broken on master. We should create a morty branch for meta-raspberrypi before
> applying these patches.
>
> Any objections to dropping linux-raspberrypi v4.1 or making a morty branch at
> this point?
>

Created a morty branch and merged these patches in master. Thank you.
--
Andrei Gherzan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 849 bytes --]