Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 5a4685c
Author: Daniel Golle <daniel@makrotopia.org>
Date:   Sat Dec 18 01:45:44 2021 +0000

    mediatek: mt7623: bpi-r2: add ethernet alias to device tree

    Add ethernet0 alias in device tree to make U-Boot inherit the Ethernet
    mac address (set via environment variable 'ethaddr') down to Linux.

    Signed-off-by: Daniel Golle <daniel@makrotopia.org>

commit df9a62a
Author: Hans Dedecker <dedeckeh@gmail.com>
Date:   Fri Dec 17 21:04:54 2021 +0100

    odhcp6c: update to latest git HEAD

    39b584b Revert "dhcpv6: add a minimum valid lifetime for IA_PD updates"
    c9578e1 dhcpv6: add support for null IA_PD valid lifetime
    ca43ea3 dhcpv6: add a minimum valid lifetime for IA_PD updates

    Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

commit 1e57d52
Author: Hans Dedecker <dedeckeh@gmail.com>
Date:   Fri Dec 17 20:54:44 2021 +0100

    netifd: update to latest git HEAD

    5ca5e0b netifd: allow disabling rule/rule6 config sections
    8875960 interface-ip: add support for IPv6 prefix invalidation
    e589c05 interface-ip: use metric when looking for a route
    b54ffde main: fix hotplug script usage message

    Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

