Skip to content

[pull] master from coolsnowwolf:master - #1

Open
pull[bot] wants to merge 5656 commits into
mfblog:masterfrom
coolsnowwolf:master
Open

[pull] master from coolsnowwolf:master#1
pull[bot] wants to merge 5656 commits into
mfblog:masterfrom
coolsnowwolf:master

Conversation

@pull

@pull pull Bot commented Sep 28, 2020

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull Bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Sep 28, 2020
@coolsnowwolf
coolsnowwolf force-pushed the master branch 2 times, most recently from bd79a2b to bcad74f Compare December 30, 2021 16:37
@aiamadeus
aiamadeus force-pushed the master branch 2 times, most recently from 3526137 to 8845cb4 Compare July 10, 2022 07:51
@coolsnowwolf
coolsnowwolf force-pushed the master branch 3 times, most recently from b82c84a to c50a2c3 Compare July 11, 2022 08:42
@aiamadeus
aiamadeus force-pushed the master branch 4 times, most recently from 115d673 to b477a0b Compare September 1, 2022 04:06
@coolsnowwolf
coolsnowwolf force-pushed the master branch 3 times, most recently from 073fdc3 to 5d87cf5 Compare September 1, 2022 17:31
@aiamadeus
aiamadeus force-pushed the master branch 2 times, most recently from 420f56a to d91aa7c Compare September 12, 2022 16:19
@coolsnowwolf
coolsnowwolf force-pushed the master branch 2 times, most recently from a6eeaee to 4f056f8 Compare September 22, 2022 05:37
coolsnowwolf and others added 30 commits July 19, 2026 18:10
Release 2.11 has been quite a few new features
and fixes since the 2.10 release. Fixes: #14096

Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com>
Signed-off-by: Robert Marko <robimarko@gmail.com>
In tree ksmbd is available with 5.15 and is better updated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
68f382690bfa statefiles: escape client hostnames in the lease state file

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Switch the qualcommbe target to use kernel 6.18 and drop 6.12.

Kernel 6.18 for qualcommbe resolves some issues regarding
PCS support and reduces maintenance load maintaining two
kernel branches.

Signed-off-by: Kenneth Kasilag <kenneth@kasilag.me>
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
The upgrade to 2.5.0 accidentally dropped the CPP defines, so the
precompiled-active-filter option has been missing and the demand dialing
option in uci has been broken since then. Add the missing defines.

Fixes: 9cecf2b ("ppp: update to 2.5.0")
Signed-off-by: Qingfang Deng <dqfext@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Upstream moved the airoha ethernet driver into its own folder, so the
patches predating the move were retargeted to drivers/net/ethernet/airoha.

Manually rebased:
airoha/patches-6.12/016-v6.13-net-airoha-Fix-EGRESS_RATE_METER_EN_MASK-definition.patch
airoha/patches-6.12/031-02-v6.13-net-airoha-Simplify-Tx-napi-logic.patch
airoha/patches-6.12/036-v6.13-net-airoha-Fix-typo-in-REG_CDM2_FWD_CFG-configuratio.patch
airoha/patches-6.12/038-01-v6.14-net-airoha-Enable-Tx-drop-capability-for-each-Tx-DMA.patch
airoha/patches-6.12/038-04-v6.14-net-airoha-Add-sched-HTB-offload-support.patch
airoha/patches-6.12/039-v6.14-net-airoha-Enforce-ETS-Qdisc-priomap.patch
airoha/patches-6.12/046-v6.15-net-airoha-Fix-TSO-support-for-header-cloned-skbs.patch
airoha/patches-6.12/047-v6.13-net-airoha-Reset-BQL-stopping-the-netdevice.patch
bcm27xx/patches-6.12/950-0006-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch
bcm27xx/patches-6.12/950-0333-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
bcm27xx/patches-6.12/950-0334-usb-xhci-add-VLI_SS_BULK_OUT_BUG-quirk.patch
bcm27xx/patches-6.12/950-0335-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch

Removed upstreamed:
airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch
generic/backport-6.12/620-v6.15-ppp-use-IFF_NO_QUEUE-in-virtual-interfaces.patch

All other patches automatically rebased.
Added 100-gcc15-fix.patch which drops __DATE__/__TIME__ usage and provides
a stable fallback ("unknown"). This fixes build failures with GCC 15 and
-Werror=date-time in kernel builds.

