Skip to content

Commit adead19

Browse files
committed
rockchip: bump edge kernel to 7.1
1 parent bd0f719 commit adead19

166 files changed

Lines changed: 79272 additions & 11 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

config/kernel/linux-rockchip-edge.config

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Armbian defconfig generated with 7.0
1+
# Armbian defconfig generated with 7.1
22
# CONFIG_LOCALVERSION_AUTO is not set
33
CONFIG_DEFAULT_HOSTNAME="localhost"
44
CONFIG_SYSVIPC=y
@@ -392,8 +392,6 @@ CONFIG_RDS=m
392392
CONFIG_RDS_TCP=m
393393
CONFIG_TIPC=m
394394
CONFIG_ATM=m
395-
CONFIG_ATM_CLIP=m
396-
CONFIG_ATM_CLIP_NO_ICMP=y
397395
CONFIG_ATM_BR2684=m
398396
CONFIG_ATM_BR2684_IPFILTER=y
399397
CONFIG_L2TP=m
@@ -1488,7 +1486,6 @@ CONFIG_FSL_QDMA=m
14881486
CONFIG_PL330_DMA=y
14891487
CONFIG_DW_DMAC=m
14901488
CONFIG_SF_PDMA=m
1491-
CONFIG_DMABUF_MOVE_NOTIFY=y
14921489
CONFIG_DMABUF_SELFTESTS=m
14931490
CONFIG_DMABUF_HEAPS=y
14941491
CONFIG_DMABUF_HEAPS_SYSTEM=y
@@ -1662,8 +1659,6 @@ CONFIG_UDF_FS=m
16621659
CONFIG_MSDOS_FS=y
16631660
CONFIG_VFAT_FS=y
16641661
CONFIG_EXFAT_FS=m
1665-
CONFIG_NTFS3_LZX_XPRESS=y
1666-
CONFIG_NTFS3_FS_POSIX_ACL=y
16671662
CONFIG_NTFS_FS=m
16681663
CONFIG_TMPFS=y
16691664
CONFIG_TMPFS_POSIX_ACL=y
@@ -1748,19 +1743,15 @@ CONFIG_CRYPTO_AEGIS128=m
17481743
CONFIG_CRYPTO_ECHAINIV=y
17491744
CONFIG_CRYPTO_MD4=y
17501745
CONFIG_CRYPTO_MD5=y
1751-
CONFIG_CRYPTO_MICHAEL_MIC=y
17521746
CONFIG_CRYPTO_RMD160=m
17531747
CONFIG_CRYPTO_SHA1=y
1754-
CONFIG_CRYPTO_SM3_GENERIC=y
17551748
CONFIG_CRYPTO_WP512=m
17561749
CONFIG_CRYPTO_XCBC=m
17571750
CONFIG_CRYPTO_DEFLATE=y
17581751
CONFIG_CRYPTO_LZO=y
17591752
CONFIG_CRYPTO_842=m
17601753
CONFIG_CRYPTO_LZ4=m
17611754
CONFIG_CRYPTO_LZ4HC=m
1762-
CONFIG_CRYPTO_DRBG_HASH=y
1763-
CONFIG_CRYPTO_DRBG_CTR=y
17641755
CONFIG_CRYPTO_USER_API_HASH=m
17651756
CONFIG_CRYPTO_USER_API_SKCIPHER=m
17661757
CONFIG_CRYPTO_USER_API_RNG=m

config/sources/families/rockchip.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ case $BRANCH in
7878

7979
edge)
8080

81-
declare -g KERNEL_MAJOR_MINOR="7.0" # Major and minor versions of this kernel.
81+
declare -g KERNEL_MAJOR_MINOR="7.1" # Major and minor versions of this kernel.
8282
;;
8383

