Skip to content

Commit 603aa92

Browse files
authored
rpi4b: bump *edge* to 7.1.y (#9982)
1 parent de8c77b commit 603aa92

2 files changed

Lines changed: 6 additions & 20 deletions

File tree

config/kernel/linux-bcm2711-edge.config

Lines changed: 4 additions & 18 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_SYSVIPC=y
44
CONFIG_POSIX_MQUEUE=y
@@ -145,7 +145,6 @@ CONFIG_TCP_CONG_ILLINOIS=m
145145
CONFIG_TCP_CONG_DCTCP=m
146146
CONFIG_TCP_CONG_CDG=m
147147
CONFIG_TCP_CONG_BBR=m
148-
CONFIG_IPV6=m
149148
CONFIG_IPV6_ROUTER_PREF=y
150149
CONFIG_IPV6_ROUTE_INFO=y
151150
CONFIG_INET6_AH=m
@@ -391,7 +390,7 @@ CONFIG_L2TP=m
391390
CONFIG_L2TP_V3=y
392391
CONFIG_L2TP_IP=m
393392
CONFIG_L2TP_ETH=m
394-
CONFIG_BRIDGE=m
393+
CONFIG_BRIDGE=y
395394
CONFIG_BRIDGE_VLAN_FILTERING=y
396395
CONFIG_VLAN_8021Q=m
397396
CONFIG_VLAN_8021Q_GVRP=y
@@ -468,16 +467,6 @@ CONFIG_MPLS_IPTUNNEL=m
468467
CONFIG_CGROUP_NET_PRIO=y
469468
CONFIG_BPF_STREAM_PARSER=y
470469
CONFIG_NET_PKTGEN=m
471-
CONFIG_HAMRADIO=y
472-
CONFIG_AX25=m
473-
CONFIG_NETROM=m
474-
CONFIG_ROSE=m
475-
CONFIG_MKISS=m
476-
CONFIG_6PACK=m
477-
CONFIG_BPQETHER=m
478-
CONFIG_BAYCOM_SER_FDX=m
479-
CONFIG_BAYCOM_SER_HDX=m
480-
CONFIG_YAM=m
481470
CONFIG_CAN=m
482471
CONFIG_CAN_J1939=m
483472
CONFIG_CAN_ISOTP=m
@@ -1349,15 +1338,13 @@ CONFIG_DRM_SIMPLE_BRIDGE=m
13491338
CONFIG_DRM_TOSHIBA_TC358762=m
13501339
CONFIG_DRM_TI_DLPC3433=m
13511340
CONFIG_DRM_TI_SN65DSI83=m
1352-
CONFIG_DRM_ANALOGIX_ANX7625=m
13531341
CONFIG_DRM_GUD=m
13541342
CONFIG_DRM_LOGICVC=m
13551343
CONFIG_DRM_PANEL_ABT_Y030XX067A=m
13561344
CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0=m
13571345
CONFIG_DRM_PANEL_EBBG_FT8719=m
13581346
CONFIG_DRM_PANEL_DSI_CM=m
13591347
CONFIG_DRM_PANEL_ILITEK_ILI9341=m
1360-
CONFIG_DRM_PANEL_ILITEK_ILI9806E=m
13611348
CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
13621349
CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
13631350
CONFIG_DRM_PANEL_JDI_LT070ME05000=m
@@ -2220,9 +2207,9 @@ CONFIG_MSDOS_FS=y
22202207
CONFIG_VFAT_FS=y
22212208
CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
22222209
CONFIG_EXFAT_FS=m
2223-
CONFIG_NTFS3_LZX_XPRESS=y
2224-
CONFIG_NTFS3_FS_POSIX_ACL=y
22252210
CONFIG_NTFS_FS=m
2211+
CONFIG_NTFS3_FS=m
2212+
CONFIG_NTFS3_LZX_XPRESS=y
22262213
CONFIG_PROC_KCORE=y
22272214
CONFIG_PROC_CHILDREN=y
22282215
CONFIG_TMPFS=y
@@ -2362,7 +2349,6 @@ CONFIG_CRYPTO_HCTR2=m
23622349
CONFIG_CRYPTO_CHACHA20POLY1305=m
23632350
CONFIG_CRYPTO_MD4=m
23642351
CONFIG_CRYPTO_SHA1=y
2365-
CONFIG_CRYPTO_SM3_GENERIC=m
23662352
CONFIG_CRYPTO_WP512=m
23672353
CONFIG_CRYPTO_XCBC=m
23682354
CONFIG_CRYPTO_DEFLATE=y

config/sources/families/bcm2711.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ case "${BRANCH}" in
3636

3737
edge)
3838
declare -g KERNELSOURCE='https://github.com/raspberrypi/linux'
39-
declare -g KERNEL_MAJOR_MINOR="7.0" # Major and minor versions of this kernel. For mainline caching.
40-
declare -g KERNELBRANCH="branch:rpi-7.0.y"
39+
declare -g KERNEL_MAJOR_MINOR="7.1" # Major and minor versions of this kernel. For mainline caching.
40+
declare -g KERNELBRANCH="branch:rpi-7.1.y"
4141
;;
4242
esac
4343

0 commit comments

Comments
 (0)