Skip to content

Commit c8f89dd

Browse files
EvilOlafigorpecovnik
authored andcommitted
Revert "bcm2711: bump kernels — legacy 6.18, current 7.0, edge 7.1"
This reverts commit 30672d2.
1 parent 67c98cc commit c8f89dd

4 files changed

Lines changed: 102 additions & 47 deletions

File tree

config/kernel/linux-bcm2711-current.config

Lines changed: 31 additions & 21 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 6.18
22
# CONFIG_LOCALVERSION_AUTO is not set
33
CONFIG_SYSVIPC=y
44
CONFIG_POSIX_MQUEUE=y
@@ -845,6 +845,7 @@ 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
848849
CONFIG_SERIAL_8250_CONSOLE=y
849850
CONFIG_SERIAL_8250_NR_UARTS=1
850851
CONFIG_SERIAL_8250_RUNTIME_UARTS=0
@@ -872,6 +873,7 @@ CONFIG_I2C_BCM2708=m
872873
CONFIG_I2C_BCM2835=m
873874
CONFIG_I2C_BRCMSTB=m
874875
CONFIG_I2C_DESIGNWARE_CORE=m
876+
CONFIG_I2C_DESIGNWARE_SLAVE=y
875877
CONFIG_I2C_GPIO=m
876878
CONFIG_I2C_CP2615=m
877879
CONFIG_I2C_ROBOTFUZZ_OSIF=m
@@ -1266,7 +1268,6 @@ CONFIG_I2C_SI4713=m
12661268
CONFIG_V4L_PLATFORM_DRIVERS=y
12671269
CONFIG_VIDEO_MUX=m
12681270
CONFIG_VIDEO_BCM2835_UNICAM=m
1269-
CONFIG_VIDEO_ISP_BCM2835=m
12701271
CONFIG_VIDEO_RASPBERRYPI_PISP_BE=m
12711272
CONFIG_VIDEO_RP1_CFE=m
12721273
CONFIG_V4L_TEST_DRIVERS=y
@@ -1338,20 +1339,7 @@ CONFIG_AUXDISPLAY=y
13381339
CONFIG_HD44780=m
13391340
CONFIG_DRM=m
13401341
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
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
1342+
CONFIG_DRM_UDL=m
13551343
CONFIG_DRM_PANEL_ABT_Y030XX067A=m
13561344
CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0=m
13571345
CONFIG_DRM_PANEL_EBBG_FT8719=m
@@ -1378,19 +1366,32 @@ CONFIG_DRM_PANEL_SIMPLE=m
13781366
CONFIG_DRM_PANEL_TDO_TL070WSH30=m
13791367
CONFIG_DRM_PANEL_TPO_Y17P=m
13801368
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
13811384
CONFIG_DRM_RP1_DSI=m
13821385
CONFIG_DRM_RP1_DPI=m
13831386
CONFIG_DRM_RP1_VEC=m
1387+
CONFIG_DRM_LOGICVC=m
13841388
CONFIG_DRM_PANEL_MIPI_DBI=m
13851389
CONFIG_TINYDRM_HX8357D=m
13861390
CONFIG_TINYDRM_ILI9225=m
13871391
CONFIG_TINYDRM_ILI9341=m
13881392
CONFIG_TINYDRM_MI0283QT=m
13891393
CONFIG_TINYDRM_REPAPER=m
1390-
CONFIG_DRM_UDL=m
1391-
CONFIG_DRM_V3D=m
1392-
CONFIG_DRM_VC4=m
1393-
CONFIG_DRM_VC4_HDMI_CEC=y
1394+
CONFIG_DRM_GUD=m
13941395
CONFIG_FB=y
13951396
CONFIG_FB_BCM2708=y
13961397
CONFIG_FB_UDL=m
@@ -1404,6 +1405,8 @@ CONFIG_BACKLIGHT_LM3630A=m
14041405
CONFIG_BACKLIGHT_GPIO=m
14051406
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
14061407
CONFIG_LOGO=y
1408+
# CONFIG_LOGO_LINUX_MONO is not set
1409+
# CONFIG_LOGO_LINUX_VGA16 is not set
14071410
CONFIG_SOUND=y
14081411
CONFIG_SND=m
14091412
CONFIG_SND_OSSEMUL=y
@@ -1919,10 +1922,11 @@ CONFIG_MOST_COMPONENTS=m
19191922
CONFIG_MOST_NET=m
19201923
CONFIG_MOST_VIDEO=m
19211924
CONFIG_MOST_DIM2=m
1925+
CONFIG_BCM2835_VCHIQ=y
19221926
CONFIG_SND_BCM2835=m
19231927
CONFIG_VIDEO_BCM2835=m
19241928
CONFIG_VIDEO_CODEC_BCM2835=m
1925-
CONFIG_BCM2835_VCHIQ=y
1929+
CONFIG_VIDEO_ISP_BCM2835=m
19261930
CONFIG_COMMON_CLK_RP1_SDIO=m
19271931
CONFIG_CLK_RASPBERRYPI=y
19281932
CONFIG_MAILBOX=y
@@ -2259,6 +2263,7 @@ CONFIG_NFS_V2=m
22592263
CONFIG_NFS_V3_ACL=y
22602264
CONFIG_NFS_V4=m
22612265
CONFIG_NFS_SWAP=y
2266+
CONFIG_NFS_V4_1=y
22622267
CONFIG_NFS_V4_2=y
22632268
CONFIG_NFS_V4_1_MIGRATION=y
22642269
CONFIG_NFS_FSCACHE=y
@@ -2270,6 +2275,7 @@ CONFIG_NFSD_BLOCKLAYOUT=y
22702275
CONFIG_NFSD_SCSILAYOUT=y
22712276
CONFIG_NFSD_FLEXFILELAYOUT=y
22722277
CONFIG_NFSD_V4_SECURITY_LABEL=y
2278+
# CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set
22732279
CONFIG_SUNRPC_DEBUG=y
22742280
CONFIG_CEPH_FS=m
22752281
CONFIG_CEPH_FSCACHE=y
@@ -2372,6 +2378,9 @@ CONFIG_CRYPTO_USER_API_HASH=m
23722378
CONFIG_CRYPTO_USER_API_SKCIPHER=m
23732379
CONFIG_CRYPTO_USER_API_RNG=m
23742380
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
23752384
CONFIG_CRYPTO_AES_ARM64_BS=m
23762385
CONFIG_CRYPTO_SM4_ARM64_CE_BLK=m
23772386
CONFIG_CRYPTO_SM4_ARM64_NEON_BLK=m
@@ -2399,6 +2408,7 @@ CONFIG_BLK_DEV_IO_TRACE=y
23992408
# CONFIG_UPROBE_EVENTS is not set
24002409
CONFIG_BPF_KPROBE_OVERRIDE=y
24012410
CONFIG_FUNCTION_ERROR_INJECTION=y
2411+
CONFIG_TEST_MIN_HEAP=m
24022412
CONFIG_TEST_XARRAY=m
24032413
CONFIG_TEST_BPF=m
24042414
CONFIG_TEST_MEMCAT_P=m