8484
esac
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
config:
2+
# Just some info stuff; not used by the patching scripts
3+
name: rockchip-7.1
4+
kind: kernel
5+
type: mainline # or: vendor
6+
branch: linux-7.1.y
7+
last-known-good-tag: v7.1-rc6
8+
maintainers:
9+
- { github: paolo.sabatino, name: Paolo Sabatino, email: paolo.sabatino@gmail.com, armbian-forum: jock }
10+
11+
# .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones.
12+
# This is meant to provide a way to "add a board DTS" without having to null-patch them in.
13+
dts-directories:
14+
- { source: "dt", target: "arch/arm/boot/dts/rockchip" }
15+
16+
# every file in these directories will be copied as-is to the build tree; later ones overwrite earlier ones
17+
# This is meant as a way to have overlays, bare, in a directory, without having to null-patch them in.
18+
# @TODO need a solution to auto-Makefile the overlays as well
19+
overlay-directories:
20+
- { source: "overlay", target: "arch/arm/boot/dts/rockchip/overlay" }
21+
22+
# the Makefile in each of these directories will be magically patched to include the dts files copied
23+
# or patched-in; overlay subdir will be included "-y" if it exists.
24+
# No more Makefile patching needed, yay!
25+
auto-patch-dt-makefile:
26+
- { directory: "arch/arm/boot/dts/rockchip", config-var: "CONFIG_ARCH_ROCKCHIP" }
27+
28+
# configuration for when applying patches to git / auto-rewriting patches (development cycle helpers)
29+
patches-to-git:
30+
do-not-commit-files:
31+
- "MAINTAINERS" # constant churn, drop them. sorry.
32+
- "Documentation/devicetree/bindings/arm/rockchip.yaml" # constant churn, conflicts on every bump, drop it. sorry.
33+
do-not-commit-regexes: # Python-style regexes
34+
- "^arch/([a-zA-Z0-9]+)/boot/dts/([a-zA-Z0-9]+)/Makefile$" # ignore DT Makefile patches, we've an auto-patcher now
35+
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Series from patches.armbian
2+
patches.armbian/bt-broadcom-serdev-workaround.patch
3+
patches.armbian/clk-rk322x-composite-mmc-clk.patch
4+
patches.armbian/driver-rk322x-audio-codec.patch
5+
patches.armbian/driver-rk3288-gpiomem.patch
6+
patches.armbian/driver-tinkerboard-alc4040-codec.patch
7+
patches.armbian/drm-fix-gem-memory-leak.patch
8+
patches.armbian/drm-rk322x-plane-overlay.patch
9+
patches.armbian/drm-rk322x-yuv-10bit-modes.patch
10+
patches.armbian/drm-rockchip-hardware-cursor.patch
11+
patches.armbian/dts-miqi-fan.patch
12+
patches.armbian/dts-miqi-hevc-rga.patch
13+
patches.armbian/dts-miqi-mali-gpu.patch
14+
patches.armbian/dts-miqi-regulator-fix.patch
15+
patches.armbian/dts-rk322x-iep-node.patch
16+
patches.armbian/dts-rk322x-pinctrl-nand.patch
17+
patches.armbian/dts-rk3288-disable-serial-dma.patch
18+
patches.armbian/dts-rk3288-fix-mmc-aliases.patch
19+
patches.armbian/dts-rk3288-gpu-500mhz-opp.patch
20+
patches.armbian/dts-rk3288-pinctrl-spi2.patch
21+
patches.armbian/dts-rk3288-thermal-rearrange-zones.patch
22+
patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch
23+
patches.armbian/dts-tinkerboard-bt-uart-pins.patch
24+
patches.armbian/dts-tinkerboard-hevc-rga.patch
25+
patches.armbian/dts-tinkerboard-sdio-wifi.patch
26+
patches.armbian/dts-tinkerboard-sdmmc-properties.patch
27+
patches.armbian/dts-tinkerboard-spi-interface.patch
28+
patches.armbian/dts-veyron-flag-cache-flush.patch
29+
patches.armbian/general-add-overlay-compilation-support.patch
30+
patches.armbian/general-add-overlay-configfs.patch
31+
patches.armbian/general-add-restart-handler-for-act8846.patch
32+
patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch
33+
patches.armbian/general-dwc2-fix-wait-peripheral.patch
34+
patches.armbian/general-dwc2-fix-wait-time.patch
35+
patches.armbian/general-dwc2-nak-gadget.patch
36+
patches.armbian/general-fix-reboot-from-kwiboo.patch
37+
patches.armbian/general-increase-spdif-dma-burst.patch
38+
patches.armbian/general-iommu-disable-dte-time.patch
39+
patches.armbian/general-linux-export-mm-trace-rss-stats.patch
40+
patches.armbian/general-pl330-01-fix-periodic-transfers.patch
41+
patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch
42+
patches.armbian/general-pl330-04-bigger-mcode-buffer.patch
43+
patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch
44+
patches.armbian/general-pl330-06-fix-buffer-underruns.patch
45+
patches.armbian/general-rk322x-gpio-ir-driver.patch
46+
patches.armbian/general-rockchip-various-fixes.patch
47+
patches.armbian/ir-keymap-rk322x-box.patch
48+
patches.armbian/ir-keymap-xt-q8l-v10.patch
49+
patches.armbian/misc-tinkerboard-spi-interface.patch
50+
patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch
51+
patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch
52+
patches.armbian/rk322x-dmc-driver-02-sip-constants.patch
53+
patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch
54+
patches.armbian/rk322x-dmc-driver-04-driver.patch
55+
patches.armbian/rk322x-dmc-driver-05-fix-dfi.patch
56+
patches.armbian/rk322x-dwc2-no-clock-gating.patch
57+
patches.armbian/rk322x-usb-reset-props.patch
58+
patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch
59+
patches.armbian/wifi-brcmfmac-add-bcm43342.patch
60+
patches.armbian/wifi-brcmfmac-ap6330-firmware.patch
61+
patches.armbian/wifi-driver-esp8089-01.patch
62+
patches.armbian/wifi-driver-esp8089-02.patch
63+
patches.armbian/wifi-driver-ssv6051.patch

0 commit comments

Comments
 (0)