[yocto] [meta-raspberrypi][morty][PATCH 1/6] linux-raspberrypi: Drop v4.1
Khem Raj
raj.khem at gmail.com
Sat Jan 21 19:52:27 PST 2017
On Fri, Jan 20, 2017 at 9:40 AM, Andrei Gherzan <andrei at gherzan.ro> wrote:
> On Thu, Jan 19, 2017 at 11:50 AM, Andrei Gherzan <andrei at gherzan.ro> wrote:
>> From: Paul Barker <paul at paulbarker.me.uk>
>>
>> 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 at 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 at 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 at 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 at 0 {
>> -+ target = <&spi0>;
>> -+ __overlay__ {
>> -+ status = "okay";
>> -+
>> -+ spidev at 0{
>> -+ status = "disabled";
>> -+ };
>> -+
>> -+ spidev at 1{
>> -+ status = "disabled";
>> -+ };
>> -+ };
>> -+ };
>> -+
>> -+ fragment at 1 {
>> -+ target = <&gpio>;
>> -+ __overlay__ {
>> -+ pitft_pins: pitft_pins {
>> -+ brcm,pins = <25>;
>> -+ brcm,function = <1>; /* out */
>> -+ brcm,pull = <0>; /* none */
>> -+ };
>> -+ };
>> -+ };
>> -+
>> -+ fragment at 2 {
>> -+ target = <&spi0>;
>> -+ __overlay__ {
>> -+ /* needed to avoid dtc warning */
>> -+ #address-cells = <1>;
>> -+ #size-cells = <0>;
>> -+
>> -+ pitft: pitft at 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 at 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 at 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.7.4
>>
>
> Merged this entire series for morty.
>
> We have to decide what to do with the versions of kernel that rebase
> often making the recipes fail. To do as follow up patches.
We should remove them from release branches too.
> --
> _______________________________________________
> yocto mailing list
> yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
More information about the yocto
mailing list