Signed-off-by: John Audia <therealgraysky@proton.me>
[Removed "Replace printk with pr_* macros" patch]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Mario Andrés Pérez <mapb_@outlook.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Manually rebased:
generic/pending-6.12/804-nvmem-core-support-mac-base-fixed-layout-cells.patch
generic/pending-6.12/809-01-nvmem-core-generalize-mac-base-cells-handling.patch

Removed upstreamed:
generic/backport-6.12/429-01-v6.18-mtd-spinand-fix-direct-mapping-creation-sizes.patch
generic/backport-6.12/429-02-v6.18-mtd-spinand-try-a-regular-dirmap-if-creating-a-di.patch
generic/backport-6.12/429-03-v6.18-mtd-spinand-repeat-reading-in-regular-mode-if-con.patch

All other patches automatically rebased.
Use Rockchip's rkbin DDR loader for King3399 and package the board image with the corresponding miniloader, U-Boot, and trust image layout. This avoids the incompatible open-source LPDDR initialization profile that fails DRAM training on the board.
Enable CONFIG_NVMEM_BLOCK to support block devices in dts, used for
reading nvmem.

Signed-off-by: Andrew LaMarche <andrewjlamarche@gmail.com>
This commit adds support for Askey SBE1V1K.

Device specification
--------------------
SoC:		Qualcomm IPQ9570
RAM:		Micron (2GB)
Flash:		8GB eMMC
Ethernet:	1x 10G RTL8261BE
		1x 2.5G QCA8081
		2x 1G QCA8075
Wi-Fi:		QCN6214 2.4GHz 4x4
		QCN6274 5GHz 4x4
		QCN6274 6GHz 4x4
LEDs:		1 LED, power/status
Buttons:	1 reset
USB ports:	none
Bootloader:	U-Boot 1.0.9 [spf12.2_CSU2] (Jun 28 2024 - 17:47:10 +0000)

Installation (serial required):

**NOTE** This procedure requires glitching the eMMC. It is very possible
that you may damage or corrupt your bootloader in doing so. Proceed with
caution, and always make a full eMMC backup!

**NOTE** If the bootloader has trouble accessing eMMC due to glitching it, any
U-Boot env updates are written directly to the start of flash, overwriting
the bootloader. For this reason, it is strongly NOT recommended to make any
persistent U-Boot env changes from U-Boot itself; do this in Linux.

- Open the chasis and connect to the serial port.
- While booting, short eMMC CLK to UART VCC during FIT image load to enter
  U-Boot.
- setenv ipaddr 192.168.1.1
- setenv serverip 192.168.1.2
**NOTE** DO NOT SAVE THE ENV
- Set your PC IP address to 192.168.1.2 and host the initramfs on a tftp
  server.
- tftpboot 0x44000000 initramfs.itb
- bootm 0x44000000
If you get an error and it reboots, try loading to 0x80000000.

In the initramfs:
- fw_setenv bootargs 'console=ttyMSM0,115200n8 rootwait root=/dev/mmcblk0p27'
- fw_setenv bootcmd 'echo "Hit ctrl+c for shell..."; if sleep 3; then run do_boot; else do_nothing; fi;'
- fw_setenv do_boot 'mmc read 0x44000000 0x00014022 0x3800; bootm 0x44000000'
- Install a sysupgrade

U-Boot hardcodes the bootargs to reset on each boot, which is why it is
necessary for the bootcmd to override them. Thankfully, the vendor did
not bother to secure U-Boot any further. As long as the vendor software
does not boot, the U-Boot env will stay. If a vendor image boots, the
U-Boot env will revert to default. The vendor U-Boot also ignores
bootdelay, which is why we add a dummy sleep to allow the user time to
drop into a shell without needing to glitch any more.

Co-authored-by: Kenneth Kasilag <kenneth@kasilag.me>
Signed-off-by: Andrew LaMarche <andrewjlamarche@gmail.com>
Drop source-only from qualcommbe target as we have some supported
devices now.

Signed-off-by: Andrew LaMarche <andrewjlamarche@gmail.com>
Sync the qca-wireless source revision and add the Askey SBE1V1K QCN9274 board data from firmware_qca-wireless PR #123.

Signed-off-by: coolsnowwolf <coolsnowwolf@gmail.com>
Signed-off-by: coolsnowwolf <coolsnowwolf@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Development

Successfully merging this pull request may close these issues.