aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
Commit message (Collapse)AuthorAgeFilesLines
* kernel: bump 4.9 to 4.9.175Koen Vandeputte2019-05-132-5/+5
| | | | | | | | | Refreshed all patches. Compile-tested on: ar7 Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
* brcm63xx: remove kernel 4.9 supportKoen Vandeputte2019-05-13204-23816/+0
| | | | | | | | | This target got bumped to 4.14 a long time ago in commit: 2308b87204206d84b6bf3dbc3d72591611cc6b78 Remove all leftover 4.9 files. Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
* kernel: Fix build of omap targetHauke Mehrtens2019-05-122-0/+2
| | | | | | | | CONFIG_HW_RANDOM_OMAP is not set to any value after kmod-random-omap was removed, add the configuration option to the generic configuration. Fixes: cd3b29853380 ("omap24xx: Remove unmaintained target") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* mvebu: add images for additional ESPRESSObin boardsTomasz Maciej Nowak2019-05-118-1/+239
| | | | | | | | | | | | | | | | | | | | | This commit adds support for different iterations of ESPRESSObin. The added variants are: ESPRESSObin with soldered eMMC, ESPRESSObin V7, compared to V5 some passive elements changed and ethernet ports labels positions have been reversed, ESPRESSObin V7 with soldered eMMC. Please refer to: 584d7c5 ("mvebu: new subtarget cortex A53") for instruction how to boot OpenWrt image placed on SD card. It is advised for owners of V5 and previous with bootloader based on U-Boot 2015.01, to upgrade the latest version available at: http://espressobin.net/tech-spec. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* mvebu: use device-tree board detectionTomasz Maciej Nowak2019-05-1117-179/+86
| | | | | | | | Convert whole target to Device Tree based board detection instead of identifying devices by dts file name. With this we can drop mvebu.sh translation script and rely on common method for model detection. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* mvebu: align device names to vendor_device formatTomasz Maciej Nowak2019-05-114-46/+51
| | | | | | | | | | Add vendors in device names and also rename few device names, for easier identyfying potential firmware to flash. The vendor and device string is mainly derived from model/compatipble string in dts from particular device, but since not all devices are well described, some of the renames follow marketing names. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* mvebu: image: don't create unnecessarily shell variablesTomasz Maciej Nowak2019-05-112-14/+8
| | | | | | | Use make syntax to pass the U-Boot image location and boot with root partitions size, instead of relying on shell functions and variables. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* mvebu: image: improve readability of device recipesTomasz Maciej Nowak2019-05-112-41/+19
| | | | | | | | Drop overly complex amount of defines wich are referenced in the same devices pool and move image recipes to common define, since devices not using them overwrite it. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* mvebu: image: introduce BOOT_SCRIPT variableTomasz Maciej Nowak2019-05-117-57/+12
| | | | | | | | | | | | All of U-Boot scripts repeat the same pattern with only Device Tree blob name changing for respective device. Therefore create generic scripts which will be altered on demad by image build process, and create BOOT_SCRIPT variable which can be added to device recipe and will allow referencing the same script by many device recipes. This will allow to slim down the ammount of files in buildroot tree and avoid needlessly incrementing amount of boot scripts if new devices will be added. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* mvebu: image: stack repeated variablesTomasz Maciej Nowak2019-05-113-25/+15
| | | | | | | All of arm64 devices have part of variables repeatedly defined. Stack them to common define, and reference it in each device recipe. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* mvebu: remove unnecessary code building dtbsTomasz Maciej Nowak2019-05-112-17/+3
| | | | | | | | | Even if dts is not included in upstream Makefile, it is built anyway by recipe specified in include/image.mk. Also remove Build/dtb, it's not used since 3f72f3a ("mvebu: clearfog: include DTB for all variants in image"). Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* generic-4.19: Backport spi-nand support for GigaDevice A/EJeff Kletsky2019-05-112-0/+325
| | | | | | | | | | | | | | | | | | This patch backports verbatim the commits from Linux 5.0 and 5.1 that implemented support for GigaDevice SPI NAND A and E variants. Supported only in Linux 4.19 and later as based on the upstream drivers/mtd/nand/spi/ framework. mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch commit c93c613214ac (5.0) mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UExxG.patch commit c40c7a990a46 (5.1) Run-tested-on: GL.iNet AR750S Signed-off-by: Jeff Kletsky <git-commits@allycomm.com>
* kernel: Reorder generic configurationHauke Mehrtens2019-05-112-10/+10
| | | | | | | | This was done like this: ./scripts/kconfig.pl '+' target/linux/generic/config-4.14 /dev/null > target/linux/generic/config-4.14-new mv target/linux/generic/config-4.14-new target/linux/generic/config-4.14 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* gemini: Make kernel text and rodata read-onlyHauke Mehrtens2019-05-112-4/+0
| | | | | | | This is activate for all other targets except gemini, also activate it there. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* cns3xxx: Activate CONFIG_CPU_SW_DOMAIN_PANHauke Mehrtens2019-05-112-2/+0
| | | | | | This is already activated for all other ARM targets Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* x86: Activate CONFIG_X86_SMAPHauke Mehrtens2019-05-112-2/+2
| | | | | | | | This activates "Supervisor Mode Access Prevention". modern CPUs will prevent the kernel code from accessing any data from the userspace without the usage of copy_to_user() or copy_from_user() Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* kernel: Deactivate CONFIG_BINFMT_MISCHauke Mehrtens2019-05-118-8/+0
| | | | | | | | | | CONFIG_BINFMT_MISC allows it to add support for new executable formats to the kernel from user space, the kernel will then detect for example a java binary and call the java execution program automatically. I am not aware that this feature is used in OpenWrt and this could be used to exploit something. Deactivate it for all targets for now. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* kernel: Do not set CONFIG_DEVMEM or CONFIG_DEVKMEMHauke Mehrtens2019-05-114-6/+0
| | | | | | | This is deactivated by default and should be manually activated in the OpenWrt kernel configuration Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* kernel: Activate CONFIG_SYN_COOKIES for all targetsHauke Mehrtens2019-05-117-7/+0
| | | | | | | | | | Some targets deactivated CONFIG_SYN_COOKIES, for unknown reasons, use the default setting from the generic configuration which activates CONFIG_SYN_COOKIES. This should prevent SYN flooding. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* kernel: Remove CONFIG_COMPATHauke Mehrtens2019-05-1116-75/+3
| | | | | | | | | | | | | This removes support for executing old 32 bit applications on 64 bit ARM and MIPS kernels. On OpenWrt we normally compile all the user space applications on our own and do not support third party binary only modules especial not 32 bit applications on 64 bit CPUs. This reduces the attack surface on such systems and should also save some memory. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* kernel: Remove CONFIG_DEBUG_RODATA and CONFIG_DEBUG_SET_MODULE_RONXHauke Mehrtens2019-05-112-4/+0
| | | | | | | These were renamed to CONFIG_STRICT_KERNEL_RWX and CONFIG_STRICT_MODULE_RWX and are activated in kernel 4.14 and later by default. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* kernel: Activate CONFIG_ARM64_SW_TTBR0_PANHauke Mehrtens2019-05-1111-9/+2
| | | | | | | | | | This activates "Emulate Privileged Access Never using TTBR0_EL1 switching" on ARM64. This should prevent the kernel from reading code from user space in kernel context. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* Kernel: Activate CONFIG_HARDENED_USERCOPYHauke Mehrtens2019-05-113-3/+7
| | | | | | | | | | | This adds additional checks to the copy_from_user() and copy_to_user() functions. The details are described in this article: https://lwn.net/Articles/695991/ This should only have a very small performance impact on system calls and should not affect routing performance. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* ath79: Add missing read-only propertiesAdrian Schmutzler2019-05-118-2/+14
| | | | | | | | | Add some read-only properties to protect partitions from accidental changes. Also fixed two whitespaces error on the way. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
* ramips: fix R6120 factory imageDavid Bauer2019-05-111-1/+1
| | | | | | | | | | | The factory firmware omits the JFFS2 end-marker while flashing via web-interface. Add a 64k padding after the marker fixes this problem. When the end-marker is not present, OpenWRT won't save the overlayfs after initial flash. Reported-by: Andreas Ziegler <dev@andreas-ziegler.de> Signed-off-by: David Bauer <mail@david-bauer.net>
* mvebu: fix board_name condition in 79_move_configKlaus Kudielka2019-05-111-1/+1
| | | | | | | The correct board_name for the Turris Omnia is armada-385-turris-omnia. Fixes: 4e8345ff68 ("mvebu: base-files: autodetect upgrade device") Signed-off-by: Klaus Kudielka <klaus.kudielka@gmail.com>
* base-files: improve lib/upgrade/common.shKlaus Kudielka2019-05-116-26/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently, upgrade device autodetection has been added to the mvebu target. This exposes some shortcomings of the generic export_bootdevice function, e.g. on the Turris Omnia: export_bootdevice silently reports the root partition to be the boot device. This makes the sysupgrade process fail at several places. Fix this by clearly distinguishing between /proc/cmdline arguments which specify the boot disk, and those which specify the root partition. Only in the latter case, strip off the partition, and do it consistently. root=PARTUUID=<pseudo PARTUUID for MBR> (any partition) and root=/dev/* (any partition) are accepted. The root of the problem is that the *existing* export_bootdevice in /lib/upgrade/common.sh behaves differently, if the kernel is booted with root=/dev/..., or if it is booted with root=PARTUUID=... In the former case, it reports back major/minor of the root partition, in the latter case it reports back major/minor of the complete boot disk. Targets, which boot with root=/dev/... *and* use export_bootdevice / export_partdevice, have added workarounds to this behaviour, by specifying *negative* increments to the export_partdevice function. Consequently, those targets have to be adapted to use positive increments, otherwise they are broken by the change to export_bootdevice. Fixes: 4e8345ff68 ("mvebu: base-files: autodetect upgrade device") Signed-off-by: Klaus Kudielka <klaus.kudielka@gmail.com> Tested-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
* ipq40xx: add factory image for EnGenius ENS620EXTSteve Glennon2019-05-111-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extended mksenaofw to support new "capwap" header structure. This supports flashing from factory 3.0.0, 3.0.1, 3.1.0 and 3.5.5 firmware. Note that the factory image format changes for 3.1 and later firmware, and that the 3.1.0 and 3.5.5 Engenius firmware will refuse the factory_30.bin file. Similarly, the 3.0.0 and 3.0.1 Engenius firmware will refuse the factory_35.bin file. Flashing from the Engenius 3.1.0 firmware with the factory_35.bin firmware has not been tested, as 3.1.0 firmware (Engenius "middleFW") is only intended as part of the upgrade path to 3.5.5 firmware. Modified ipq40xx image Makefile to appropriately invoke mksenaofw with new parameters to configure the capwap header. Note that there is currently no method to return to factory firmware, so this is a one-way street. Path from factory 3.0.0 and 3.0.1 (EnGenius) software to OpenWrt is to navigate to 192.168.1.1 on the stock firmware and navigate to the firmware menu. Then copy the URL you have for that page, something like http://192.168.1.1/cgi-bin/luci/;stok=12345abcdef/admin/system/flashops and replace the trailing /admin/system/flashops with just /easyflashops You should then be presented with a simple "Firmware Upgrade" page. On that page, BE SURE TO CLEAR the "Keep Settings:" checkbox. Choose the openwrt-ipq40xx-engenius_ens620ext-squashfs-factory_30.bin, click "Upgrade" and on the following page select "Proceed". Path from factory 3.5.5 (EnGenius) software to OpenWrt is simply to use the stock firmware update menu. Choose the openwrt-ipq40xx-engenius_ens620ext-squashfs-factory_35.bin and click "Upload" and "Proceed". The device should then flash the OpenWrt firmware and reboot. Note that this resets the device to a default configuration with Wi-Fi disabled, LAN1/PoE acting as a WAN port (running DHCP client) and LAN2 acting as a LAN port with a DHCP server on 192.168.1.x (AP is at 192.168.1.1) Signed-off-by: Steve Glennon <s.glennon@cablelabs.com> Signed-off-by: Christian Lamparter <chunkeey@gmail.com> [sorry, for unfixing the 80-lines eyesores.]
* ipq40xx: Fix reboot on EnGenius ENS620EXTSteve Glennon2019-05-112-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch works around an issue where reboot would cause the AP to power down and not reboot. The ipq4019 restart controller reboot causes the system to power down and not recover. Fix is to disable the restart controller in the device tree and the device reverts to using the watchdog to perform the reset. The real problem is due to the buggy bootloader that ships with the device. Steve Glennon reported in the PR for this patch: <https://github.com/openwrt/openwrt/pull/2009> that: "the problem was due to a bad u-boot that ships with the device. Using the u-boot that comes with 3.5.5.3 EnGenius factory software now allows the old code (using the do_msm_reboot) to reboot successfully. On to the bad news: Well 3.5.5.3 is a bad path. Finally managed to recover. You CANNOT use prior EnGenius firmware to downgrade. Findings: * They now password protect the serial console with a new, unkown password. * They changed the protection on their walled-garden. I have to use the ssh admin@ip /bin/sh --login to get out of their walled-garden. * Attempts to flash the original 3.0.0 or 3.0.1 EnGenius firmware fail through the UI and sysupgrade. Their firmware update GUI now seem to detect regular openwrt images, but they fail to flash Attempts to flash a normal OpenWrt image with sysupgrade fail. [..] Attempts to sysupgrade with EnGenius firmware fail with the same "mandatory section(s) missing" error, so you cannot downgrade to 3.0.0 or 3.0.1." Signed-off-by: Steve Glennon <s.glennon@cablelabs.com> Signed-off-by: Christian Lamparter <chunkeey@gmail.com> [added valuable findings from github discussion]
* kirkwood: enable sata port multiplierAlberto Bursi2019-05-112-0/+2
| | | | | | | | | | Marvell sata controllers in all kirkwood SoCs support sata port multipliers, just like mvebu. Enable this feature in the default kernel config so it is available in normal builds. tested and working on nsa310b Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
* build: add a config option for enabling a testing version of the target kernelFelix Fietkau2019-05-1114-0/+14
| | | | | | | If the target supports a newer kernel version that is not used by default yet, it can be enabled with this option Signed-off-by: Felix Fietkau <nbd@nbd.name>
* ramips: mt7620: fix dependenciesDeng Qingfang2019-05-111-1/+1
| | | | | | | | | | | | | MT7620 integrated WMAC does not need RT2x00 PCI driver or firmware Also corrected kmod-eeprom-93cx6 and kmod-lib-crc-itu-t dependencies according to original Kconfig and lsmod output This will remove some unnecessary packages from MT7620 target to save some space Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn> Signed-off-by: Christian Lamparter <chunkeey@gmail.com> [75 characters per line in the commit message]
* kernel: bump 4.19 to 4.19.38Koen Vandeputte2019-05-061-3/+3
| | | | | | | | | Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
* kernel: bump 4.14 to 4.14.115Koen Vandeputte2019-05-063-4/+4
| | | | | | | | | Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
* kernel: bump 4.9 to 4.9.172Koen Vandeputte2019-05-061-1/+1
| | | | | | | | | Refreshed all patches. Compile-tested on: ar7 Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
* ath79: glinet_gl-ar750s: Use QCA9887 firmwareJeff Kletsky2019-05-051-1/+1
| | | | | | | The GL.iNet AR750S is based around the QCA9563 and requires the QCA9887 firmware for operation. Signed-off-by: Jeff Kletsky <git-commits@allycomm.com>
* ar71xx: fix failsafe interface for TL-WR940nv6Joachim Fünfer2019-05-051-0/+1
| | | | | | | | Switches failsafe mode interface from WAN to LAN ports. Tested on TL-WR940Nv6.0 and TL-WR940Nv6.1 Signed-off-by: Joachim Fünfer <joachim.fuenfer@stusta.net>
* ath79: fix OCEDO Raccoon 10Mbit PLL valueDavid Bauer2019-05-051-2/+1
| | | | | | | | | | | | This corrects the PLL value for 10 Mbit/s links on the OCEDO Raccoon. Prior to this patch, 10 Mbit/s links would not transmit data. It is worth mentioning that the vendor firmware used the same PLL settings and 10Mbit/s was also not working there. All other link-modes are working correctly without any packet loss. Signed-off-by: David Bauer <mail@david-bauer.net>
* ar71xx: mute script error in ar922x-led-fix scriptRosy Song2019-05-051-0/+3
| | | | | | | | | | | | This commit fixes following script error in syslog: cat: can't open '/sys/devices/platform/ehci-platform/usb1/1-1/1-1.2/1-1.2:1.4/ieee80211/phy*/name': No such file or directory sh: add: unknown operand sh: add: unknown operand Signed-off-by: Rosy Song <rosysong@rosinson.com> Signed-off-by: Petr Štetiar <ynezz@true.cz> [commit subject and message tweaks]
* kernel: Rename UPROBE_EVENT to UPROBE_EVENTSPetr Štetiar2019-05-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | Upstream has renamed UPROBE_EVENT to UPROBE_EVENTS in the following commit: commit 6b0b7551428e4caae1e2c023a529465a9a9ae2d4 Author: Anton Blanchard <anton@samba.org> Date: Thu Feb 16 17:00:50 2017 +1100 perf/core: Rename CONFIG_[UK]PROBE_EVENT to CONFIG_[UK]PROBE_EVENTS We have uses of CONFIG_UPROBE_EVENT and CONFIG_KPROBE_EVENT as well as CONFIG_UPROBE_EVENTS and CONFIG_KPROBE_EVENTS. Consistently use the plurals. So I'm changing it to this plural option in order to make kconfig happy and stop asking about it if kernel is compiled with verbose logging: Enable uprobes-based dynamic events (UPROBE_EVENTS) [Y/n/?] (NEW) Signed-off-by: Petr Štetiar <ynezz@true.cz>
* kernel: Remove support for kernel 3.18Hauke Mehrtens2019-05-03244-40439/+0
| | | | | | | | | | No target is using kernel 3.18 anymore, remove all the generic support for kernel 3.18. The removed packages are depending on kernel 3.18 only and are not used on any recent kernel. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* xburst: Remove unmaintained targetHauke Mehrtens2019-05-0317-1121/+0
| | | | | | | | | | | | This target only supports kernel 3.18, which is not supported in OpenWrt any more for multiple releases. It also looks like there is no active maintainer for this target. Remove the code and all the packages which are only used by this target. To add this target to OpenWrt again port it to a recent and supported kernel version. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* omap24xx: Remove unmaintained targetHauke Mehrtens2019-05-0315-599/+0
| | | | | | | | | | | | This target only supports kernel 4.1, which is not supported in OpenWrt any more for multiple releases. It also looks like there is no active maintainer for this target. Remove the code and all the packages which are only used by this target. To add this target to OpenWrt again port it to a recent and supported kernel version. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* ppc44x: Remove unmaintained targetHauke Mehrtens2019-05-038-481/+0
| | | | | | | | | | | | This target only supports kernel 3.18, which is not supported in OpenWrt any more for multiple releases. It also looks like there is no active maintainer for this target. Remove the code and all the packages which are only used by this target. To add this target to OpenWrt again port it to a recent and supported kernel version. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* ppc40x: Remove unmaintained targetHauke Mehrtens2019-05-0313-2229/+0
| | | | | | | | | | | | This target only supports kernel 3.18, which is not supported in OpenWrt any more for multiple releases. It also looks like there is no active maintainer for this target. Remove the code and all the packages which are only used by this target. To add this target to OpenWrt again port it to a recent and supported kernel version. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* mcs814x: Remove unmaintained targetHauke Mehrtens2019-05-0353-4280/+0
| | | | | | | | | | | | This target only supports kernel 3.18, which is not supported in OpenWrt any more for multiple releases. It also looks like there is no active maintainer for this target. Remove the code and all the packages which are only used by this target. To add this target to OpenWrt again port it to a recent and supported kernel version. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* au1000: Remove unmaintained targetHauke Mehrtens2019-05-0318-458/+0
| | | | | | | | | | | | This target only supports kernel 3.18, which is not supported in OpenWrt any more for multiple releases. It also looks like there is no active maintainer for this target. Remove the code and all the packages which are only used by this target. To add this target to OpenWrt again port it to a recent and supported kernel version. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* adm8668: Remove unmaintained targetHauke Mehrtens2019-05-0350-4574/+0
| | | | | | | | | | | | This target only supports kernel 3.18, which is not supported in OpenWrt any more for multiple releases. It also looks like there is no active maintainer for this target. Remove the code and all the packages which are only used by this target. To add this target to OpenWrt again port it to a recent and supported kernel version. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* adm5120: Remove unmaintained targetHauke Mehrtens2019-05-03160-18722/+0
| | | | | | | | | | | | This target only supports kernel 3.18, which is not supported in OpenWrt any more for multiple releases. It also looks like there is no active maintainer for this target. Remove the code and all the packages which are only used by this target. To add this target to OpenWrt again port it to a recent and supported kernel version. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* brcm2708: fix renamed definition (FS#2265)Koen Vandeputte2019-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This target adds an alternative mmc driver using a patch. Within this patch, a definition got renamed upstream. Change it to fix following compile error: CC drivers/mmc/host/bcm2835-mmc.o In file included from ./include/linux/kernel.h:14:0, from ./include/linux/delay.h:22, from drivers/mmc/host/bcm2835-mmc.c:25: drivers/mmc/host/bcm2835-mmc.c: In function 'bcm2835_mmc_dumpregs': drivers/mmc/host/bcm2835-mmc.c:254:27: error: 'SDHCI_ACMD12_ERR' undeclared (first use in this function); did you mean 'SDHCI_CMD_CRC'? bcm2835_mmc_readw(host, SDHCI_ACMD12_ERR), ^ ./include/linux/printk.h:137:18: note: in definition of macro 'no_printk' printk(fmt, ##__VA_ARGS__); \ ^~~~~~~~~~~ drivers/mmc/host/bcm2835-mmc.c:253:2: note: in expansion of macro 'pr_debug' pr_debug(DRIVER_NAME ": AC12 err: 0x%08x | Slot int: 0x%08x\n", ^~~~~~~~ drivers/mmc/host/bcm2835-mmc.c:254:27: note: each undeclared identifier is reported only once for each function it appears in bcm2835_mmc_readw(host, SDHCI_ACMD12_ERR), ^ ./include/linux/printk.h:137:18: note: in definition of macro 'no_printk' printk(fmt, ##__VA_ARGS__); \ ^~~~~~~~~~~ drivers/mmc/host/bcm2835-mmc.c:253:2: note: in expansion of macro 'pr_debug' pr_debug(DRIVER_NAME ": AC12 err: 0x%08x | Slot int: 0x%08x\n", ^~~~~~~~ scripts/Makefile.build:326: recipe for target 'drivers/mmc/host/bcm2835-mmc.o' failed make[8]: *** [drivers/mmc/host/bcm2835-mmc.o] Error 1 Upstream commit: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v4.14.114&id=45fd8679ea86bffb352132a1df4917c3d11375aa Fixes: b765f4be407c ("kernel: bump 4.14 to 4.14.114") Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>