commit fa3690f
Author: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Date:   Fri Dec 17 01:23:08 2021 +0300

    kernel: 5.10: consolidate mac80211 crypto options

    Each of
    - CRYPTO_AEAD2
    - CRYPTO_AEAD
    - CRYPTO_GF128MUL
    - CRYPTO_GHASH
    - CRYPTO_HASH2
    - CRYPTO_HASH
    - CRYPTO_MANAGER2
    - CRYPTO_MANAGER
    - CRYPTO_NULL2

    either directly required for mac80211 crypto support, or directly
    selected by such options. Support for the mac80211 crypto was enabled in
    the generic config since c718212 ("kernel: make cryptoapi support
    needed by mac80211 built-in"). So move the above options from the target
    configs to the generic config to make it clear why do we need them.

    CC: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

commit b61ab8f
Author: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Date:   Fri Dec 17 01:23:07 2021 +0300

    kernel: filter out both Clang and LLD versions

    Both CLANG_VERSION and LLD_VERISON are autogenerated runtime
    configuration options, so add them to the kernel configuration filter
    and remove from generic and per-target configs to keep configs clean.

    Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

commit f30e6d9
Author: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Date:   Tue Dec 7 17:28:23 2021 -0800

    toolchain/gcc: refresh gcc-11.2.0 patch

    Run make toolchain/gcc/minimal/refresh (with glibc, with musl
    toolchain/gcc/{initial,final}/refresh don't work)

    Fixes: ab241e0 ("toolchain/gcc: fix build on MacOS arm64")

    Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>

commit 0dca106
Author: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Date:   Tue Dec 7 17:28:22 2021 -0800

    toolchain/gcc: replace revert with upstream fix

    This will make upgrade to v11.3.0 easier and follows upstream more
    closely.

    Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>

commit 475b366
Author: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Date:   Tue Dec 7 17:28:21 2021 -0800

    toolchain/gcc: remove upstreamed patch, add backport

    This patch has been upstream since GCC 10.
    Dragan Mladjenovic (2):
          Emit .note.GNU-stack for soft-float linux targets.
          Emit .note.GNU-stack for hard-float linux targets.

    Link: https://gcc.gnu.org/g:a3c1e1f2ff88
    Link: https://gcc.gnu.org/g:54b3d52c3cca

    Add backport patch to define TARGET_LIBC_GNUSTACK on musl to add
    .note.GNU-stack on hard-float MIPS targets.

    Link: https://gcc.gnu.org/g:25abbb924968

    The net effect should be the exact same functionality while following
    upstream code instead of a custom outdated patch.

    Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>

commit eabb4a5
Author: John Audia <graysky@archlinux.us>
Date:   Fri Dec 17 06:42:51 2021 -0500

    kernel: bump 5.10 to 5.10.87

    All patches automatically rebased.

    Build system: x86_64
    Build-tested: bcm2711/RPi4B, ipq806x/R7800*
    Run-tested: bcm2711/RPi4B, ipq806x/R7800*

    *Had to revert 7f1edbd in order to build
    (binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)

    Signed-off-by: John Audia <graysky@archlinux.us>

commit 002424e
Author: John Audia <graysky@archlinux.us>
Date:   Thu Dec 16 13:27:45 2021 -0500

    kernel: bump 5.10 to 5.10.86

    All patches automatically rebased.

    Build system: x86_64
    Build-tested: bcm2711/RPi4B, ipq806x/R7800*
    Run-tested: bcm2711/RPi4B, ipq806x/R7800*

    *Had to revert 7f1edbd in order to build
    (binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)

    Signed-off-by: John Audia <graysky@archlinux.us>

commit 43c0a12
Author: John Audia <graysky@archlinux.us>
Date:   Tue Dec 14 06:15:08 2021 -0500

    kernel: bump 5.10 to 5.10.85

    Removed target for patch which does not exist:
        bcm27xx/patches-5.10/950-0249-kbuild-Disable-gcc-plugins.patch

    All patches automatically rebased.

    Build system: x86_64
    Build-tested: bcm2711/RPi4B, ipq806x/R7800*
    Run-tested: bcm2711/RPi4B, ipq806x/R7800*

    * Had to revert 7f1edbd in order to build
      (binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)

    Signed-off-by: John Audia <graysky@archlinux.us>

commit 187c8f9
Author: John Audia <graysky@archlinux.us>
Date:   Wed Dec 8 06:14:30 2021 -0500

    kernel: bump 5.10 to 5.10.84

    All patches automatically rebased.

    Build system: x86_64
    Build-tested: bcm2711/RPi4B
    Run-tested: bcm2711/RPi4B

    Signed-off-by: John Audia <graysky@archlinux.us>

commit d4b2500
Author: John Audia <graysky@archlinux.us>
Date:   Fri Dec 17 06:48:52 2021 -0500

    kernel: bump 5.4 to 5.4.167

    All patches automatically rebased.

    Build system: x86_64
    Build-tested: ramips/mt7621*

    *FS#4149 affects me so I had to revert 7f1edbd
    in order to downgrade to 2.35.1

    Signed-off-by: John Audia <graysky@archlinux.us>

commit 61c76f8
Author: John Audia <graysky@archlinux.us>
Date:   Thu Dec 16 14:53:58 2021 -0500

    kernel: bump 5.4 to 5.4.166

    All patches automatically rebased.

    Build system: x86_64
    Build-tested: ramips/mt7621*

    *FS#4149 affects me so I had to revert 7f1edbd
    in order to downgrade to 2.35.1

    Signed-off-by: John Audia <graysky@archlinux.us>

commit a696e32
Author: John Audia <graysky@archlinux.us>
Date:   Wed Dec 15 06:20:33 2021 -0500

    kernel: bump 5.4 to 5.4.165

    All patches automatically rebased.

    Build system: x86_64
    Build-tested: ramips/mt7621*

    *FS#4149 affects me so I had to revert 7f1edbd
    in order to downgrade to 2.35.1

    Signed-off-by: John Audia <graysky@archlinux.us>

commit 87def9e
Author: Felix Fietkau <nbd@nbd.name>
Date:   Tue Dec 14 17:58:14 2021 +0100

    mac80211: optimize airtime fairness code to reduce cpu usage

    Signed-off-by: Felix Fietkau <nbd@nbd.name>

commit 9090e0b
Author: David Bauer <mail@david-bauer.net>
Date:   Thu Dec 16 20:27:04 2021 +0100

    hostapd: close correct blobmsg table

    Signed-off-by: David Bauer <mail@david-bauer.net>

commit cc3e390
Author: Sungbo Eo <mans0n@gorani.run>
Date:   Thu Dec 16 22:14:48 2021 +0900

    ramips: mt7620: tidy up 02_network

    * fix alphabetic sorting
    * consolidate duplicate cases

    Signed-off-by: Sungbo Eo <mans0n@gorani.run>

commit 444b4ea
Author: Rafał Miłecki <rafal@milecki.pl>
Date:   Thu Dec 16 08:25:18 2021 +0100

    bcm4908: add uboot-envtools to default packages

    It's required by sysupgrade to access UBI metadata partitions.

    Fixes: 5f05795 ("bcm4908: sysupgrade: add pkgtb format support")
    Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

commit 85ad48c
Author: Rafał Miłecki <rafal@milecki.pl>
Date:   Thu Dec 16 07:07:34 2021 +0100

    kernel: backport support for multicolor & RGB LEDs to 5.4

    This is a requirement for backporting DT files defining such LEDs.

    Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

commit 01bebc0
Author: Felix Fietkau <nbd@nbd.name>
Date:   Mon Dec 13 18:15:07 2021 +0100

    kernel: backport the upstream implementation of threaded NAPI to 5.4

    The workqueue based implementation has a few corner cases and typically lower
    performance than the upstream one

    Signed-off-by: Felix Fietkau <nbd@nbd.name>

commit c772783
Author: Rui Salvaterra <rsalvaterra@gmail.com>
Date:   Tue Dec 14 13:46:19 2021 +0000

    ramips: remove Linux 5.4 support

    We're at 5.10 stable, this can finally go.

    Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>

commit 07452a6
Author: David Bauer <mail@david-bauer.net>
Date:   Wed Dec 15 00:01:23 2021 +0100

    ramips: fix Tenbay T-MB5EU v1 Wireless MAC

    It was reported, that Tenbay T-MB5EU v1 do have incorrect Wireless MAC
    address set on 2.4 and 5 GHz.

    Some boards do not seem to have the correct MAC address set for the
    external PHY of the MT7915 radio at caldata offset 0xa.

    As the external PHY does not expose a DT binding (yet), fix up the mac
    address in userspace.

    Signed-off-by: David Bauer <mail@david-bauer.net>

commit 16bcaa7
Author: David Bauer <mail@david-bauer.net>
Date:   Sat Nov 27 22:08:28 2021 +0100

    hostapd: add OpenWrt specific statistic counters

    This adds a new struct for storing statistics not (yet) tracked by
    hostapd regarding RRM and WNM activity.

    These statistics can be read using the get_status hostapd interface ubus
    method.

    Signed-off-by: David Bauer <mail@david-bauer.net>

commit a5cc9e0
Author: Hauke Mehrtens <hauke@hauke-m.de>
Date:   Sun Nov 21 00:11:24 2021 +0100

    iw: Update to version 5.16

    Revert a commit to allow providing CFLAGS and LIBS from OpenWrt package
    Makefile.

    This downgrades the nl80211.h to kernel 5.15 and removes FILS_CRYPTO_OFFLOAD.
    This is needed to make it compatible with our patched mac80211 from
    kernel 5.15

    Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

commit 954e127
Author: Hauke Mehrtens <hauke@hauke-m.de>
Date:   Sun Nov 21 00:10:51 2021 +0100

    libnl-tiny: update to the latest version

    8e0555f attr.h: Add NLA_PUT_S32

    Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

commit 3531a96
Author: Hauke Mehrtens <hauke@hauke-m.de>
Date:   Sun Dec 5 16:36:05 2021 +0100

    mac80211: Update to version 5.15.8

    The following patches were backported from upstream before and are not
    needed any more:
      package/kernel/mac80211/patches/ath10k/081-ath10k-fix-module-load-regression-with-iram-recovery-feature.patch
      package/kernel/mac80211/patches/ath10k/980-ath10k-fix-max-antenna-gain-unit.patch
      package/kernel/mac80211/patches/build/010-headers-Add-devm_platform_get_and_ioremap_resource.patch
      package/kernel/mac80211/patches/subsys/300-mac80211-drop-check-for-DONT_REORDER-in-__ieee80211_.patch
      package/kernel/mac80211/patches/subsys/307-mac80211-do-not-access-the-IV-when-it-was-stripped.patch
      package/kernel/mac80211/patches/subsys/308-mac80211-fix-radiotap-header-generation.patch

    Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

commit 30b9367
Author: Rafał Miłecki <rafal@milecki.pl>
Date:   Tue Dec 14 17:57:49 2021 +0100

    bcm4908: add fdt-utils to default packages

    It's required by sysupgrade.

    Fixes: 5f05795 ("bcm4908: sysupgrade: add pkgtb format support")
    Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

commit 60881f6
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Wed Nov 3 17:16:52 2021 +0100

    layerscape: armv7: refresh config-5.10

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 7af83d2
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Wed Nov 3 14:31:50 2021 +0100

    layerscape: armv7: copy config-5.4 to config-5.10

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit fef79a5
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Wed Nov 3 11:29:35 2021 +0100

    layerscape: armv8_64b: refresh config-5.10

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit a939015
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Wed Nov 3 10:51:53 2021 +0100

    layerscape: armv8_64b: copy config-5.4 to config-5.10

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 83035a4
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Wed Nov 3 10:36:35 2021 +0100

    layerscape: armv8_64b: use non-SDK dts files for linux-5.10 or newer

    Since we decided to drop the LSDK patches with linux-5.10, we now have
    to switch to the corresponding upstream dts files as well.

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 82ce460
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Wed Nov 3 10:27:04 2021 +0100

    layerscape: armv8_64b: fix KERNEL_LOADADDR for linux >= 5.8

    In kernel versions newer than 5.8 the arm64 TEXT_OFFSET (0x80000) has
    been set to 0x0 (and later removed). This will break Uimages with kernel
    load addresses that aren't 2MiB aligned any longer. Resulting in the
    kernel silently fail to boot. For layerscape armv8_64b targets this
    needs to be changed to 0x80000000 (start of RAM).

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 68b4e9f
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Wed Nov 3 13:48:24 2021 +0100

    layerscape: add patches for kernel 5.10

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 7e35d86
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Wed Nov 3 10:46:35 2021 +0100

    layerscape: add kernel 5.10 as testing version

    This patch adds "KERNEL_TESTING_PATCHVER:=5.10" to the Makefile in
    layerscape target to allow using Kernel 5.10 for testing.

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 0a94549
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Wed Nov 3 10:18:39 2021 +0100

    layerscape: remove unneeded KERNEL_ENTRY_POINT definition

    As KERNEL_ENTRY_POINT is identical to KERNEL_LOADADDR, drop it.

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 2101282
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Mon Oct 11 12:54:48 2021 +0200

    ls-ddr-phy: bump to LSDK-21.08

    Update ls-ddr-phy to latest LSDK-21.08.

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 4002a6a
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Mon Oct 11 12:54:09 2021 +0200

    restool: bump to LSDK-21.08

    Update restool to latest LSDK-21.08.

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 6939230
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Mon Oct 11 12:53:06 2021 +0200

    ls-dpl: bump to LSDK-21.08

    Update ls-dpl to latest LSDK-21.08.

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit a82e766
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Mon Oct 11 12:52:10 2021 +0200

    ls-mc: bump to LSDK-21.08

    Update ls-mc to latest LSDK-21.08.

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 5df38cc
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Mon Oct 11 12:51:13 2021 +0200

    ppfe-firmware: bump to LSDK-21.08

    Update ppfe-firmware to latest LSDK-21.08.

    Switched to AUTORELEASE for simplicity.

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit d6ca827
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Mon Oct 11 12:49:56 2021 +0200

    fman-ucode: bump to LSDK-21.08

    Just update PKG_VERSION/PKG_MIRROR_HASH since fman-ucode
    of LSDK-21.08 had no changes.

    Switched to AUTORELEASE for simplicity.

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 294140c
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Mon Oct 11 12:43:55 2021 +0200

    tfa-layerscape: bump to LSDK-21.08

    Update tfa package to latest LSDK-21.08.

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 674af9c
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Thu Oct 7 08:56:19 2021 +0200

    uboot-layerscape: bump to LSDK-21.08

    Update layerscape u-boot package to LSDK-21.08 and drop patches which
    are no longer needed.

    The new env variable 'fsl_bootcmd_mcinitcmd_set' is needed to protect
    the configured bootcmd and mc_init values. See [1] for more
    informations.

    [1] https://source.denx.de/u-boot/u-boot/-/commit/b62c174e861bddc3c7131045ed018556645cecb9

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 8ef768c
Author: Martin Schiller <ms@dev.tdt.de>
Date:   Mon Oct 11 12:46:38 2021 +0200

    ls-rcw: bump to LSDK-21.08

    Update ls-rcw to latest LSDK-21.08.
    Drop patch 0001 since it had been integrated.

    Signed-off-by: Martin Schiller <ms@dev.tdt.de>

commit 66f9ed1
Author: Rui Salvaterra <rsalvaterra@gmail.com>
Date:   Thu Sep 9 09:44:41 2021 +0100

    ramips: switch to kernel 5.10

    Tested on mt7621 (Redmi AC2100) and running stable for several months.

    Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
    Tested-by: Stijn Segers <foss@volatilesystems.org>
    Tested-by: Eneas U de Queiroz <cotequeiroz@gmail.com>

commit 794e812
Author: Pawel Dembicki <paweldembicki@gmail.com>
Date:   Thu Jun 10 17:17:23 2021 +0200

    ramips: mt7620: use OKLI loader with Jboot devices

    Jboot devices have problem with >2MB kernelsize. The only way to avoid
    this problem is use small loader.

    This patch switch all mt7620 Jboot devices to lzma OKLI loader.

    Suggested-by: Szabolcs Hubai <szab.hu@gmail.com>
    Co-authored-by: Michael Pratt <mcpratt@pm.me>
    Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>

commit 3bcf3e8
Author: Rafał Miłecki <rafal@milecki.pl>
Date:   Mon Dec 13 18:19:05 2021 +0100

    bcm53xx: sysupgrade: fix support for Luxul's legacy firmware format

    Fixes: 80041de ("bcm53xx: sysupgrade: refactor handling different firmware formats")
    Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

commit 942facd
Author: Rafał Miłecki <rafal@milecki.pl>
Date:   Mon Dec 13 13:47:39 2021 +0100

    otrx: update to the latest master

    56e8e19 otrx: support TRX from stdin when extracting
    a37ccaf otrx: support unsorted partitions offsets
    1fa145e otrx: extract shared code opening & parsing TRX format
    4ecefda otrx: allow validating TRX from stdin
    cf01e69 otrx: avoid unneeded fseek() when calculating CRC32

    Fixes: 80041de ("bcm53xx: sysupgrade: refactor handling different firmware formats")
    Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

commit 5f05795
Author: Rafał Miłecki <rafal@milecki.pl>
Date:   Wed Dec 8 12:21:48 2021 +0100

    bcm4908: sysupgrade: add pkgtb format support

    BCM4908 devices with U-Boot use pkgtb firmware format. It's based on
    U-Boot's FIT: DTB with configurations, images & embedded data.

    This format contains bootfs, rootfs and optionally a first stage U-Boot
    loader. Contained images need to be extracted & flashed.

    Broadcom used two sets of firmwares: main & backup. It uses UBI volumes
    "metadata1" & "metadata2" for storing U-Boot env variables with info
    about flashed images.

    Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

commit a2cf659
Author: Rafał Miłecki <rafal@milecki.pl>
Date:   Tue Dec 7 13:00:02 2021 +0100

    dtc: support printing binary data with fdtget

    It's needed for extracting binary images.

    Cc: Yousong Zhou <yszhou4tech@gmail.com>
    Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

commit 80fe8d0
Author: Rafał Miłecki <rafal@milecki.pl>
Date:   Tue Dec 7 13:00:01 2021 +0100

    dtc: import package for dtc & fdt from packages feed

    fdt* utils are needed by targets that use U-Boot FIT images for
    sysupgrade. It includes all recent BCM4908 SoC routers as Broadcom
    switched from CFE to U-Boot.

    fdtget is required for extracting images (bootfs & rootfs) from
    Broadcom's ITB. Extracted images can be then flashed to UBI volumes.

    sysupgrade is core functionality so it needs dtc as part of base code
    base.

    Cc: Yousong Zhou <yszhou4tech@gmail.com>
    Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

commit 59faf41
Author: Moritz Warning <moritzwarning@web.de>
Date:   Sat Dec 11 09:33:46 2021 +0100

    treewide: use uniform vendor value for british telecom

    British Telecom is mostly known as BT.

    Signed-off-by: Moritz Warning <moritzwarning@web.de>

commit 6c945fa
Author: John Audia <graysky@archlinux.us>
Date:   Wed Dec 1 06:28:02 2021 -0500

    kernel: bump 5.10 to 5.10.83

    Removed upstreamed:
        bcm53xx/patches-5.10/033-v5.16-0024-ARM-dts-BCM5301X-Fix-I2C-controller-interrupt.patch[1]
        bcm53xx/patches-5.10/033-v5.16-0025-ARM-dts-BCM5301X-Add-interrupt-properties-to-GPIO-no.patch[2]

    All other patches automatically rebased.

    1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.83&id=b2cd6fdcbe0a5cb44e4610a08cc58261d494a885
    2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.83&id=9db1d4a3c2700e1cc84c3d61199411d75c2a3ec6

    Build system: x86_64*
    Build-tested: bcm2711/RPi4B, ipq806x/R7800†
    Run-tested: bcm2711/RPi4B, ipq806x/R7800†

    * Had to revert 7c99085 in order to build
      (latest bump of ca-certificates)

    † Had to revert 7f1edbd in order to build
      (binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)

    Signed-off-by: John Audia <graysky@archlinux.us>

commit a725bdc
Author: Enrico Mioso <mrkiko.rs@gmail.com>
Date:   Fri Dec 3 17:32:20 2021 +0100

    ipq40xx: fix reset button GPIO for GL.iNet GL-B2200

    GL.iNet's U-Boot checks for GPIO 40, not 43.
    Changing this allows the RESET button to work as expected.

    Signed-off-by: Enrico Mioso <mrkiko.rs@gmail.com>
    CC: Daniel Golle <daniel@makrotopia.org>
    CC: Li Zhang <li.zhang@gl-inet.com>

commit 9a1b9a4
Author: Kyoungkyu Park <choryu.park@choryu.space>
Date:   Sun Nov 14 01:03:24 2021 +0900

    ramips: add support for HUMAX E10

    HUMAX E10 (also known as HUMAX QUANTUM E10) is a 2.4/5GHz band AC router,
    based on MediaTek MT7621A.

    Specifications:
    - SoC: MT7621A
    - RAM: DDR3 128MB
    - Flash: SPI NOR 16MB (MXIC MX25L12805D)
    - WiFi:
      - 2.4GHz: MT7615
      - 5GHz: MT7615
    - Ethernet: 2x 10/100/1000Mbps
      - Switch: SoC internal
    - USB: 1x USB 2.0 Type-A
    - UART: J1 (57600 8N1)
      - pinout: [3V3] (RXD) (GND) (TXD)

    Installation via web interface:
    - Flash **factory** image through the stock web interface.

    Recovery procedure:
    1. Connect ethernet cable between Router **LAN** port and PC Ethernet port.
    2. Set your computer to a static IP **192.168.1.1**
    3. Turn the device off and wait a few seconds. Hold the WPS button on front
       of device and insert power.
    4. Send a firmware image to **192.168.1.6** using TFTP.
       You can use any TFTP client. (tftp, curl, Tftpd64...)
    - It can accept both images which is
      HUMAX stock firmware dump (0x70000-0x1000000) image
      and OpenWRT **sysupgrade** image.

    Signed-off-by: Kyoungkyu Park <choryu.park@choryu.space>
    [remove trailing whitespace]
    Signed-off-by: Sungbo Eo <mans0n@gorani.run>

commit 91e37b6
Author: Sungbo Eo <mans0n@gorani.run>
Date:   Sun Dec 12 20:25:56 2021 +0900

    ramips: mt76x8: tidy up 02_network

    * fix alphabetic sorting
    * consolidate duplicate cases

    Signed-off-by: Sungbo Eo <mans0n@gorani.run>

commit 446da70
Author: Sungbo Eo <mans0n@gorani.run>
Date:   Sun Dec 5 02:08:48 2021 +0900

    build: image: improve zip build recipe

    * clean before build
    * specify executable path
    * allow adding extra options for zip
    * use basename of $@

    Signed-off-by: Sungbo Eo <mans0n@gorani.run>

commit 3b20eb1
Author: Felix Fietkau <nbd@nbd.name>
Date:   Tue Nov 30 11:37:15 2021 +0100

    kernel: fix RCU issue in xt_FLOWOFFLOAD patch

    cond_resched() may not be called in a rcu-locked section

    Signed-off-by: Felix Fietkau <nbd@nbd.name>

commit 56b14fd
Author: Daniel Golle <daniel@makrotopia.org>
Date:   Sat Dec 11 03:16:16 2021 +0000

    procd: update to git HEAD

     bb95fe8 jail: make sure jailed process is terminated

    Signed-off-by: Daniel Golle <daniel@makrotopia.org>

commit b2aca5a
Author: Christian Lamparter <chunkeey@gmail.com>
Date:   Sat Dec 11 00:09:13 2021 +0100

    ath79: fix various dts warnings

    ar9344_openmesh_mr600-v1.dts:40.10-44.5: Warning (gpios_property):
    /leds-ath9k/wifi2g: Missing property '#gpio-cells' in node
    /ahb/pcie-controller@180c0000/wifi@0,0 or bad phandle
    => added gpio-controller + #gpio-cells

    qca955x_zyxel_nbg6x16.dtsi:121.3-13: Warning (reg_format):
    /ahb/usb@1b000000/port@1:reg: property has invalid length (4 bytes)
    (#address-cells == 2, #size-cells == 1)
    ../dts/qca955x_zyxel_nbg6x16.dtsi:131.3-13: Warning (reg_format):
    /ahb/usb@1b400000/port@1:reg: property has invalid length (4 bytes)
    (#address-cells == 2, #size-cells == 1)
    qca955x_zyxel_nbg6x16.dtsi:120.20-123.4: Warning (avoid_default_addr_size):
    /ahb/usb@1b000000/port@1: Relying on default #address-cells value
    => ath79's usb-nodes are missing the address- and size-cells properties.
    These are needed for usb led trigger support.

    ar7242_ubnt_sw.dtsi:54.4-14: Warning (reg_format): /gpio_spi/gpio_spi@0:reg:
    property has invalid length (4 bytes) (#address-cells == 1, #size-cells == 1)
    => the #address-cells and #size-cells had to be nudged.

    qca9531_dlink_dch-g020-a1.dts:19.6-39.4: Warning (i2c_bus_bridge):
    /i2c: incorrect #size-cells for I2C bus
    => #size-cells = <0>;

    Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

commit 03c0049
Author: Janpieter Sollie <janpieter.sollie@edpnet.be>
Date:   Thu Dec 9 13:27:49 2021 +0100

    rtl8812au-ct: update driver to be ready for 5.15

    update rtl8812au-ct driver to be ready for 5.15 Linux.

    Signed-off-by: Janpieter Sollie <janpieter.sollie@edpnet.be>
    [added commit message from PR with changes, added tag to subject]
    Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

commit 7061d5f
Author: Joel Linn <jl@conductive.de>
Date:   Wed Dec 8 11:07:50 2021 +0100

    lantiq: fixed wifi support for AVM FRITZ!Box 7430

    adds the correct offset for the calibration data.
    The values are according to the OpenWrt Forum Thread:
    "Fritzbox 7430 and wifi".

    Link: <https://forum.openwrt.org/t/fritzbox-7430-and-wifi/86944>
    Reported-by: RENErica
    Signed-off-by: Joel Linn <jl@conductive.de>
    [changed commit message]
    Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

commit 35aecc9
Author: Ryan Mounce <ryan@mounce.com.au>
Date:   Tue Nov 16 21:55:19 2021 +1030

    ath79: add support for WD My Net N600

    SoC: AR9344
    RAM: 128MB
    Flash: 16MiB SPI NOR
    5GHz WiFi: AR9382 PCIe 2x2:2 802.11n
    2.4GHz WiFi: AR9344 (SoC) AHB 2x2:2 802.11n

    5x Fast ethernet via SoC switch (green LEDs)
    1x USB 2.0
    4x front LEDs from SoC GPIO
    1x front WPS button from SoC GPIO
    1x bottom reset button from SoC GPIO

    UART header JP1, 115200 no parity 1 stop
    TX
    GND
    VCC
    (N/P)
    RX

    Flash factory image via "emergency room" recovery:
    - Configure your computer with a static IP 192.168.1.123/24
    - Connect to LAN port on the N600 switch
    - Hold reset putton
    - Power on, holding reset until the power LED blinks slowly
    - Visit http://192.168.1.1/ and upload OpenWrt factory image
    - Wait at least 5 minutes for flashing, reboot and key generation
    - Visit http://192.168.1.1/ (OpenWrt LuCI) and upload OpenWrt sysupgrade image

    Signed-off-by: Ryan Mounce <ryan@mounce.com.au>
    [dt leds preparations]
    Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

commit 7853453
Author: Olivier Valentin <valentio@free.fr>
Date:   Thu Dec 2 17:05:18 2021 +0100

    ath79: add support for jjPlus JWAP230

    The jjPlus JWAP230 is an access point board built around the QCA9558,
    with built-in 2.4GHz 3x3 N WiFi (28dBm). It can be expanded with 2
    mini-PCIe boards, and has an USB2 root port.

    Specifications:
    - SOC: Qualcomm Atheros QCA9558
    - CPU: 720MHz
    - H/W switch: QCA8327 rev 2
    - Flash: 16 MiB SPI NOR (en25qh128)
    - RAM: 128 MiB DDR2
    - WLAN: AR9550 built-in SoC bgn 3T3R (ath9k)
    - PCI: 2x mini-PCIe (optional 5V)
    - LEDs: 6x LEDs (3 are currently available)
    - Button: 1x Reset (not yet defined)
    - USB2:
      - 1x Type A root port
      - 1x combined mini-PCIe
    - Ethernet:
      - 2x 10/100/1000 (1x PoE 802.3af (36-57 V))

    Notes:
     The device used to be supported in the ar71xx target.
     For upgrades: Please use "sysupgrade --force -n <image>".
     This will restore the device back to OpenWrt defaults!

    MAC address assignment:
        use   source
        LAN   art 0x0
        WAN   art 0x6
        WLAN  art 0x1002 (as part of the calibration data)

    Flash instructions:
    - install from u-boot with tftp (requires serial access)
      > setenv ipaddr a.b.c.d
      > setenv serverip e.f.g.h
      > tftp 0x80060000 \
          openwrt-ath79-generic-jjplus_jwap230-squashfs-sysupgrade.bin
      > erase 0x9f050000 +${filesize}
      > cp.b $fileaddr 0x9f050000 $filesize
      > setenv bootcmd bootm 0x9f050000
      > saveenv

    Signed-off-by: Olivier Valentin <valentio@free.fr>
    [Added DT-Leds (based on ar71xx), Added more notes about sysupgrade,
    fixed "qca9550" to match SoC in commit and dts file name]
    Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

commit 4deaeaa
Author: Christian Lamparter <chunkeey@gmail.com>
Date:   Sat Dec 4 21:52:22 2021 +0100

    x86: remove old lzma tuning patch

    Chen Minqiang reported in his GitHub PR openwrt#4733 that:
    With CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA=y option set,
    the popular x86/amd64 target's initramfs-kernel failed to boot.

    The cause for this boot failure is that the LZMA compression
    uses a the first bytes to encode the compression parameters.
    It does not have a fixed magic. Yes, this only works if the
    the existing lzma options in the upstream are not changed.

    This patch does away with OpenWrt special LZMA options tuning
    since it is rather unlikely that upstream will improve the
    compression algorithm detection after all this time. Even
    though, the tuning produced a smaller initramfs (~1.1% in a
    spot check).

    Link: <openwrt#4733>
    Reported-by: Chen Minqiang <ptpt52@gmail.com>
    Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

commit ffab23d
Author: Stan Grishin <stangri@melmac.ca>
Date:   Sun Dec 5 22:32:04 2021 +0000

    x86: add/improve support for Sophos SG/XG products

    * Better product ID for Sophos SG/XG-105 models
    * Add support for Sophos SG/XG-135 r1, r2 with/without wireless

    Signed-off-by: Stan Grishin <stangri@melmac.ca>
    [Changed subject to x86 - probably eaten somewhere, the PR had it]
    Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

commit 1c4b3ce
Author: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date:   Sun Oct 17 13:29:57 2021 +0200

    kernel: add more disabled config options

    NET_DSA_MSCC_FELIX:

    Marvell 88E6xxx Ethernet switch fabric support (NET_DSA_MV88E6XXX) [N/m/y/?] n
    Ocelot / Felix Ethernet switch support (NET_DSA_MSCC_FELIX) [N/m/y/?] (NEW)
    Error in reading or end of file.

    make[6]: *** [scripts/kconfig/Makefile:71: syncconfig] Error 1
    make[5]: *** [Makefile:603: syncconfig] Error 2

    IR_IMON_RAW:
        SoundGraph iMON Receiver (early raw IR models) (IR_IMON_RAW) [N/m/?] (NEW)

    Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
    [squashed with "kernel: add missing IR_IMON_RAW config symbol"]
    Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

commit ea49690
Author: Felix Fietkau <nbd@nbd.name>
Date:   Fri Dec 10 11:30:40 2021 +0100

    hostapd: add support for specifying the FILS DHCP server

    The 'fils_dhcp' option can be set to '*' in order to autodetect the DHCP server
    For proto=dhcp networks, the discovered dhcp server will be used
    For all other networks, udhcpc is called to discover the address

    Signed-off-by: Felix Fietkau <nbd@nbd.name>

commit baba2fd
Author: Felix Fietkau <nbd@nbd.name>
Date:   Fri Dec 10 10:16:18 2021 +0100

    netifd: on dhcp interfaces, store the dhcp server in interface data

    Among other things, this can be used to auto-configure the DHCP server
    address for wireless APs using FILS, if the bridged interface is
    configured to DHCP

    Signed-off-by: Felix Fietkau <nbd@nbd.name>

commit b7d9bce
Author: Felix Fietkau <nbd@nbd.name>
Date:   Tue Dec 7 14:47:40 2021 +0100

    hostapd: add support for enabling FILS on AP and client interfaces

    This is only supported with WPA-enterprise

    Signed-off-by: Felix Fietkau <nbd@nbd.name>

commit 5b66dfa
Author: Felix Fietkau <nbd@nbd.name>
Date:   Tue Dec 7 11:06:16 2021 +0100

    hostapd: enable FILS support in the full config and add build feature discovery

    Signed-off-by: Felix Fietkau <nbd@nbd.name>

commit 8261b85
Author: Sergey V. Lobanov <sergey@lobanov.in>
Date:   Thu Dec 2 19:02:23 2021 +0300

    tools/mkimage: fix build on MacOS arm64

    Fixed -no-pie compilation warning on MacOS
    Fixed errors related to using absolute addressing on MacOS arm64

    Based on upstream patch from Jessica Clarke and suggestions from Ronny Kotzschmar

    Link to original patch and discussion:
    u-boot/u-boot@3b14204

    Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
  • Loading branch information
haotiangood committed Dec 19, 2021
1 parent 2673343 commit 671fd5a
Show file tree
Hide file tree
Showing 354 changed files with 16,837 additions and 12,287 deletions.
8 changes: 5 additions & 3 deletions include/image-commands.mk
Original file line number Diff line number Diff line change
Expand Up @@ -524,12 +524,14 @@ define Build/xor-image
endef

define Build/zip
rm -rf $@.tmp
mkdir $@.tmp
mv $@ $@.tmp/$(1)
mv $@ $@.tmp/$(word 1,$(1))

zip -j -X \
$(STAGING_DIR_HOST)/bin/zip -j -X \
$(if $(SOURCE_DATE_EPOCH),--mtime="$(SOURCE_DATE_EPOCH)") \
$@ $@.tmp/$(if $(1),$(1),$@)
$(wordlist 2,$(words $(1)),$(1)) \
$@ $@.tmp/$(if $(word 1,$(1)),$(word 1,$(1)),$$(basename $@))
rm -rf $@.tmp
endef

Expand Down
9 changes: 5 additions & 4 deletions include/kernel-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif

LINUX_VERSION-5.4 = .162
LINUX_VERSION-5.10 = .82
LINUX_VERSION-5.4 = .167
LINUX_VERSION-5.10 = .87

LINUX_KERNEL_HASH-5.4.167 = b4e43116217ee02009aba7eab3081e64560b81ce42bc6096fcd81257f470a5a7
LINUX_KERNEL_HASH-5.10.87 = 03128b70f3063433cfab4ff4c7da288d7c045fe1eafa2a59081df4032fece64b

LINUX_KERNEL_HASH-5.4.162 = c12d72ddaac78189305a5e98825295ecb02282970033b052276035e83189e25b
LINUX_KERNEL_HASH-5.10.82 = d66f7c7eed02f84ae550b3c91a26c70eea13682a6d672432f07bce66ff8ce350
LINUX_VERSION-5.13 = .19
LINUX_KERNEL_HASH-5.13.19 = e877ec724e917c967603225c7e5dc21b6e0f34998c7d086cab8c50324363ab7b

Expand Down
12 changes: 6 additions & 6 deletions package/boot/tfa-layerscape/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=tfa-layerscape
PKG_VERSION:=LSDK-20.12
PKG_VERSION:=LSDK-21.08
PKG_RELEASE:=$(AUTORELEASE)

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/atf
PKG_SOURCE_VERSION:=LSDK-20.12
PKG_MIRROR_HASH:=8e3a0bd33c00657beeb2df88a881b1831aeb790751cacd4c4fdf33ffa01e956e
PKG_SOURCE_VERSION:=LSDK-21.08
PKG_MIRROR_HASH:=500da1f5743255b2c301b89fba4df31d05a7dfbc731fbf137a88caf86f5568d0
PKG_BUILD_DEPENDS:=tfa-layerscape/host

include $(INCLUDE_DIR)/host-build.mk
Expand All @@ -27,14 +27,14 @@ define Host/Compile
CFLAGS="$(HOST_CFLAGS)" \
LDFLAGS="$(HOST_LDFLAGS)"
$(MAKE) -C \
$(HOST_BUILD_DIR)/plat/nxp/tools \
$(HOST_BUILD_DIR)/tools/nxp \
CFLAGS="$(HOST_CFLAGS)"
endef

define Host/Install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/fiptool/fiptool $(STAGING_DIR_HOST)/bin/fiptool-layerscape
$(INSTALL_BIN) $(HOST_BUILD_DIR)/plat/nxp/tools/create_pbl $(STAGING_DIR_HOST)/bin/tfa-create-pbl
$(INSTALL_BIN) $(HOST_BUILD_DIR)/plat/nxp/tools/byte_swap $(STAGING_DIR_HOST)/bin/tfa-byte-swap
$(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/create_pbl $(STAGING_DIR_HOST)/bin/tfa-create-pbl
$(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/byte_swap $(STAGING_DIR_HOST)/bin/tfa-byte-swap
endef

define Package/tfa-generic
Expand Down
Original file line number Diff line number Diff line change
@@ -1,32 +1,45 @@
--- a/Makefile
+++ b/Makefile
@@ -448,10 +448,6 @@ endif
CRTTOOLPATH ?= tools/cert_create
CRTTOOL ?= ${CRTTOOLPATH}/cert_create${BIN_EXT}
@@ -801,10 +801,6 @@ CRTTOOL ?= ${CRTTOOLPATH}/cert_create$
ENCTOOLPATH ?= tools/encrypt_fw
ENCTOOL ?= ${ENCTOOLPATH}/encrypt_fw${BIN_EXT}

-# Variables for use with Firmware Image Package
-FIPTOOLPATH ?= tools/fiptool
-FIPTOOL ?= ${FIPTOOLPATH}/fiptool${BIN_EXT}
-
################################################################################
# Include BL specific makefiles
################################################################################
@@ -661,14 +657,12 @@ endif
# Variables for use with sptool
SPTOOLPATH ?= tools/sptool
SPTOOL ?= ${SPTOOLPATH}/sptool${BIN_EXT}
@@ -1160,13 +1156,6 @@ endif
clean:
@echo " CLEAN"
$(call SHELL_REMOVE_DIR,${BUILD_PLAT})
-ifdef UNIX_MK
- ${Q}${MAKE} --no-print-directory -C ${FIPTOOLPATH} clean
-else
-# Clear the MAKEFLAGS as we do not want
-# to pass the gnumake flags to nmake.
- ${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL)) clean
-endif
${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean

realclean distclean:
${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} clean
${Q}${MAKE} --no-print-directory -C ${ROMLIBPATH} clean
@@ -1175,13 +1164,6 @@ realclean distclean:
@echo " REALCLEAN"
$(call SHELL_REMOVE_DIR,${BUILD_BASE})
$(call SHELL_DELETE_ALL, ${CURDIR}/cscope.*)
-ifdef UNIX_MK
- ${Q}${MAKE} --no-print-directory -C ${FIPTOOLPATH} clean
-else
-# Clear the MAKEFLAGS as we do not want
-# to pass the gnumake flags to nmake.
- ${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL)) realclean
-endif
${Q}${MAKE} --no-print-directory -C ${SPTOOLPATH} clean
${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean

checkcodebase: locate-checkpatch
@@ -717,7 +711,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} realclean
@@ -1238,7 +1220,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
@${ECHO_BLANK_LINE}
endif

Expand All @@ -35,7 +48,7 @@
${Q}${FIPTOOL} create ${FIP_ARGS} $@
${Q}${FIPTOOL} info $@
@${ECHO_BLANK_LINE}
@@ -733,21 +727,16 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT
@@ -1254,7 +1236,7 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT
@${ECHO_BLANK_LINE}
endif

Expand All @@ -44,26 +57,37 @@
${Q}${FIPTOOL} create ${FWU_FIP_ARGS} $@
${Q}${FIPTOOL} info $@
@${ECHO_BLANK_LINE}
@@ -1279,24 +1261,10 @@ ${BUILD_PLAT}/${DDR_FIP_NAME}: ${DDR_FIP
@echo "Built $@ successfully"
@${ECHO_BLANK_LINE}

-fiptool: ${FIPTOOL}
fip: ${BUILD_PLAT}/${FIP_NAME}
fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME}
fip_ddr: ${BUILD_PLAT}/${DDR_FIP_NAME}

-.PHONY: ${FIPTOOL}
-${FIPTOOL}:
- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${FIPTOOLPATH}
- @${ECHO_BLANK_LINE}
- @echo "Building $@"
-ifdef UNIX_MK
- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} --no-print-directory -C ${FIPTOOLPATH}
-else
-# Clear the MAKEFLAGS as we do not want
-# to pass the gnumake flags to nmake.
- ${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL))
-endif
- @${ECHO_BLANK_LINE}
-
cscope:
@echo " CSCOPE"
${Q}find ${CURDIR} -name "*.[chsS]" > cscope.files
sptool: ${SPTOOL}
.PHONY: ${SPTOOL}
${SPTOOL}:
--- a/tools/fiptool/Makefile
+++ b/tools/fiptool/Makefile
@@ -37,7 +37,7 @@ all: ${PROJECT} fip_create
@@ -38,7 +38,7 @@ all: ${PROJECT}

${PROJECT}: ${OBJECTS} Makefile
@echo " LD $@"
@echo " HOSTLD $@"
- ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
+ ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} $(LDFLAGS)
@${ECHO_BLANK_LINE}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
From 8a458876013991fe2f288bbe4694264b16c3b9e9 Mon Sep 17 00:00:00 2001
From: Biwen Li <biwen.li@nxp.com>
Date: Fri, 26 Jul 2019 15:44:10 +0800
Subject: [PATCH 3/3] plat/nxp/tools: fix create_pbl and byte_swap host build
Subject: [PATCH 3/3] tools/nxp: fix create_pbl and byte_swap host build

Not compile create_pbl and byte_swap in the process of cross compilation

Signed-off-by: Biwen Li <biwen.li@nxp.com>
---
plat/nxp/tools/pbl_ch2.mk | 3 ---
plat/nxp/tools/pbl_ch3.mk | 5 -----
tools/nxp/pbl_ch2.mk | 3 ---
tools/nxp/pbl_ch3.mk | 5 -----
2 files changed, 8 deletions(-)

--- a/plat/nxp/tools/pbl_ch2.mk
+++ b/plat/nxp/tools/pbl_ch2.mk
@@ -20,8 +20,6 @@ ifeq ($(RCW),"")
--- a/tools/nxp/pbl_ch2.mk
+++ b/tools/nxp/pbl_ch2.mk
@@ -19,8 +19,6 @@ ifeq ($(RCW),"")
else
# Generate header for bl2.bin
$(Q)$(CST_DIR)/create_hdr_isbc --in ${BUILD_PLAT}/bl2.bin --out ${BUILD_PLAT}/hdr_bl2 ${BL2_INPUT_FILE}
Expand All @@ -22,17 +22,17 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
# Add bl2.bin to RCW
${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE}\
-o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl ;\
@@ -43,7 +41,6 @@ ifeq ($(RCW),"")
@@ -42,7 +40,6 @@ ifeq ($(RCW),"")
${Q}echo "Platform ${PLAT} requires rcw file. Please set RCW to point to the right RCW file for boot mode ${BOOT_MODE}"
else
# -a option appends the image for Chassis 3 devices in case of non secure boot
- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${PLAT_TOOL_PATH};
${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE} \
-o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl ;
# Swapping of RCW is required for QSPi Chassis 2 devices
--- a/plat/nxp/tools/pbl_ch3.mk
+++ b/plat/nxp/tools/pbl_ch3.mk
@@ -27,9 +27,6 @@ else
--- a/tools/nxp/pbl_ch3.mk
+++ b/tools/nxp/pbl_ch3.mk
@@ -26,9 +26,6 @@ else
# Generate header for bl2.bin
$(Q)$(CST_DIR)/create_hdr_isbc --in ${BUILD_PLAT}/bl2.bin --out ${BUILD_PLAT}/hdr_bl2 ${BL2_INPUT_FILE}

Expand All @@ -42,7 +42,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
# Add Block Copy command for bl2.bin to RCW
${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE}\
-o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl -f ${BL2_SRC_OFFSET};\
@@ -57,8 +54,6 @@ else #SECURE_BOOT
@@ -56,8 +53,6 @@ else #SECURE_BOOT
ifeq ($(RCW),"")
${Q}echo "Platform ${PLAT} requires rcw file. Please set RCW to point to the right RCW file for boot mode ${BOOT_MODE}"
else
Expand Down
20 changes: 0 additions & 20 deletions package/boot/tfa-layerscape/patches/010-gcc11.patch

This file was deleted.

6 changes: 3 additions & 3 deletions package/boot/uboot-layerscape/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=uboot-layerscape
PKG_VERSION:=LSDK-20.04-update-290520
PKG_VERSION:=LSDK-21.08
PKG_RELEASE:=$(AUTORELEASE)

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot
PKG_SOURCE_VERSION:=1e55b2f9e7f56b76569089b9e950f49c1579580e
PKG_MIRROR_HASH:=46aace27e1367f40b424a64215d524a99c3bd62f49057550039e72d5a1ab7edb
PKG_SOURCE_VERSION:=LSDK-21.08
PKG_MIRROR_HASH:=874e871755ef84ebbf35cc247f0979ec18ed1946e4dca71006a83463b2899db1

include $(INCLUDE_DIR)/u-boot.mk
include $(INCLUDE_DIR)/package.mk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ qspi_boot=sf probe 0:0;sf read $loadaddr 1000000 2800000;bootm $loadaddr
bootargs=rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(pfe),2m(reserved-2),1m(dtb),-(firmware)
bootcmd=echo starting OpenWrt ...;pfe stop;run qspi_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
bootcmd=echo starting openwrt ...;pfe stop;run sd_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000
bootargs=root=/dev/mtdblock8 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(pfe),2m(reserved-2),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
bootcmd=echo starting openwrt ...;pfe stop;run qspi_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
bootcmd=echo starting openwrt ...;run sd_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
bootcmd=echo starting openwrt ...;run sd_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ nor_boot=cp.b 60f00000 $fdtaddr 100000;cp.b 61000000 $loadaddr 1000000;bootm $lo
bootargs=root=/dev/mtdblock6 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=60000000.nor:1m(rcw),2m(u-boot),1m(u-boot-env),11m(reserved-1),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware) cma=64M@0x0-0xb0000000
bootcmd=echo starting openwrt ...;run nor_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
bootcmd=echo starting openwrt ...;run sd_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ nor_boot=cp.b 60f00000 $fdtaddr 100000;cp.b 61000000 $loadaddr 1000000;bootm $lo
bootargs=root=/dev/mtdblock8 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=60000000.nor:1m(bl2),4m(fip),1m(u-boot-env),3m(reserved-1),256k(fman),5888k(reserved-2),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
bootcmd=echo starting openwrt ...;run nor_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ sd_boot=ext4load mmc 0:1 ${loadaddr} fitImage;bootm ${loadaddr}
bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
bootcmd=echo starting openwrt ...;run sd_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000
bootargs=root=/dev/mtdblock9 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi:1m(bl2),4m(fip),1m(u-boot-env),3m(reserved-1),256k(fman),5888k(reserved-2),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
bootcmd=echo starting openwrt ...;run qspi_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
bootcmd=echo starting openwrt ...;run sd_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000
bootargs=root=/dev/mtdblock9 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi-0:1m(bl2),4m(fip),1m(u-boot-env),3m(reserved-1),256k(fman),5888k(reserved-2),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
bootcmd=echo starting openwrt ...;run qspi_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
bootcmd=echo starting openwrt ...;run mc_init;run sd_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000
bootargs=root=/dev/mtdblock10 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=20c0000.spi-0:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(mc),1m(dpl),1m(dpc),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
bootcmd=echo starting openwrt ...;run mc_init;run qspi_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ nor_boot=cp.b 580f00000 $fdtaddr 100000;cp.b 581000000 $loadaddr 1000000;bootm $
bootargs=root=/dev/mtdblock9 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS1,115200 mtdparts=580000000.nor:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(mc),1m(dpl),1m(dpc),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
bootcmd=echo starting openwrt ...;run mc_init;run nor_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ sd_boot=ext4load mmc 0:1 ${loadaddr} fitImage;bootm ${loadaddr}
bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=pl011,mmio32,0x21c0000 console=ttyAMA0,115200
bootcmd=echo starting openwrt ...;run mc_init;run sd_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ xspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000
bootargs=root=/dev/mtdblock9 rootfstype=squashfs,jffs2 noinitrd earlycon=pl011,mmio32,0x21c0000 console=ttyAMA0,115200 mtdparts=20c0000.spi-0:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(mc),1m(dpl),1m(dpc),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
bootcmd=echo starting openwrt ...;run mc_init;run xspi_boot
bootdelay=3
fsl_bootcmd_mcinitcmd_set=y
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 089b90b11008ec95a56da12e31d11e3f31a9bb26 Mon Sep 17 00:00:00 2001
From: Martin Schiller <ms@dev.tdt.de>
Date: Wed, 17 Nov 2021 07:29:55 +0100
Subject: [PATCH] board: ls1046ardb: force PCI device enumeration

Commit 045ecf899252 ("configs: enable DM_ETH support for LS1046ARDB")
resulted in the PCI bus no longer being implicitly enumerated.

However, this is necessary for the fdt pcie fixups to work.

Therefore, similar to commit 8b6558bd4187 ("board: ls1088ardb:
transition to DM_ETH"), pci_init() is now called in the board_init()
routine when CONFIG_DM_ETH is active.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
CC: Priyanka Jain <priyanka.jain@nxp.com>
---
board/freescale/ls1046ardb/ls1046ardb.c | 4 ++++
1 file changed, 4 insertions(+)

--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -88,6 +88,10 @@ int board_init(void)
ppa_init();
#endif

+#if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH)
+ pci_init();
+#endif
+
/* invert AQR105 IRQ pins polarity */
out_be32(&scfg->intpcr, AQR105_IRQ_MASK);

0 comments on commit 671fd5a

Please sign in to comment.