diff options
Diffstat (limited to 'import-layers/meta-raspberrypi/recipes-kernel')
16 files changed, 98 insertions, 677 deletions
diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware/LICENSE.broadcom_brcm80211 b/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware/LICENSE.broadcom_brcm80211 deleted file mode 100644 index e2cf868f3..000000000 --- a/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware/LICENSE.broadcom_brcm80211 +++ /dev/null @@ -1,205 +0,0 @@ -SOFTWARE LICENSE AGREEMENT - -Unless you and Broadcom Corporation (“Broadcom”) execute a separate written -software license agreement governing use of the accompanying software, this -software is licensed to you under the terms of this Software License Agreement -(“Agreement”). - -ANY USE, REPRODUCTION OR DISTRIBUTION OF THE SOFTWARE CONSTITUTES YOUR -ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS. - -1.1. “Broadcom Product” means any of the proprietary integrated circuit -product(s) sold by Broadcom with which the Software was designed to be used, or -their successors. - -1.2. “Licensee” means you or if you are accepting on behalf of an entity -then the entity and its affiliates exercising rights under, and complying with -all of the terms of this Agreement. - -1.3. “Software” shall mean that software made available by Broadcom to -Licensee in binary code form with this Agreement. - -2. LICENSE GRANT; OWNERSHIP - -2.1. License Grants. Subject to the terms and conditions of this Agreement, -Broadcom hereby grants to Licensee a non-exclusive, non-transferable, -royalty-free license (i) to use and integrate the Software in conjunction with -any other software; and (ii) to reproduce and distribute the Software complete, -unmodified and as provided by Broadcom, and only for use with a Broadcom -Product. - -2.2. Restriction on Modification. Licensee may not make any modifications -to the Software. - -2.3. Restriction on Distribution. Licensee shall only distribute the -Software under the terms of this Agreement and a copy of this Agreement -accompanies such distribution. - -2.4. Proprietary Notices. Licensee shall not remove, efface or obscure any -copyright or trademark notices from the Software. Licensee shall include -reproductions of the Broadcom copyright notice with each copy of the Software, -except where such Software is embedded in a manner not readily accessible to -the end user. Licensee acknowledges that any symbols, trademarks, tradenames, -and service marks adopted by Broadcom to identify the Software belong to -Broadcom and that Licensee shall have no rights therein. - -2.5. Ownership. Broadcom shall retain all right, title and interest, -including all intellectual property rights, in and to the Software. Licensee -hereby covenants that it will not assert any claim that the Software created by -or for Broadcom infringe any intellectual property right owned or controlled by -Licensee; provided however, the foregoing shall not apply in case the Agreement -is terminated. - -2.6. No Other Rights Granted; Restrictions. Apart from the license rights -expressly set forth in this Agreement, Broadcom does not grant and Licensee -does not receive any ownership right, title or interest nor any security -interest or other interest in any intellectual property rights relating to the -Software, nor in any copy of any part of the foregoing. No license is granted -to Licensee in any human readable code of the Software (source code). Licensee -shall not (i) use, license, sell or otherwise distribute the Software except as -provided in this Agreement, (ii) attempt to modify in any way, reverse -engineer, decompile or disassemble any portion of the Software; or (iii) use -the Software or other material in violation of any applicable law or -regulation, including but not limited to any regulatory agency, such as FCC, -rules. - -3. NO WARRANTY OR SUPPORT - -3.1. No Warranty. THE SOFTWARE IS OFFERED “AS IS,” AND BROADCOM GRANTS AND -LICENSEE RECEIVES NO WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, BY STATUTE, -COMMUNICATION OR CONDUCT WITH LICENSEE, OR OTHERWISE. BROADCOM SPECIFICALLY -DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A SPECIFIC -PURPOSE OR NONINFRINGEMENT CONCERNING THE SOFTWARE OR ANY UPGRADES TO OR -DOCUMENTATION FOR THE SOFTWARE. WITHOUT LIMITATION OF THE ABOVE, BROADCOM -GRANTS NO WARRANTY THAT THE SOFTWARE IS ERROR-FREE OR WILL OPERATE WITHOUT -INTERRUPTION, AND GRANTS NO WARRANTY REGARDING ITS USE OR THE RESULTS THEREFROM -INCLUDING, WITHOUT LIMITATION, ITS CORRECTNESS, ACCURACY OR RELIABILITY. - -3.2. No Support. Nothing in this agreement shall obligate Broadcom to -provide any support for the Software. Broadcom may, but shall be under no -obligation to, correct any defects in the Software and/or provide updates to -licensees of the Software. Licensee shall make reasonable efforts to promptly -report to Broadcom any defects it finds in the Software, as an aid to creating -improved revisions of the Software. - -3.3. Dangerous Applications. The Software is not designed, intended, or -certified for use in components of systems intended for the operation of -weapons, weapons systems, nuclear installations, means of mass transportation, -aviation, life-support computers or equipment (including resuscitation -equipment and surgical implants), pollution control, hazardous substances -management, or for any other dangerous application in which the failure of the -Software could create a situation where personal injury or death may occur. -Licensee understands that use of the Software in such applications is fully at -the risk of Licensee. - -4. TERM AND TERMINATION - -4.1. Termination. This Agreement will automatically terminate if Licensee -fails to comply with any of the terms and conditions hereof. In such event, -Licensee must destroy all copies of the Software and all of its component -parts. - -4.2. Effect Of Termination. Upon any termination of this Agreement, the -rights and licenses granted to Licensee under this Agreement shall immediately -terminate. - -4.3. Survival. The rights and obligations under this Agreement which by -their nature should survive termination will remain in effect after expiration -or termination of this Agreement. - -5. CONFIDENTIALITY - -5.1. Obligations. Licensee acknowledges and agrees that any documentation -relating to the Software, and any other information (if such other information -is identified as confidential or should be recognized as confidential under the -circumstances) provided to Licensee by Broadcom hereunder (collectively, -“Confidential Information”) constitute the confidential and proprietary -information of Broadcom, and that Licensee’s protection thereof is an essential -condition to Licensee’s use and possession of the Software. Licensee shall -retain all Confidential Information in strict confidence and not disclose it to -any third party or use it in any way except under a written agreement with -terms and conditions at least as protective as the terms of this Section. -Licensee will exercise at least the same amount of diligence in preserving the -secrecy of the Confidential Information as it uses in preserving the secrecy of -its own most valuable confidential information, but in no event less than -reasonable diligence. Information shall not be considered Confidential -Information if and to the extent that it: (i) was in the public domain at the -time it was disclosed or has entered the public domain through no fault of -Licensee; (ii) was known to Licensee, without restriction, at the time of -disclosure as proven by the files of Licensee in existence at the time of -disclosure; or (iii) becomes known to Licensee, without restriction, from a -source other than Broadcom without breach of this Agreement by Licensee and -otherwise not in violation of Broadcom’s rights. - -5.2. Return of Confidential Information. Notwithstanding the foregoing, all -documents and other tangible objects containing or representing Broadcom -Confidential Information and all copies thereof which are in the possession of -Licensee shall be and remain the property of Broadcom, and shall be promptly -returned to Broadcom upon written request by Broadcom or upon termination of -this Agreement. - -6. LIMITATION OF LIABILITY TO THE MAXIMUM EXTENT PERMITTED BY LAW, IN NO -EVENT SHALL BROADCOM OR ANY OF BROADCOM’S LICENSORS HAVE ANY LIABILITY FOR ANY -INDIRECT, INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES, HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER FOR BREACH OF CONTRACT, TORT (INCLUDING -NEGLIGENCE) OR OTHERWISE, ARISING OUT OF THIS AGREEMENT, INCLUDING BUT NOT -LIMITED TO LOSS OF PROFITS, EVEN IF SUCH PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. IN NO EVENT WILL BROADCOM’S LIABILITY WHETHER IN -CONTRACT, TORT (INCLUDING NEGLIGENCE), OR OTHERWISE, EXCEED THE AMOUNT PAID BY -LICENSEE FOR SOFTWARE UNDER THIS AGREEMENT. THESE LIMITATIONS SHALL APPLY -NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED REMEDY. - -7. MISCELLANEOUS - -7.1. Export Regulations. YOU UNDERSTAND AND AGREE THAT THE SOFTWARE IS -SUBJECT TO UNITED STATES AND OTHER APPLICABLE EXPORT-RELATED LAWS AND -REGULATIONS AND THAT YOU MAY NOT EXPORT, RE-EXPORT OR TRANSFER THE SOFTWARE OR -ANY DIRECT PRODUCT OF THE SOFTWARE EXCEPT AS PERMITTED UNDER THOSE LAWS. -WITHOUT LIMITING THE FOREGOING, EXPORT, RE-EXPORT OR TRANSFER OF THE SOFTWARE -TO CUBA, IRAN, NORTH KOREA, SUDAN AND SYRIA IS PROHIBITED. - -7.2 Assignment. This Agreement shall be binding upon and inure to the -benefit of the parties and their respective successors and assigns, provided, -however that Licensee may not assign this Agreement or any rights or obligation -hereunder, directly or indirectly, by operation of law or otherwise, without -the prior written consent of Broadcom, and any such attempted assignment shall -be void. Notwithstanding the foregoing, Licensee may assign this Agreement to -a successor to all or substantially all of its business or assets to which this -Agreement relates that is not a competitor of Broadcom. - -7.3. Governing Law; Venue. This Agreement shall be governed by the laws of -California without regard to any conflict-of-laws rules, and the United Nations -Convention on Contracts for the International Sale of Goods is hereby excluded. -The sole jurisdiction and venue for actions related to the subject matter -hereof shall be the state and federal courts located in the County of Orange, -California, and both parties hereby consent to such jurisdiction and venue. - -7.4. Severability. All terms and provisions of this Agreement shall, if -possible, be construed in a manner which makes them valid, but in the event any -term or provision of this Agreement is found by a court of competent -jurisdiction to be illegal or unenforceable, the validity or enforceability of -the remainder of this Agreement shall not be affected if the illegal or -unenforceable provision does not materially affect the intent of this -Agreement. If the illegal or unenforceable provision materially affects the -intent of the parties to this Agreement, this Agreement shall become -terminated. - -7.5. Equitable Relief. Licensee hereby acknowledges that its breach of this -Agreement would cause irreparable harm and significant injury to Broadcom that -may be difficult to ascertain and that a remedy at law would be inadequate. -Accordingly, Licensee agrees that Broadcom shall have the right to seek and -obtain immediate injunctive relief to enforce obligations under the Agreement -in addition to any other rights and remedies it may have. - -7.6. Waiver. The waiver of, or failure to enforce, any breach or default -hereunder shall not constitute the waiver of any other or subsequent breach or -default. - -7.7. Entire Agreement. This Agreement sets forth the entire Agreement -between the parties and supersedes any and all prior proposals, agreements and -representations between them, whether written or oral concerning the Software. -This Agreement may be changed only by mutual agreement of the parties in -writing. - diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware/brcmfmac43430-sdio.bin b/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware/brcmfmac43430-sdio.bin Binary files differdeleted file mode 100644 index 84ab5b0de..000000000 --- a/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware/brcmfmac43430-sdio.bin +++ /dev/null diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware/brcmfmac43430-sdio.txt b/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware/brcmfmac43430-sdio.txt deleted file mode 100644 index ea4f648a1..000000000 --- a/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware/brcmfmac43430-sdio.txt +++ /dev/null @@ -1,66 +0,0 @@ -# NVRAM file for BCM943430WLPTH -# 2.4 GHz, 20 MHz BW mode - -# The following parameter values are just placeholders, need to be updated. -manfid=0x2d0 -prodid=0x0727 -vendid=0x14e4 -devid=0x43e2 -boardtype=0x0727 -boardrev=0x1101 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -sromrev=11 -boardflags=0x00404201 -boardflags3=0x08000000 -xtalfreq=37400 -nocrc=1 -ag0=255 -aa2g=1 -ccode=ALL - -pa0itssit=0x20 -extpagain2g=0 -#PA parameters for 2.4GHz, measured at CHIP OUTPUT -pa2ga0=-168,7161,-820 -AvVmid_c0=0x0,0xc8 -cckpwroffset0=5 - -# PPR params -maxp2ga0=84 -txpwrbckof=6 -cckbw202gpo=0 -legofdmbw202gpo=0x66111111 -mcsbw202gpo=0x77711111 -propbw202gpo=0xdd - -# OFDM IIR : -ofdmdigfilttype=18 -ofdmdigfilttypebe=18 -# PAPD mode: -papdmode=1 -papdvalidtest=1 -pacalidx2g=42 -papdepsoffset=-22 -papdendidx=58 - -# LTECX flags -ltecxmux=0 -ltecxpadnum=0x0102 -ltecxfnsel=0x44 -ltecxgcigpio=0x01 - -il0macaddr=00:90:4c:c5:12:38 -wl0id=0x431b - -deadman_to=0xffffffff -# muxenab: 0x1 for UART enable, 0x2 for GPIOs, 0x8 for JTAG -muxenab=0x1 -# CLDO PWM voltage settings - 0x4 - 1.1 volt -#cldo_pwm=0x4 - -#VCO freq 326.4MHz -spurconfig=0x3 - -edonthd20l=-75 -edoffthd20ul=-80 diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_git.bbappend deleted file mode 100644 index 20ef05f24..000000000 --- a/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_git.bbappend +++ /dev/null @@ -1,33 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -LICENSE_append = " & Firmware-broadcom_brcm80211" - -LIC_FILES_CHKSUM_append = " file://${WORKDIR}/LICENSE.broadcom_brcm80211;md5=8cba1397cda6386db37210439a0da3eb" - -NO_GENERIC_LICENSE[Firmware-broadcom_brcm80211] = "LICENSE.broadcom_brcm80211" - -SRC_URI_append = " \ - file://brcmfmac43430-sdio.bin \ - file://brcmfmac43430-sdio.txt \ - file://LICENSE.broadcom_brcm80211 \ - " - -do_install_append() { - cp ${WORKDIR}/brcmfmac43430-sdio.* ${D}/lib/firmware/brcm/ - cp ${WORKDIR}/LICENSE.broadcom_brcm80211 ${D}/lib/firmware/ -} - -PACKAGES =+ "${PN}-brcm43430 ${PN}-brcm43430-license" - -LICENSE_${PN}-brcm43430 = "Firmware-broadcom_brcm80211" -FILES_${PN}-brcm43430-license = "/lib/firmware/LICENSE.broadcom_brcm80211" -FILES_${PN}-brcm43430 = " \ - /lib/firmware/brcm/brcmfmac43430-sdio.bin \ - /lib/firmware/brcm/brcmfmac43430-sdio.txt \ - " - -RDEPENDS_${PN}-brcm43430 += "${PN}-brcm43430-license" - -ALTERNATIVE_LINK_NAME[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac-sdio.bin" -ALTERNATIVE_TARGET_linux-firmware-brcm43430[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac43430-sdio.bin" -ALTERNATIVE_linux-firmware-brcm43430 = "brcmfmac-sdio.bin" diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch deleted file mode 100644 index fa73599b2..000000000 --- a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 2f44861e2a2d651a9aa62a75343a032fee33e93b 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 in linux 3.18 -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 c766616..1eaaf81 100644 ---- a/arch/arm/boot/dts/overlays/Makefile -+++ b/arch/arm/boot/dts/overlays/Makefile -@@ -27,6 +27,7 @@ dtb-$(RPI_DT_OVERLAYS) += mcp2515-can0-overlay.dtb - 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) += pitft22-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += pitft28-resistive-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += rpi-dac-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/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.1/0001-dts-add-overlay-for-pitft22.patch b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.1/0001-dts-add-overlay-for-pitft22.patch deleted file mode 100644 index e6e0a8486..000000000 --- a/import-layers/meta-raspberrypi/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/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.1/0002-vmcs-Remove-unused-sm_cache_map_vector-definition.patch b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.1/0002-vmcs-Remove-unused-sm_cache_map_vector-definition.patch deleted file mode 100644 index 8d4a900c3..000000000 --- a/import-layers/meta-raspberrypi/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/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.1/0003-fix-gcc6.patch b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.1/0003-fix-gcc6.patch deleted file mode 100644 index 61ec2fbe5..000000000 --- a/import-layers/meta-raspberrypi/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/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch new file mode 100644 index 000000000..5113e23fb --- /dev/null +++ b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch @@ -0,0 +1,44 @@ +From 13c8784da3dbd977f64cec740eba775b6fab11c2 Mon Sep 17 00:00:00 2001 +From: Herve Jourdain <herve.jourdain@neuf.fr> +Date: Fri, 20 May 2016 16:02:23 +0800 +Subject: [yocto][meta-raspberrypi][PATCH v4 4/5] linux-raspberrypi_4.4.inc: + support for .dtbo files for dtb overlays + +Upstream-Status: Pending + +Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb. +Patch the kernel, which has faulty rules to generate .dtbo the way yocto does + +Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr> +--- + .../0001-fix-dtbo-rules.patch | 27 ++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + create mode 100644 recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch + +diff --git a/arch/arm/Makefile b/arch/arm/Makefile +index a2e7cf7..673c1cb 100644 +--- a/arch/arm/Makefile ++++ b/arch/arm/Makefile +@@ -333,6 +333,8 @@ $(INSTALL_TARGETS): + + %.dtb: | scripts + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ ++%.dtbo: | scripts ++ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ + + PHONY += dtbs dtbs_install + +diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib +index 3079c4f..6cc3766 100644 +--- a/scripts/Makefile.lib ++++ b/scripts/Makefile.lib +@@ -293,7 +293,8 @@ $(obj)/%.dtb: $(src)/%.dts FORCE + $(call if_changed_dep,dtc) + + quiet_cmd_dtco = DTCO $@ +-cmd_dtco = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ ++cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \ ++ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ + $(objtree)/scripts/dtc/dtc -@ -H epapr -O dtb -o $@ -b 0 \ + -i $(dir $<) $(DTC_FLAGS) \ + -d $(depfile).dtc.tmp $(dtc-tmp) ; \ diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.9/0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.9/0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch new file mode 100644 index 000000000..e8bc52ee8 --- /dev/null +++ b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-4.9/0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch @@ -0,0 +1,29 @@ +From 922ce1fd0eb810b713f6ffa9a7ab97c11b6e38cf Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 10 Feb 2017 17:57:08 -0800 +Subject: [PATCH] build/arm64: Add rules for .dtbo files for dts overlays + +We now create overlays as .dtbo files. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + arch/arm64/Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile +index 3635b8662724..822fefeb1cd0 100644 +--- a/arch/arm64/Makefile ++++ b/arch/arm64/Makefile +@@ -113,6 +113,9 @@ zinstall install: + %.dtb: scripts + $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ + ++%.dtbo: | scripts ++ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ ++ + PHONY += dtbs dtbs_install + + dtbs: prepare scripts +-- +2.11.1 + diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc index 61844028b..98229d99e 100644 --- a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc +++ b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc @@ -54,16 +54,3 @@ do_deploy_append() { fi echo "${CMDLINE}${PITFT_PARAMS}" > ${DEPLOYDIR}/bcm2835-bootfiles/cmdline.txt } - -do_bundle_initramfs_append() { - if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then - if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then - if test -n "${KERNEL_DEVICETREE}"; then - # Add RPi bootloader trailer to kernel image to enable DeviceTree support - for type in ${KERNEL_IMAGETYPES} ; do - ${STAGING_BINDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT_DIR}/$type.initramfs ${KERNEL_OUTPUT_DIR}/$type.initramfs - done - fi - fi - fi -} diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_3.18.bb b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_3.18.bb deleted file mode 100644 index 1110b71b8..000000000 --- a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_3.18.bb +++ /dev/null @@ -1,14 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" - -LINUX_VERSION ?= "3.18.16" - -SRCREV = "1bb18c8f721ef674a447f3622273f2e2de7a205c" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \ - file://0001-dts-add-overlay-for-pitft22.patch \ - " -require linux-raspberrypi.inc - -# Create missing out of tree 'overlays' directory prior to install step -do_compile_prepend() { - mkdir -p ${B}/arch/arm/boot/dts/overlays -} diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.1.bb b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.1.bb deleted file mode 100644 index 87c77b820..000000000 --- a/import-layers/meta-raspberrypi/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 diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.4.bb b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.4.bb index 3291ffdf3..b2357725b 100644 --- a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.4.bb +++ b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.4.bb @@ -1,8 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" -LINUX_VERSION ?= "4.4.13" +LINUX_VERSION ?= "4.4.48" -SRCREV = "680be5e27a9593cf26079c6e5744a04cc2809d13" +SRCREV = "7ddf96fbb7d637b79b449c7bd1c8d35f00571e4b" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \ + file://0001-fix-dtbo-rules.patch \ " require linux-raspberrypi.inc diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb new file mode 100644 index 000000000..dcca369bf --- /dev/null +++ b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" + +LINUX_VERSION ?= "4.9.10" + +SRCREV = "095c4480e1f623bdc8a221a171ef13b2223706b1" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.9.y \ + file://0001-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch \ +" +require linux-raspberrypi.inc diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-rpi.inc b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-rpi.inc index 4b65fc250..53383b073 100644 --- a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-rpi.inc +++ b/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-rpi.inc @@ -13,9 +13,9 @@ ARM_KEEP_OABI ?= "1" # Quirk for udev greater or equal 141 UDEV_GE_141 ?= "1" -# Set the verbosity of kernel messages during runtime -# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour -CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug", d)}' +# You can define CMDLINE_DEBUG as "debug" in your local.conf or distro.conf +# to enable kernel debugging. +CMDLINE_DEBUG ?= "" CMDLINE_append = " ${CMDLINE_DEBUG}" KERNEL_INITRAMFS ?= '${@base_conditional("INITRAMFS_IMAGE_BUNDLE", "1", "1", "", d)}' @@ -111,6 +111,16 @@ do_configure_prepend() { # Activate CONFIG_LEGACY_PTYS kernel_configure_variable LEGACY_PTYS y + # Activate the configuration options for VC4 + VC4GRAPHICS="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" + if [ ${VC4GRAPHICS} = "1" ]; then + kernel_configure_variable I2C_BCM2835 y + kernel_configure_variable DRM y + kernel_configure_variable DRM_FBDEV_EMULATION y + kernel_configure_variable DRM_VC4 y + kernel_configure_variable FB_BCM2708 n + fi + # Keep this the last line # Remove all modified configs and add the rest to .config sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config' |
