aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mac80211: Fix build on mpc85xx targetHauke Mehrtens2020-08-112-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following compile error seen on the mpc85xx target: CC [M] /linux-mpc85xx_p2020/backports-5.7-rc3-1/drivers/net/wireless/intersil/orinoco/main.o In file included from /builder/shared-workdir/build/staging_dir/toolchain-powerpc_8540_gcc-8.4.0_musl/include/stddef.h:17, from /linux-mpc85xx_p2020/backports-5.7-rc3-1/include/uapi/linux/wireless.h:77, from /linux-mpc85xx_p2020/backports-5.7-rc3-1/include/linux/wireless.h:13, from /linux-mpc85xx_p2020/backports-5.7-rc3-1/drivers/net/wireless/intersil/orinoco/main.c:89: /builder/shared-workdir/build/staging_dir/toolchain-powerpc_8540_gcc-8.4.0_musl/include/bits/alltypes.h:106:15: error: conflicting types for 'ptrdiff_t' typedef _Addr ptrdiff_t; ^~~~~~~~~ In file included from /linux-mpc85xx_p2020/backports-5.7-rc3-1/backport-include/linux/types.h:4, from ./include/linux/list.h:5, from /linux-mpc85xx_p2020/backports-5.7-rc3-1/backport-include/linux/list.h:3, from ./include/linux/module.h:9, from /linux-mpc85xx_p2020/backports-5.7-rc3-1/backport-include/linux/module.h:3, from /linux-mpc85xx_p2020/backports-5.7-rc3-1/drivers/net/wireless/intersil/orinoco/main.c:79: ./include/linux/types.h:65:28: note: previous declaration of 'ptrdiff_t' was here typedef __kernel_ptrdiff_t ptrdiff_t; ^~~~~~~~~ scripts/Makefile.build:265: recipe for target '/linux-mpc85xx_p2020/backports-5.7-rc3-1/drivers/net/wireless/intersil/orinoco/main.o' failed Fixes: d6b158b86981 ("mac80211: Update to 4.19.137-1") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 04b1a11f5ca72a741493addca1b1ae093f37934f)
* x86: Add CONFIG_EFI_CUSTOM_SSDT_OVERLAYSHauke Mehrtens2020-08-111-0/+1
| | | | | | | | | | The CONFIG_EFI_CUSTOM_SSDT_OVERLAYS option was added in kernel 4.14.188, set it for the x86/generic target. This fixes a build problem in the x86/generic target. Fixes: 148d59c67edd ("kernel: update kernel 4.14 to version 4.14.193") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* ar71xx: fix ZyXEL NBG6616 wifi switchChristoph Krapp2020-08-111-2/+2
| | | | | | | | The device uses a rf-kill switch instead of a button. Furthermore the GPIO is active high. Signed-off-by: Christoph Krapp <achterin@googlemail.com> (cherry picked from commit 0af656e978f1adac4061516d9d2e661e101ba64c)
* tools/cmake: fix typo in parallel make patchPiotr Stefaniak2020-08-112-1/+2
| | | | | | | | | | | | | | The variable in the case argument was mistyped, so the case always checked against an empty string and never matched. Fix the variable name. Add a PKG_RELEASE to Makefile so we can bump it. Fixes: d6de31310cc1 ("cmake: restore parallel build support for bootstrap") Signed-off-by: Piotr Stefaniak <pstef@freebsd.org> [add commit message, add PKG_RELEASE, fix commit title, add Fixes:] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit e27fbae63c3436ce5588ca06b78ea88c7a316fee)
* mac80211: Update to 4.19.137-1Hauke Mehrtens2020-08-1127-64/+64
| | | | | | | b43 and b43legacy now support ieee80211w, hardware crypto will be deactivated in such cases. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* kernel: update kernel 4.14 to version 4.14.193Hauke Mehrtens2020-08-1122-139/+61
| | | | | | Compile and runtime tested on lantiq/xrx200 and ipq40xx. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* scripts: Add Buildbot dump-target-info.pl scriptPaul Spooren2020-08-101-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script comes from buildbot.git[0] and is used to print available targets and architectures, which are then build. As the buildbot clones openwrt.git anyway, the script might as well live here to be used for other cases as well, e.g. determining what architectures are available when building Docker containers or show developers an overview which architectures are used by which target. It's called with either the parameter `architectures` or `targets`, showing architectures followed by supported targets or targets, followed by the supported architectures: $ ./scripts/dump-target-info.pl architectures aarch64_cortex-a53 bcm27xx/bcm2710 mediatek/mt7622 mvebu/cortexa53 sunxi/cortexa53 aarch64_cortex-a72 bcm27xx/bcm2711 mvebu/cortexa72 ... $ ./scripts/dump-target-info.pl targets apm821xx/nand powerpc_464fp apm821xx/sata powerpc_464fp ... In the future the the script could be removed from the buildbot repository and maintained only here. Rename `dumpinfo.pl` to `dump-target-info.pl` to improve verbosity of filename. [0]: https://git.openwrt.org/?p=buildbot.git;a=blob;f=scripts/dumpinfo.pl;h=aa97f8d60379076a41b968402e9337cea824ece5;hb=HEAD Signed-off-by: Paul Spooren <mail@aparcar.org> (cherry picked from commit 656b562aff36d92b0e8586833b59896a55b8a993)
* uboot-envtools: ar71xx: add ZyXEL NBG6616 uboot env supportChristoph Krapp2020-08-101-0/+1
| | | | | | | | | This adds support for ZyXEL NBG6616 uboot-env access Signed-off-by: Christoph Krapp <achterin@googlemail.com> [add "ar71xx" to commit title] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit eb95ca3b5c8b33e3212896f906922eba5f72abb3)
* ar71xx: change u-boot-env to read-write for ZyXEL NBG6616Christoph Krapp2020-08-101-1/+1
| | | | | | | | | | As the ath79 port of this device uses a combined kernel + root partition the uboot bootcmd variable needs to be changed. As using cli/luci is more convenient than opening up the case and using a uart connection, lets unlock the uboot-env partition for write access. Signed-off-by: Christoph Krapp <achterin@googlemail.com> (cherry picked from commit 982c1f6e42c5b3e0f23eedd825a317a2872aa37b)
* hostapd: add wpad-basic-wolfssl variantPetr Štetiar2020-08-103-1/+17
| | | | | | | | | | Add package which provides size optimized wpad with support for just WPA-PSK, SAE (WPA3-Personal), 802.11r and 802.11w. Signed-off-by: Petr Štetiar <ynezz@true.cz> [adapt to recent changes, add dependency for WPA_WOLFSSL config] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit c487cf8e94cbdf582dfc3c2bdaab913a146a2100)
* hostapd: reorganize config selection hierarchy for WPA3Adrian Schmutzler2020-08-101-16/+18
| | | | | | | | | | | | | | | | | | | | | The current selection of DRIVER_MAKEOPTS and TARGET_LDFLAGS is exceptionally hard to read. This tries to make things a little easier by inverting the hierarchy of the conditions, so SSL_VARIANT is checked first and LOCAL_VARIANT is checked second. This exploits the fact that some of the previous conditions were unnecessary, e.g. there is no hostapd-mesh*, so we don't need to exclude this combination. It also should make it a little easier to see which options are actually switched by SSL_VARIANT and which by LOCAL_VARIANT. The patch is supposed to be cosmetic. However, the improvement for readers and the maintained consistency with master qualify this for backporting. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit c4dd7fc23bfcf3b3f1a838668bb070edc9db5d4b)
* ramips: correct WizFi630S pin mappingsTobias Welz2020-08-081-27/+8
| | | | | | | | | | | | WizFi630S had some pins changed in the release version of the board. The run led, wps button and a slide switch where affected. This patch is correcting this. i2c is removed as it is sharing a pin with the run (system) led. uart2 is enabled as it is also enabled in the OEM firmware. Signed-off-by: Tobias Welz <tw@wiznet.eu> (backported from commit d0b229f553a814b22c16976e40a197f892c0c0df) Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
* ramips: enable flashing WizFi630S via OEM firmwareTobias Welz2020-08-081-0/+1
| | | | | | | | | | | | WIZnet WizFi630s board name is written slightly different it its OEM OpenWrt firmware. This causes an incompatibility warning during flashing with sysupgrade. This patch is adding the vendor board name to the supported devices list to avoid this warning. For initial flashing you can use sysupgrade via command line or luci beside of TFTP. Do not keep the OEM configuration during sysupgrade. Signed-off-by: Tobias Welz <tw@wiznet.eu> (cherry picked from commit 816973f42aa47d910d3e35c2f8f8eb9d67416396)
* ramips: remove doublet entry in WizFi630S dts fileTobias Welz2020-08-081-4/+0
| | | | | | | | &wmac entry in WIZnet WizFi630S dts file was existing two times. This is removing one of them. Signed-off-by: Tobias Welz <tw@wiznet.eu> (cherry picked from commit b735bbcb1876196f33f044ed07325f8959a8967f)
* ramips: disable unused phy ports of WizFi630STobias Welz2020-08-081-0/+1
| | | | | | | | WIZnet WizFi630S is using only 3 of the phy ports. The unused phy ports draw unnecessarily power. This is disabling the unused phy ports. Signed-off-by: Tobias Welz <tw@wiznet.eu> (cherry picked from commit 36d4c2272ec65490232e70d45b945b9f467b78f0)
* mvebu: fix LAN/WAN port assignment on ClearFog Base/ProJosua Mayer2020-08-071-6/+6
| | | | | | | | | | | | | | | | | The comments in code already describe the intended lan / wan assignment: lan: switch wan: standalone ethernet and sfp Update the interface handles to match the comments, as observed with OpenWRT-19.07-rc2 on a Clearfog Pro Rev 2.0. This also matches the effective assignment on master, while the actual interface names (ethX) are different due to the reassignment in 06_set_iface_mac, which is included in 19.07 but was dropped for master. Signed-off-by: Josua Mayer <josua.mayer@jm0.eu> [extend commit message] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
* ar71xx: restore support for boot console with arbitrary baud ratesSungbo Eo2020-08-021-0/+54
| | | | | | | | | | | | Commit 1bfbf2de6df9 ("ar71xx: serial: core: add support for boot console with arbitrary baud rates") added support for arbitrary baud rates which enabled 250000 baud rate for Yun. But the patch was not ported to kernel 4.9, and since then the kernel set its baud rate to 9600. This commit ports the patch to kernel 4.14, thereby restoring the serial console of Yun. Cc: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Sungbo Eo <mans0n@gorani.run> (cherry picked from commit c90db26e051e4f0e7cd32333b3bd8c94a13d599a)
* ath79: restore support for boot console with arbitrary baud ratesAdrian Schmutzler2020-08-021-0/+54
| | | | | | | | | | | | | | | The Arduino Yun uses a baud rate of 250000 by default. The serial is going over the Atmel ATmega and is used to connect to this chip. Without this patch Linux wants to switch the console to 9600 Baud. With this patch Linux will use the configured baud rate and not a default one specified in uart_register_driver(). This has been added for ath79 4.19 and 5.4 in master as part of fc59b2f79b50 ("ath79: add support for Arduino Yun"), this backports it separately to 4.14. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
* ar71xx: enable ethernet LED of Arduino YunSungbo Eo2020-08-021-2/+1
| | | | | | | | | Commit 05d73a2a7379 enabled GPIO on ethernet LED, but proper LED setup was not added then. This commit fixes it by reverting the change on the LED. Fixes: 05d73a2a7379 ("ar71xx: Arduino Yun board 'WLAN RST' button support") Signed-off-by: Sungbo Eo <mans0n@gorani.run> (cherry picked from commit a5e404d1923d135d335e4ece83f87e6e891396e2)
* ar71xx: fix sysupgrade for Arduino YunSungbo Eo2020-08-021-1/+1
| | | | | | | | | | Commit bb46b635df48 changed its partition scheme, but sysupgrade image validation still uses the old format. This commit fixes it so that force flag is not needed for sysupgrade. Fixes: bb46b635df48 ("ar71xx: move Arduino Yun to generic building code") Signed-off-by: Sungbo Eo <mans0n@gorani.run> (cherry picked from commit 58dc1d0637425cfe023192466e6212009332b677)
* Revert "ar71xx: fix Arduino Yun enabling of level shifters outputs"Sungbo Eo2020-08-021-2/+2
| | | | | | | | | | This reverts commit 077253dd666a30ae5231c3748222d4b5b138593d. The output enable pins should be disabled by default, and only enabled when used. Otherwise unwanted conflicts might occur between MCU and SoC pins. Signed-off-by: Sungbo Eo <mans0n@gorani.run> (cherry picked from commit 43896dc0b005adfb512c027a27781c971440d415)
* ramips: add kmod-usb-dwc2 to ZyXEL Keenetic imageAlexey Dobrovolsky2020-08-021-1/+2
| | | | | | | | | | | | ZyXEL Keenetic has a USB port. Thus, DWC2 USB controller driver should be in the default image for this device. Fixes: a7cbf59e0e04 ("ramips: add new device ZyXEL Keenetic as kn") Signed-off-by: Alexey Dobrovolsky <dobrovolskiy.alexey@gmail.com> [fixed whitespace issue] Signed-off-by: Petr Štetiar <ynezz@true.cz> (backported from commit 0a182fcba6d9cb2cf74cae9114ea4770ef928f75) Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
* ramips: remove patches for USB-dwc2Alexey Dobrovolsky2020-08-021-29/+0
| | | | | | | | | | | | | | | In FS#2738 we can see that patch first introduced in e8ebcff ("ramips: add a explicit reset to dwc2") breaks USB functionality since 18.06. Thus, this patch should be removed. Removed: - 0032-USB-dwc2-add-device_reset.patch Fixes: FS#2738 Fixes: FS#2964 Signed-off-by: Alexey Dobrovolsky <dobrovolskiy.alexey@gmail.com> (cherry picked from commit ab841b4393a4077a5819da1da040ab9a89e3b69d)
* hostapd: improve TITLE for packagesAdrian Schmutzler2020-07-301-25/+33
| | | | | | | | | | | | | | | For a few packages, the current TITLE is too long, so it is not displayed at all when running make menuconfig. Despite, there is no indication of OpenSSL vs. wolfSSL in the titles. Thus, this patch adjusts titles to be generally shorter, and adds the SSL variant to it. While at it, make things easier by creating a shared definition for eapol-test like it's done already for all the other flavors. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit 917980fd8a6589d6911797211f1871016f527f8c)
* mediatek: mt7623: fix sysupgrade from vendor OpenWrt on UniElec U7623David Woodhouse2020-07-303-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This board ships with an ancient 14.07-based OpenWrt using block2mtd, and the MBR partition table contains nonsense. It is possible to sysupgrade to an upstream OpenWrt image, but the legacy layout of the OpenWrt images start at 0xA00 in the eMMC, with a raw uImage. The legacy OpenWrt image doesn't "own" the beginning of the device, including the MBR and U-Boot. This means that when a user upgrades to upstream OpenWrt, it doesn't boot because it can't find the right partitions. So hard-code them on the kernel's command line using CONFIG_CMDLINE_PARTITION (for block). Additionally, the vendor firmware doesn't cope with images larger than about 36MiB, because it only overwrites the contents of its "firmware" MTD partition. The current layout of the legacy image wastes a lot of space, allowing over 32MiB for the kernel and another 10MiB for the FAT recovery file system which is only created as 3MiB. So pull those in to allow 4¾ MiB for the kernel, 3MiB for recovery, and then we have over 20MiB for the root file system. This doesn't affect the new images which ship with a full eMMC image including a different MBR layout and a partition for U-Boot, because our modern U-Boot can actually pass the command line to the kernel, and the built-in one doesn't get used anyway. Tested by upgrading from vendor OpenWrt to the current legacy image, from legacy to itself, to the previous legacy layout, and then to finally the full-system image. Signed-off-by: David Woodhouse <dwmw2@infradead.org> (cherry picked from commit 6eb63019afef89404899f2cb65fb4c16e00aa0ed)
* mediatek: mt7623: add explicit console= to U7623 kernelDavid Woodhouse2020-07-301-1/+1
| | | | | | | | The bootloader for legacy builds can't set it, so we end up unable to log in on the serial port. Signed-off-by: David Woodhouse <dwmw2@infradead.org> (cherry picked from commit ea9ef8c9451a08aa4dbb6efcbe5f20d9b788ebd2)
* curl: patch CVE-2020-8169Jan Pavlinec2020-07-292-1/+39
| | | | | | | | | | | Affected versions: curl 7.62.0 to and including 7.70.0 https://curl.haxx.se/docs/CVE-2020-8169.html Run tested on Omnia with OpenWrt 19.07 Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz> [added missing commit description] Signed-off-by: Petr Štetiar <ynezz@true.cz>
* make_ext4fs: Update to version 2020-01-05Hauke Mehrtens2020-07-292-14/+3
| | | | | | | | 5c201be Add LDFLAGS when building libsparse.a ec17045 make_ext4fs: fix build on musl systems Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 271d0c825ba5821160e4a516497796fa342c2eff)
* make-ext4fs: update to HEAD of 2017-05-29 - eebda1Christian Lamparter2020-07-291-3/+3
| | | | | | | | | | | | | | Update make-ext4fs to commit eebda1d55d9701ace2700d7ae461697fadf52d1f git log --pretty=oneline --abbrev-commit 484903e4..eebda1d5 eebda1d make_ext4: Add strict prototypes. bb9cf91 make_ext4fs: Remove off64_t in favor of standard off_t Created with the help of the make-package-update-commit.sh script. Signed-off-by: Christian Lamparter <chunkeey@gmail.com> (cherry picked from commit ac2f341036c18acee2b4f69e819cffeaacc2e824)
* firewall: backport patch for mss clamping in both directionsYousong Zhou2020-07-262-1/+34
| | | | Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
* ath79: correctly define WiFi switch for TL-WR841ND v8Adrian Schmutzler2020-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The TL-WR841ND v8 feature a WiFi switch instead of a button. This adds the corresponding input-type to prevent booting into failsafe regularly. This has been defined correctly in ar71xx, but was overlooked when migrating to ath79. In contrast, the TL-WR842ND v2, which has the key set up as switch in ar71xx, actually has a button. The TL-MR3420 v2 has a button as well and is set up correctly for both targets. (Information based on TP-Link user guide) Note: While looking into this, I found that support PR for TL-MR3420 v2 switched reset button to ACTIVE_HIGH. However, the other two device still use ACTIVE_LOW. This seems strange, but I cannot verify it lacking the affected devices. Fixes: FS#2733 Fixes: 9601d94138de ("add support for TP-Link TL-WR841N/ND v8") Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (backported from commit 5e86877f36b0d95127dcef8ed3abf78ecd78061d)
* bcm47xx: fix switch setup for Linksys WRT610N v2Adrian Schmutzler2020-07-231-0/+1
| | | | | | | | | | | | | WRT610N V2 is not detected by the initial network configuration script. The switch remains unconfigured and wlan/lan vlans are not created. This adds the correct setup for the device. Fixes: FS#1869 Suggested-by: Alessandro Radicati Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit a2fee73e270305c4cb086055cc30e97f65e6f58b)
* tplink-safeloader: expand support list for TP-Link CPE210 v3Adrian Schmutzler2020-07-231-1/+8
| | | | | | | | | | | | | | | This adds new strings to the support list for the TP-Link CPE210 v3 that are supposed to work with the existing setup. Without it, the factory image won't be accepted by the vendor UI on these newer revisions. Tested on a CPE210 v3.20 (EU). Ref: https://forum.openwrt.org/t/build-for-cpe210-v3-20/68000 Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit 4a2380a1e778a8f8e0bfb0a00f2996ed0aab58d8)
* lantiq/xrx200: make WLAN button responsive on Fritzbox 7360 & 7362Dustin Gathmann2020-07-231-1/+1
| | | | | | | | | | | | | | Pressing the 'WLAN' button should enable/disable wireless activity. Currently, the button is mapped to the KEY_WLAN, which will not have this effect. This patch changes the mapping of the WLAN button, so a button press will emit an action for the 'rfkill' key instead of 'wlan'. Apparently, this is what stock OpenWRT expects. This fix is analogous to the preceding patch for Fritzbox 3370. Signed-off-by: Dustin Gathmann <dzsoftware@posteo.org> (cherry picked from commit d5a148f5c8f6d6dee7041fd348bd0f52839d0f4e)
* lantiq/xrx200: fix WLAN button actions for Fritzbox 3370Dustin Gathmann2020-07-231-1/+1
| | | | | | | | | | | | | The WLAN button actions are reversed, i.e. pressing the button emits a 'released' action, and vice versa. This can easily be checked by adding logger -t button_action "$BUTTON $ACTION" as the second line of /etc/rc.button/rfkill, and using logread to read the events (assuming the preceding patch has been applied). Defining the GPIO as ACTIVE_LOW corrects this behavior. Signed-off-by: Dustin Gathmann <dzsoftware@posteo.org> (cherry picked from commit 0ee30adb46a87583badd85b69e4ccd7942786374)
* lantiq/xrx200: make WLAN button responsive on Fritzbox 3370Dustin Gathmann2020-07-231-1/+1
| | | | | | | | | | | | Pressing the 'WLAN' button should enable/disable wireless activity. However, on the Fritzbox 3370 this doesn't have an effect. This patch changes the mapping of the physical WLAN button, so a button press will emit an action for the 'rfkill' key instead of 'wlan'. Apparently, this is what stock OpenWRT expects, and also what is implemented for most other devices. Signed-off-by: Dustin Gathmann <dzsoftware@posteo.org> (cherry picked from commit a53bf63756ef2a266ae5f3b3507eeb7382b4cdc9)
* vxlan: bump and change to PKG_RELEASEAdrian Schmutzler2020-07-171-1/+1
| | | | | | | | | | | | | | Bumping package version has been overlooked in a previous commit. While at it, use PKG_RELEASE instead of PKG_VERSION, as the latter is meant for upstream version number only. (The effective version string for the package would be "3" in both cases, so there is no harm done for version comparison.) Fixes: 0453c3866feb ("vxlan: fix udp checksum control") Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit b29d620ed2521fe6fda40ddafe6cb0f1d70e4503)
* vxlan: fix udp checksum controlJohannes Kimmel2020-07-171-0/+2
| | | | | | | | | | | | So far, passing "rxcsum" and "txcsum" had no effect. Fixes: 95ab18e0124e ("vxlan: add options to enable and disable UDP checksums") Signed-off-by: Johannes Kimmel <fff@bareminimum.eu> [add Fixes:] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit 0453c3866feb701160bbab4ecf9762c5a3038503)
* ipq40xx: fix ethernet vlan double taggingJohn Crispin2020-07-141-0/+193
| | | | | | | | | | | As the the SoC uses implicit vlan tagging for dual MAC support, the offload feature breaks when using double tagging. This is backport of 9da2b567605b0964d921b9ca4f0c9886db4f636d from trunk. As the layout of the files has changed a cherry-pick was not possible. Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: John Crispin <john@phrozen.org>
* build,json: fix compatibility with Python 3.5Paul Spooren2020-07-131-1/+1
| | | | | | | | The f-string feature was introduced in Python 3.6. As Buildbots may run on Debian 9, which comes per default with Python 3.5, this would cause an issue. Instead of f-strings use the *legacy* `.format()` function. Signed-off-by: Paul Spooren <mail@aparcar.org>
* build: fix compatibility with python 3.6Huangbin Zhan2020-07-131-3/+4
| | | | | | | | | On a system python3 is linked to python3.6, fail to perform json_overview_image_info and got `TypeError: __init__() got an unexpected keyword argument 'capture_output'`. This patch emulate the behaviour on python 3.7+. Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com> (cherry picked from commit 3caad5150c2011a7dac462acaa06d0e69f8ed005)
* build,json: fix build failure in case no data is foundDaniel Golle2020-07-131-18/+16
| | | | | | | | | Only collect arch_packages if actually generating any output. Fixes: commit f09b9319 ("build,json: store arch_packages in profiles.json"( Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Paul Spooren <mail@aparcar.org> (cherry picked from commit 3b0f698760ae3a62173a28f18e9e1e3adef9c492)
* build,json: store arch_packages in profiles.jsonPaul Spooren2020-07-131-2/+5
| | | | | | | | | | The `arch_packages` contains the supported package architecture. Previously it was necessary to parse the `Packages` index for the line `Architecture:`, requiring both an additional parser and file download. Signed-off-by: Paul Spooren <mail@aparcar.org> (cherry picked from commit f09b9319c666e343763c7618878a503ad7eb7531)
* build: store default/device packages in JSONPaul Spooren2020-07-133-2/+20
| | | | | | | | | | | | | With this commit the `profiles.json` contain both the target specific `default_packages` as well as the device specific `device_packages` as a array of strings. This information is required for downstream projects like the various web-based interactive firmware generators. Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Paul Spooren <mail@aparcar.org> (cherry picked from commit 263f7e5bbd119ebed1f514c16f659a2e2a2b132c)
* imagebuilder: Remove json_info_files/ before buildPaul Spooren2020-07-131-0/+1
| | | | | | | | | | | | | | | The folder `json_info_files` contains multiple JSON files which describe created firmware images. The folder is not removed between builds as the ImageBuilder does not use `image.mk`. Not removing the JSON files result in a merged `profiles.json` file containing entries for outdated or non-existing images. This commit adds the `json_info_files/` cleanup step to the ImageBuilder Makefile. Signed-off-by: Paul Spooren <mail@aparcar.org> (cherry picked from commit 941ec28b355ea690b5682d2bf8175aa513379997)
* kirkwood: support for button in Pogoplug V4Sungbo Eo2020-07-101-1/+1
| | | | | | | | Pogoplug V4 has a reset button on a GPIO pin. To use it, kmod-gpio-button-hotplug package needs to be installed. Signed-off-by: Sungbo Eo <mans0n@gorani.run> (cherry picked from commit 91472dc2ce051d255eecb7fbba3484de917fa65d)
* lantiq: dts: Move the &usb_vbus nodes out of &gpioLuca Olivetti2020-07-104-48/+48
| | | | | | | | | | | | | | | | | | | | | | Move the USB VBUS regulator nodes out of the GPIO controller node. This fixes a problem where the "regulator-fixed" driver wasn't probed for these regulators because the GPIO driver doesn't scan the child-nodes and based on the dt-bindings documentation it's not supposed to. This fixed the following error reported by Luca Olivetti: ... dwc2 1e101000.usb: DWC OTG Controller dwc2 1e101000.usb: new USB bus registered, assigned bus number 1 dwc2 1e101000.usb: irq 62, io mem 0x1e101000 dwc2 1e101000.usb: startup error -517 dwc2 1e101000.usb: USB bus 1 deregistered dwc2 1e101000.usb: dwc2_hcd_init() FAILED, returning -517 Fixes: FS#1634 Cc: Luca Olivetti <luca@ventoso.org> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> [backported from 982468de35d499f85470b7b547d2b27cea53bae0] Signed-off-by: Luca Olivetti <luca@ventoso.org>
* ar71xx: Fix mikrotik NAND compile problemHauke Mehrtens2020-07-071-1/+1
| | | | | | | | | | | This fixes the following compile error: drivers/mtd/nand/rb91x_nand.c: In function 'rb91x_nand_remove': drivers/mtd/nand/rb91x_nand.c:445:16: error: 'rbni' undeclared (first use in this function) nand_release(&rbni->chip); Fixes: 9cad70044f75 ("kernel: fix nand_release() usage.") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 66e04abbb6d0dec8642be5deb2fca4bba470f8ac)
* ar71xx: Fix mikrotik NAND compile problemHauke Mehrtens2020-07-061-1/+1
| | | | | | | | There is one closing bracket too much. Fixes: 9cad70044f75 ("kernel: fix nand_release() usage.") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 014d3f593acea13ee6aa002d858f182806ed43f0)
* armvirt,x86: fix build breakage of crypto ccp modulePetr Štetiar2020-07-052-0/+2
| | | | | | | | | | | Upstream in commit f9f8f0c24203 ("crypto: ccp -- don't "select" CONFIG_DMADEVICES") removed dependency on CONFIG_DMADEVICES symbol which leads to build breakage of ccp crypto module, so fix this by adding that symbol back in the kernel config. Fixes: f4985a22ca1b ("kernel: Update kernel 4.14 to version 4.14.187") Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit 472b8fc91bbab0530d72e9780a482bacc1bbe5f7)