diff options
| author | Paul Barker <paul@paulbarker.me.uk> | 2017-01-02 13:20:12 +0000 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.ro> | 2017-01-18 16:43:00 +0100 |
| commit | 642d5c25b2617dabdfb5fd978a0c211e6bdbcbc6 (patch) | |
| tree | 05f7fc5b4392da2df14a1355c642a61a86c096cc | |
| parent | 3ad29d11e7f9c08de8e782ef4264e2047acb42bb (diff) | |
| download | meta-raspberrypi-642d5c25b2617dabdfb5fd978a0c211e6bdbcbc6.tar.gz | |
linux-raspberrypi: Drop v4.1
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>
4 files changed, 0 insertions, 231 deletions
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 @@ | |||
| 1 | From a28bd410022b32a64e208f04b45add6326990332 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Petter=20Mab=C3=A4cker?= <petter@technux.se> | ||
| 3 | Date: Fri, 8 Jan 2016 09:02:44 +0100 | ||
| 4 | Subject: [PATCH] dts: add overlay for pitft22 | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Add the pitft22 overlay from adafruit Adafruit-Pi-Kernel-o-Matic repo: | ||
| 12 | https://github.com/adafruit/Adafruit-Pi-Kernel-o-Matic | ||
| 13 | |||
| 14 | Signed-off-by: Petter Mabäcker <petter@technux.se> | ||
| 15 | --- | ||
| 16 | arch/arm/boot/dts/overlays/Makefile | 1 + | ||
| 17 | arch/arm/boot/dts/overlays/pitft22-overlay.dts | 69 ++++++++++++++++++++++++++ | ||
| 18 | 2 files changed, 70 insertions(+) | ||
| 19 | create mode 100755 arch/arm/boot/dts/overlays/pitft22-overlay.dts | ||
| 20 | |||
| 21 | diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile | ||
| 22 | index 1a60e9c..a2535a2 100644 | ||
| 23 | --- a/arch/arm/boot/dts/overlays/Makefile | ||
| 24 | +++ b/arch/arm/boot/dts/overlays/Makefile | ||
| 25 | @@ -37,6 +37,7 @@ dtb-$(RPI_DT_OVERLAYS) += mmc-overlay.dtb | ||
| 26 | dtb-$(RPI_DT_OVERLAYS) += mz61581-overlay.dtb | ||
| 27 | dtb-$(RPI_DT_OVERLAYS) += piscreen-overlay.dtb | ||
| 28 | dtb-$(RPI_DT_OVERLAYS) += piscreen2r-overlay.dtb | ||
| 29 | +dtb-$(RPI_DT_OVERLAYS) += pitft22-overlay.dtb | ||
| 30 | dtb-$(RPI_DT_OVERLAYS) += pitft28-capacitive-overlay.dtb | ||
| 31 | dtb-$(RPI_DT_OVERLAYS) += pitft28-resistive-overlay.dtb | ||
| 32 | dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb | ||
| 33 | diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts b/arch/arm/boot/dts/overlays/pitft22-overlay.dts | ||
| 34 | new file mode 100755 | ||
| 35 | index 0000000..894ba22 | ||
| 36 | --- /dev/null | ||
| 37 | +++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts | ||
| 38 | @@ -0,0 +1,69 @@ | ||
| 39 | +/* | ||
| 40 | + * Device Tree overlay for pitft by Adafruit | ||
| 41 | + * | ||
| 42 | + */ | ||
| 43 | + | ||
| 44 | +/dts-v1/; | ||
| 45 | +/plugin/; | ||
| 46 | + | ||
| 47 | +/ { | ||
| 48 | + compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; | ||
| 49 | + | ||
| 50 | + fragment@0 { | ||
| 51 | + target = <&spi0>; | ||
| 52 | + __overlay__ { | ||
| 53 | + status = "okay"; | ||
| 54 | + | ||
| 55 | + spidev@0{ | ||
| 56 | + status = "disabled"; | ||
| 57 | + }; | ||
| 58 | + | ||
| 59 | + spidev@1{ | ||
| 60 | + status = "disabled"; | ||
| 61 | + }; | ||
| 62 | + }; | ||
| 63 | + }; | ||
| 64 | + | ||
| 65 | + fragment@1 { | ||
| 66 | + target = <&gpio>; | ||
| 67 | + __overlay__ { | ||
| 68 | + pitft_pins: pitft_pins { | ||
| 69 | + brcm,pins = <25>; | ||
| 70 | + brcm,function = <1>; /* out */ | ||
| 71 | + brcm,pull = <0>; /* none */ | ||
| 72 | + }; | ||
| 73 | + }; | ||
| 74 | + }; | ||
| 75 | + | ||
| 76 | + fragment@2 { | ||
| 77 | + target = <&spi0>; | ||
| 78 | + __overlay__ { | ||
| 79 | + /* needed to avoid dtc warning */ | ||
| 80 | + #address-cells = <1>; | ||
| 81 | + #size-cells = <0>; | ||
| 82 | + | ||
| 83 | + pitft: pitft@0{ | ||
| 84 | + compatible = "ilitek,ili9340"; | ||
| 85 | + reg = <0>; | ||
| 86 | + pinctrl-names = "default"; | ||
| 87 | + pinctrl-0 = <&pitft_pins>; | ||
| 88 | + | ||
| 89 | + spi-max-frequency = <32000000>; | ||
| 90 | + rotate = <90>; | ||
| 91 | + fps = <25>; | ||
| 92 | + bgr; | ||
| 93 | + buswidth = <8>; | ||
| 94 | + dc-gpios = <&gpio 25 0>; | ||
| 95 | + debug = <0>; | ||
| 96 | + }; | ||
| 97 | + | ||
| 98 | + }; | ||
| 99 | + }; | ||
| 100 | + | ||
| 101 | + __overrides__ { | ||
| 102 | + speed = <&pitft>,"spi-max-frequency:0"; | ||
| 103 | + rotate = <&pitft>,"rotate:0"; | ||
| 104 | + fps = <&pitft>,"fps:0"; | ||
| 105 | + debug = <&pitft>,"debug:0"; | ||
| 106 | + }; | ||
| 107 | +}; | ||
| 108 | -- | ||
| 109 | 1.9.1 | ||
| 110 | |||
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 @@ | |||
| 1 | The code using it also ifdef'ed with 0, anyyd gcc 6 | ||
| 2 | complains | ||
| 3 | |||
| 4 | error: 'sm_cache_map_vector' defined but not used | ||
| 5 | |||
| 6 | The code using it also ifdef'ed out | ||
| 7 | |||
| 8 | Upstream-status: Denied [https://github.com/raspberrypi/linux/pull/1528] | ||
| 9 | |||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | drivers/char/broadcom/vc_sm/vmcs_sm.c | 2 ++ | ||
| 13 | 1 file changed, 2 insertions(+) | ||
| 14 | |||
| 15 | --- a/drivers/char/broadcom/vc_sm/vmcs_sm.c | ||
| 16 | +++ b/drivers/char/broadcom/vc_sm/vmcs_sm.c | ||
| 17 | @@ -197,12 +197,14 @@ struct SM_STATE_T { | ||
| 18 | static struct SM_STATE_T *sm_state; | ||
| 19 | static int sm_inited; | ||
| 20 | |||
| 21 | +#if 0 | ||
| 22 | static const char *const sm_cache_map_vector[] = { | ||
| 23 | "(null)", | ||
| 24 | "host", | ||
| 25 | "videocore", | ||
| 26 | "host+videocore", | ||
| 27 | }; | ||
| 28 | +#endif | ||
| 29 | |||
| 30 | /* ---- Private Function Prototypes -------------------------------------- */ | ||
| 31 | |||
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 @@ | |||
| 1 | Fix compile with GCC6 | ||
| 2 | |||
| 3 | Upstream-status: Denied [https://github.com/raspberrypi/linux/pull/1528] | ||
| 4 | |||
| 5 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
| 6 | |||
| 7 | Index: source/include/linux/compiler-gcc6.h | ||
| 8 | =================================================================== | ||
| 9 | --- /dev/null | ||
| 10 | +++ source/include/linux/compiler-gcc6.h | ||
| 11 | @@ -0,0 +1,67 @@ | ||
| 12 | +#ifndef __LINUX_COMPILER_H | ||
| 13 | +#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead." | ||
| 14 | +#endif | ||
| 15 | + | ||
| 16 | +#define __used __attribute__((__used__)) | ||
| 17 | +#define __must_check __attribute__((warn_unused_result)) | ||
| 18 | +#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) | ||
| 19 | + | ||
| 20 | +/* Mark functions as cold. gcc will assume any path leading to a call | ||
| 21 | + to them will be unlikely. This means a lot of manual unlikely()s | ||
| 22 | + are unnecessary now for any paths leading to the usual suspects | ||
| 23 | + like BUG(), printk(), panic() etc. [but let's keep them for now for | ||
| 24 | + older compilers] | ||
| 25 | + | ||
| 26 | + Early snapshots of gcc 4.3 don't support this and we can't detect this | ||
| 27 | + in the preprocessor, but we can live with this because they're unreleased. | ||
| 28 | + Maketime probing would be overkill here. | ||
| 29 | + | ||
| 30 | + gcc also has a __attribute__((__hot__)) to move hot functions into | ||
| 31 | + a special section, but I don't see any sense in this right now in | ||
| 32 | + the kernel context */ | ||
| 33 | +#define __cold __attribute__((__cold__)) | ||
| 34 | + | ||
| 35 | +#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) | ||
| 36 | + | ||
| 37 | +#ifndef __CHECKER__ | ||
| 38 | +# define __compiletime_warning(message) __attribute__((warning(message))) | ||
| 39 | +# define __compiletime_error(message) __attribute__((error(message))) | ||
| 40 | +#endif /* __CHECKER__ */ | ||
| 41 | + | ||
| 42 | +/* | ||
| 43 | + * Mark a position in code as unreachable. This can be used to | ||
| 44 | + * suppress control flow warnings after asm blocks that transfer | ||
| 45 | + * control elsewhere. | ||
| 46 | + * | ||
| 47 | + * Early snapshots of gcc 4.5 don't support this and we can't detect | ||
| 48 | + * this in the preprocessor, but we can live with this because they're | ||
| 49 | + * unreleased. Really, we need to have autoconf for the kernel. | ||
| 50 | + */ | ||
| 51 | +#define unreachable() __builtin_unreachable() | ||
| 52 | + | ||
| 53 | +/* Mark a function definition as prohibited from being cloned. */ | ||
| 54 | +#define __noclone __attribute__((__noclone__)) | ||
| 55 | + | ||
| 56 | +/* | ||
| 57 | + * Tell the optimizer that something else uses this function or variable. | ||
| 58 | + */ | ||
| 59 | +#define __visible __attribute__((externally_visible)) | ||
| 60 | + | ||
| 61 | +/* | ||
| 62 | + * GCC 'asm goto' miscompiles certain code sequences: | ||
| 63 | + * | ||
| 64 | + * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 | ||
| 65 | + * | ||
| 66 | + * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. | ||
| 67 | + * | ||
| 68 | + * (asm goto is automatically volatile - the naming reflects this.) | ||
| 69 | + */ | ||
| 70 | +#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) | ||
| 71 | + | ||
| 72 | +#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP | ||
| 73 | +#define __HAVE_BUILTIN_BSWAP32__ | ||
| 74 | +#define __HAVE_BUILTIN_BSWAP64__ | ||
| 75 | +#define __HAVE_BUILTIN_BSWAP16__ | ||
| 76 | +#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ | ||
| 77 | + | ||
| 78 | +#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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" | ||
| 2 | |||
| 3 | LINUX_VERSION ?= "4.1.21" | ||
| 4 | |||
| 5 | SRCREV = "ff45bc0e8917c77461b2901e2743e6339bb70413" | ||
| 6 | SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.1.y \ | ||
| 7 | file://0001-dts-add-overlay-for-pitft22.patch \ | ||
| 8 | file://0002-vmcs-Remove-unused-sm_cache_map_vector-definition.patch \ | ||
| 9 | file://0003-fix-gcc6.patch \ | ||
| 10 | " | ||
| 11 | |||
| 12 | require linux-raspberrypi.inc | ||
