Skip to content

Commit 30672d2

Browse files
igorpecovnikigorpecovnik
committed
bcm2711: bump kernels — legacy 6.18, current 7.0, edge 7.1
Shift the bcm2711 (Raspberry Pi 4 / CM4) family up one cycle: legacy 6.12 -> 6.18 current 6.18 -> 7.0 edge 7.0 -> 7.1 All three rpi-*.y branches exist on raspberrypi/linux. KERNELSOURCE unchanged. Regenerated the legacy/current/edge defconfigs for the new kernel versions. Signed-off-by: Igor Pecovnik <igor@armbian.com>
1 parent e4a7580 commit 30672d2

4 files changed

Lines changed: 47 additions & 102 deletions

File tree

‎config/kernel/linux-bcm2711-current.config‎

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Armbian defconfig generated with 6.18
1+
# Armbian defconfig generated with 7.0
22
# CONFIG_LOCALVERSION_AUTO is not set
33
CONFIG_SYSVIPC=y
44
CONFIG_POSIX_MQUEUE=y
@@ -845,7 +845,6 @@ CONFIG_BRCM_CHAR_DRIVERS=y
845845
CONFIG_BCM_VCIO=y
846846
# CONFIG_LEGACY_PTYS is not set
847847
CONFIG_SERIAL_8250=y
848-
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
849848
CONFIG_SERIAL_8250_CONSOLE=y
850849
CONFIG_SERIAL_8250_NR_UARTS=1
851850
CONFIG_SERIAL_8250_RUNTIME_UARTS=0
@@ -873,7 +872,6 @@ CONFIG_I2C_BCM2708=m
873872
CONFIG_I2C_BCM2835=m
874873
CONFIG_I2C_BRCMSTB=m
875874
CONFIG_I2C_DESIGNWARE_CORE=m
876-
CONFIG_I2C_DESIGNWARE_SLAVE=y
877875
CONFIG_I2C_GPIO=m
878876
CONFIG_I2C_CP2615=m
879877
CONFIG_I2C_ROBOTFUZZ_OSIF=m
@@ -1268,6 +1266,7 @@ CONFIG_I2C_SI4713=m
12681266
CONFIG_V4L_PLATFORM_DRIVERS=y
12691267
CONFIG_VIDEO_MUX=m
12701268
CONFIG_VIDEO_BCM2835_UNICAM=m
1269+
CONFIG_VIDEO_ISP_BCM2835=m
12711270
CONFIG_VIDEO_RASPBERRYPI_PISP_BE=m
12721271
CONFIG_VIDEO_RP1_CFE=m
12731272
CONFIG_V4L_TEST_DRIVERS=y
@@ -1339,7 +1338,20 @@ CONFIG_AUXDISPLAY=y
13391338
CONFIG_HD44780=m
13401339
CONFIG_DRM=m
13411340
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
1342-
CONFIG_DRM_UDL=m
1341+
CONFIG_DRM_CHIPONE_ICN6211=m
1342+
CONFIG_DRM_DISPLAY_CONNECTOR=m
1343+
CONFIG_DRM_ITE_IT6505=m
1344+
CONFIG_DRM_LONTIUM_LT8912B=m
1345+
CONFIG_DRM_LONTIUM_LT9211=m
1346+
CONFIG_DRM_LONTIUM_LT9611UXC=m
1347+
CONFIG_DRM_ITE_IT66121=m
1348+
CONFIG_DRM_SIMPLE_BRIDGE=m
1349+
CONFIG_DRM_TOSHIBA_TC358762=m
1350+
CONFIG_DRM_TI_DLPC3433=m
1351+
CONFIG_DRM_TI_SN65DSI83=m
1352+
CONFIG_DRM_ANALOGIX_ANX7625=m
1353+
CONFIG_DRM_GUD=m
1354+
CONFIG_DRM_LOGICVC=m
13431355
CONFIG_DRM_PANEL_ABT_Y030XX067A=m
13441356
CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0=m
13451357
CONFIG_DRM_PANEL_EBBG_FT8719=m
@@ -1366,32 +1378,19 @@ CONFIG_DRM_PANEL_SIMPLE=m
13661378
CONFIG_DRM_PANEL_TDO_TL070WSH30=m
13671379
CONFIG_DRM_PANEL_TPO_Y17P=m
13681380
CONFIG_DRM_PANEL_WAVESHARE_TOUCHSCREEN=m
1369-
CONFIG_DRM_CHIPONE_ICN6211=m
1370-
CONFIG_DRM_DISPLAY_CONNECTOR=m
1371-
CONFIG_DRM_ITE_IT6505=m
1372-
CONFIG_DRM_LONTIUM_LT8912B=m
1373-
CONFIG_DRM_LONTIUM_LT9211=m
1374-
CONFIG_DRM_LONTIUM_LT9611UXC=m
1375-
CONFIG_DRM_ITE_IT66121=m
1376-
CONFIG_DRM_SIMPLE_BRIDGE=m
1377-
CONFIG_DRM_TOSHIBA_TC358762=m
1378-
CONFIG_DRM_TI_DLPC3433=m
1379-
CONFIG_DRM_TI_SN65DSI83=m
1380-
CONFIG_DRM_ANALOGIX_ANX7625=m
1381-
CONFIG_DRM_V3D=m
1382-
CONFIG_DRM_VC4=m
1383-
CONFIG_DRM_VC4_HDMI_CEC=y
13841381
CONFIG_DRM_RP1_DSI=m
13851382
CONFIG_DRM_RP1_DPI=m
13861383
CONFIG_DRM_RP1_VEC=m
1387-
CONFIG_DRM_LOGICVC=m
13881384
CONFIG_DRM_PANEL_MIPI_DBI=m
13891385
CONFIG_TINYDRM_HX8357D=m
13901386
CONFIG_TINYDRM_ILI9225=m
13911387
CONFIG_TINYDRM_ILI9341=m
13921388
CONFIG_TINYDRM_MI0283QT=m
13931389
CONFIG_TINYDRM_REPAPER=m
1394-
CONFIG_DRM_GUD=m
1390+
CONFIG_DRM_UDL=m
1391+
CONFIG_DRM_V3D=m
1392+
CONFIG_DRM_VC4=m
1393+
CONFIG_DRM_VC4_HDMI_CEC=y
13951394
CONFIG_FB=y
13961395
CONFIG_FB_BCM2708=y
13971396
CONFIG_FB_UDL=m
@@ -1405,8 +1404,6 @@ CONFIG_BACKLIGHT_LM3630A=m
14051404
CONFIG_BACKLIGHT_GPIO=m
14061405
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
14071406
CONFIG_LOGO=y
1408-
# CONFIG_LOGO_LINUX_MONO is not set
1409-
# CONFIG_LOGO_LINUX_VGA16 is not set
14101407
CONFIG_SOUND=y
14111408
CONFIG_SND=m
14121409
CONFIG_SND_OSSEMUL=y
@@ -1922,11 +1919,10 @@ CONFIG_MOST_COMPONENTS=m
19221919
CONFIG_MOST_NET=m
19231920
CONFIG_MOST_VIDEO=m
19241921
CONFIG_MOST_DIM2=m
1925-
CONFIG_BCM2835_VCHIQ=y
19261922
CONFIG_SND_BCM2835=m
19271923
CONFIG_VIDEO_BCM2835=m
19281924
CONFIG_VIDEO_CODEC_BCM2835=m
1929-
CONFIG_VIDEO_ISP_BCM2835=m
1925+
CONFIG_BCM2835_VCHIQ=y
19301926
CONFIG_COMMON_CLK_RP1_SDIO=m
19311927
CONFIG_CLK_RASPBERRYPI=y
19321928
CONFIG_MAILBOX=y
@@ -2263,7 +2259,6 @@ CONFIG_NFS_V2=m
22632259
CONFIG_NFS_V3_ACL=y
22642260
CONFIG_NFS_V4=m
22652261
CONFIG_NFS_SWAP=y
2266-
CONFIG_NFS_V4_1=y
22672262
CONFIG_NFS_V4_2=y
22682263
CONFIG_NFS_V4_1_MIGRATION=y
22692264
CONFIG_NFS_FSCACHE=y
@@ -2275,7 +2270,6 @@ CONFIG_NFSD_BLOCKLAYOUT=y
22752270
CONFIG_NFSD_SCSILAYOUT=y
22762271
CONFIG_NFSD_FLEXFILELAYOUT=y
22772272
CONFIG_NFSD_V4_SECURITY_LABEL=y
2278-
# CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set
22792273
CONFIG_SUNRPC_DEBUG=y
22802274
CONFIG_CEPH_FS=m
22812275
CONFIG_CEPH_FSCACHE=y
@@ -2378,9 +2372,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
23782372
CONFIG_CRYPTO_USER_API_SKCIPHER=m
23792373
CONFIG_CRYPTO_USER_API_RNG=m
23802374
CONFIG_CRYPTO_USER_API_AEAD=m
2381-
CONFIG_CRYPTO_NHPOLY1305_NEON=m
2382-
CONFIG_CRYPTO_POLYVAL_ARM64_CE=m
2383-
CONFIG_CRYPTO_AES_ARM64=m
23842375
CONFIG_CRYPTO_AES_ARM64_BS=m
23852376
CONFIG_CRYPTO_SM4_ARM64_CE_BLK=m
23862377
CONFIG_CRYPTO_SM4_ARM64_NEON_BLK=m
@@ -2408,7 +2399,6 @@ CONFIG_BLK_DEV_IO_TRACE=y
24082399
# CONFIG_UPROBE_EVENTS is not set
24092400
CONFIG_BPF_KPROBE_OVERRIDE=y
24102401
CONFIG_FUNCTION_ERROR_INJECTION=y
2411-
CONFIG_TEST_MIN_HEAP=m
24122402
CONFIG_TEST_XARRAY=m
24132403
CONFIG_TEST_BPF=m
24142404
CONFIG_TEST_MEMCAT_P=m

‎config/kernel/linux-bcm2711-edge.config‎

Lines changed: 2 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,8 +2207,6 @@ 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
22262211
CONFIG_PROC_KCORE=y
22272212
CONFIG_PROC_CHILDREN=y
@@ -2362,7 +2347,6 @@ CONFIG_CRYPTO_HCTR2=m
23622347
CONFIG_CRYPTO_CHACHA20POLY1305=m
23632348
CONFIG_CRYPTO_MD4=m
23642349
CONFIG_CRYPTO_SHA1=y
2365-
CONFIG_CRYPTO_SM3_GENERIC=m
23662350
CONFIG_CRYPTO_WP512=m
23672351
CONFIG_CRYPTO_XCBC=m
23682352
CONFIG_CRYPTO_DEFLATE=y

0 commit comments

Comments
 (0)