config/kernel/linux-bcm2711-edge.config

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Armbian defconfig generated with 7.1
1+
# Armbian defconfig generated with 7.0
22
# CONFIG_LOCALVERSION_AUTO is not set
33
CONFIG_SYSVIPC=y
44
CONFIG_POSIX_MQUEUE=y
@@ -145,6 +145,7 @@ 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
148149
CONFIG_IPV6_ROUTER_PREF=y
149150
CONFIG_IPV6_ROUTE_INFO=y
150151
CONFIG_INET6_AH=m
@@ -390,7 +391,7 @@ CONFIG_L2TP=m
390391
CONFIG_L2TP_V3=y
391392
CONFIG_L2TP_IP=m
392393
CONFIG_L2TP_ETH=m
393-
CONFIG_BRIDGE=y
394+
CONFIG_BRIDGE=m
394395
CONFIG_BRIDGE_VLAN_FILTERING=y
395396
CONFIG_VLAN_8021Q=m
396397
CONFIG_VLAN_8021Q_GVRP=y
@@ -467,6 +468,16 @@ CONFIG_MPLS_IPTUNNEL=m
467468
CONFIG_CGROUP_NET_PRIO=y
468469
CONFIG_BPF_STREAM_PARSER=y
469470
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
470481
CONFIG_CAN=m
471482
CONFIG_CAN_J1939=m
472483
CONFIG_CAN_ISOTP=m
@@ -1338,13 +1349,15 @@ CONFIG_DRM_SIMPLE_BRIDGE=m
13381349
CONFIG_DRM_TOSHIBA_TC358762=m
13391350
CONFIG_DRM_TI_DLPC3433=m
13401351
CONFIG_DRM_TI_SN65DSI83=m
1352+
CONFIG_DRM_ANALOGIX_ANX7625=m
13411353
CONFIG_DRM_GUD=m
13421354
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
13461358
CONFIG_DRM_PANEL_DSI_CM=m
13471359
CONFIG_DRM_PANEL_ILITEK_ILI9341=m
1360+
CONFIG_DRM_PANEL_ILITEK_ILI9806E=m
13481361
CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
13491362
CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
13501363
CONFIG_DRM_PANEL_JDI_LT070ME05000=m
@@ -2207,6 +2220,8 @@ CONFIG_MSDOS_FS=y
22072220
CONFIG_VFAT_FS=y
22082221
CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
22092222
CONFIG_EXFAT_FS=m
2223+
CONFIG_NTFS3_LZX_XPRESS=y
2224+
CONFIG_NTFS3_FS_POSIX_ACL=y
22102225
CONFIG_NTFS_FS=m
22112226
CONFIG_PROC_KCORE=y
22122227
CONFIG_PROC_CHILDREN=y
@@ -2347,6 +2362,7 @@ CONFIG_CRYPTO_HCTR2=m
23472362
CONFIG_CRYPTO_CHACHA20POLY1305=m
23482363
CONFIG_CRYPTO_MD4=m
23492364
CONFIG_CRYPTO_SHA1=y
2365+
CONFIG_CRYPTO_SM3_GENERIC=m
23502366
CONFIG_CRYPTO_WP512=m
23512367
CONFIG_CRYPTO_XCBC=m
23522368
CONFIG_CRYPTO_DEFLATE=y

0 commit comments

Comments
 (0)