Skip to content

Commit dc2343e

Browse files
pelwellpelwell
committed
configs: Regenerate the defconfigs
Signed-off-by: Phil Elwell <[email protected]>
1 parent 2278b14 commit dc2343e

File tree

6 files changed

+12
-20
lines changed

6 files changed

+12
-20
lines changed

‎arch/arm/configs/bcm2709_defconfig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ CONFIG_ARCH_BCM2835=y
3838
# CONFIG_CACHE_L2X0 is not set
3939
CONFIG_SMP=y
4040
CONFIG_VMSPLIT_2G=y
41-
# CONFIG_CPU_SW_DOMAIN_PAN is not set
4241
CONFIG_UACCESS_WITH_MEMCPY=y
4342
# CONFIG_ATAGS is not set
4443
CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
@@ -660,8 +659,7 @@ CONFIG_SERIAL_8250_BCM2835AUX=y
660659
CONFIG_SERIAL_OF_PLATFORM=y
661660
CONFIG_SERIAL_AMBA_PL011=y
662661
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
663-
CONFIG_SERIAL_SC16IS7XX=m
664-
CONFIG_SERIAL_SC16IS7XX_SPI=y
662+
CONFIG_SERIAL_SC16IS7XX_CORE=m
665663
CONFIG_SERIAL_DEV_BUS=y
666664
CONFIG_TTY_PRINTK=y
667665
CONFIG_HW_RANDOM=y
@@ -1338,7 +1336,6 @@ CONFIG_DMABUF_HEAPS_CMA=y
13381336
CONFIG_UIO=m
13391337
CONFIG_UIO_PDRV_GENIRQ=m
13401338
CONFIG_STAGING=y
1341-
CONFIG_PRISM2_USB=m
13421339
CONFIG_R8712U=m
13431340
CONFIG_VT6656=m
13441341
CONFIG_STAGING_MEDIA=y
@@ -1482,6 +1479,7 @@ CONFIG_PSTORE=y
14821479
CONFIG_PSTORE_CONSOLE=y
14831480
CONFIG_PSTORE_RAM=y
14841481
CONFIG_NFS_FS=y
1482+
CONFIG_NFS_V2=y
14851483
CONFIG_NFS_V3_ACL=y
14861484
CONFIG_NFS_V4=y
14871485
CONFIG_NFS_SWAP=y

‎arch/arm/configs/bcm2711_defconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -678,8 +678,7 @@ CONFIG_SERIAL_8250_BCM2835AUX=y
678678
CONFIG_SERIAL_OF_PLATFORM=y
679679
CONFIG_SERIAL_AMBA_PL011=y
680680
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
681-
CONFIG_SERIAL_SC16IS7XX=m
682-
CONFIG_SERIAL_SC16IS7XX_SPI=y
681+
CONFIG_SERIAL_SC16IS7XX_CORE=m
683682
CONFIG_SERIAL_DEV_BUS=y
684683
CONFIG_TTY_PRINTK=y
685684
CONFIG_HW_RANDOM=y
@@ -1366,7 +1365,6 @@ CONFIG_DMABUF_HEAPS_CMA=y
13661365
CONFIG_UIO=m
13671366
CONFIG_UIO_PDRV_GENIRQ=m
13681367
CONFIG_STAGING=y
1369-
CONFIG_PRISM2_USB=m
13701368
CONFIG_R8712U=m
13711369
CONFIG_VT6656=m
13721370
CONFIG_STAGING_MEDIA=y
@@ -1512,6 +1510,7 @@ CONFIG_PSTORE=y
15121510
CONFIG_PSTORE_CONSOLE=y
15131511
CONFIG_PSTORE_RAM=y
15141512
CONFIG_NFS_FS=y
1513+
CONFIG_NFS_V2=y
15151514
CONFIG_NFS_V3_ACL=y
15161515
CONFIG_NFS_V4=y
15171516
CONFIG_NFS_SWAP=y

‎arch/arm/configs/bcmrpi_defconfig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ CONFIG_ARCH_MULTI_V6=y
3636
CONFIG_ARCH_BCM=y
3737
CONFIG_ARCH_BCM2835=y
3838
# CONFIG_CACHE_L2X0 is not set
39-
# CONFIG_CPU_SW_DOMAIN_PAN is not set
4039
CONFIG_UACCESS_WITH_MEMCPY=y
4140
# CONFIG_ATAGS is not set
4241
CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
@@ -655,8 +654,7 @@ CONFIG_SERIAL_8250_BCM2835AUX=y
655654
CONFIG_SERIAL_OF_PLATFORM=y
656655
CONFIG_SERIAL_AMBA_PL011=y
657656
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
658-
CONFIG_SERIAL_SC16IS7XX=m
659-
CONFIG_SERIAL_SC16IS7XX_SPI=y
657+
CONFIG_SERIAL_SC16IS7XX_CORE=m
660658
CONFIG_SERIAL_DEV_BUS=y
661659
CONFIG_TTY_PRINTK=y
662660
CONFIG_HW_RANDOM=y
@@ -1331,7 +1329,6 @@ CONFIG_DMABUF_HEAPS_CMA=y
13311329
CONFIG_UIO=m
13321330
CONFIG_UIO_PDRV_GENIRQ=m
13331331
CONFIG_STAGING=y
1334-
CONFIG_PRISM2_USB=m
13351332
CONFIG_R8712U=m
13361333
CONFIG_VT6656=m
13371334
CONFIG_STAGING_MEDIA=y
@@ -1474,6 +1471,7 @@ CONFIG_PSTORE=y
14741471
CONFIG_PSTORE_CONSOLE=y
14751472
CONFIG_PSTORE_RAM=y
14761473
CONFIG_NFS_FS=y
1474+
CONFIG_NFS_V2=y
14771475
CONFIG_NFS_V3_ACL=y
14781476
CONFIG_NFS_V4=y
14791477
CONFIG_NFS_SWAP=y

‎arch/arm64/configs/bcm2711_defconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,7 @@ CONFIG_SERIAL_8250_BCM2835AUX=y
703703
CONFIG_SERIAL_OF_PLATFORM=y
704704
CONFIG_SERIAL_AMBA_PL011=y
705705
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
706-
CONFIG_SERIAL_SC16IS7XX=m
707-
CONFIG_SERIAL_SC16IS7XX_SPI=y
706+
CONFIG_SERIAL_SC16IS7XX_CORE=m
708707
CONFIG_SERIAL_DEV_BUS=y
709708
CONFIG_TTY_PRINTK=y
710709
CONFIG_HW_RANDOM=y
@@ -1418,7 +1417,6 @@ CONFIG_VHOST_NET=m
14181417
CONFIG_VHOST_VSOCK=m
14191418
CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y
14201419
CONFIG_STAGING=y
1421-
CONFIG_PRISM2_USB=m
14221420
CONFIG_R8712U=m
14231421
CONFIG_VT6656=m
14241422
CONFIG_STAGING_MEDIA=y
@@ -1571,6 +1569,7 @@ CONFIG_PSTORE=y
15711569
CONFIG_PSTORE_CONSOLE=y
15721570
CONFIG_PSTORE_RAM=y
15731571
CONFIG_NFS_FS=y
1572+
CONFIG_NFS_V2=y
15741573
CONFIG_NFS_V3_ACL=y
15751574
CONFIG_NFS_V4=y
15761575
CONFIG_NFS_SWAP=y

‎arch/arm64/configs/bcm2712_defconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,7 @@ CONFIG_SERIAL_8250_BCM2835AUX=y
706706
CONFIG_SERIAL_OF_PLATFORM=y
707707
CONFIG_SERIAL_AMBA_PL011=y
708708
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
709-
CONFIG_SERIAL_SC16IS7XX=m
710-
CONFIG_SERIAL_SC16IS7XX_SPI=y
709+
CONFIG_SERIAL_SC16IS7XX_CORE=m
711710
CONFIG_SERIAL_DEV_BUS=y
712711
CONFIG_TTY_PRINTK=y
713712
CONFIG_HW_RANDOM=y
@@ -1421,7 +1420,6 @@ CONFIG_VHOST_NET=m
14211420
CONFIG_VHOST_VSOCK=m
14221421
CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y
14231422
CONFIG_STAGING=y
1424-
CONFIG_PRISM2_USB=m
14251423
CONFIG_R8712U=m
14261424
CONFIG_VT6656=m
14271425
CONFIG_STAGING_MEDIA=y
@@ -1574,6 +1572,7 @@ CONFIG_PSTORE=y
15741572
CONFIG_PSTORE_CONSOLE=y
15751573
CONFIG_PSTORE_RAM=y
15761574
CONFIG_NFS_FS=y
1575+
CONFIG_NFS_V2=y
15771576
CONFIG_NFS_V3_ACL=y
15781577
CONFIG_NFS_V4=y
15791578
CONFIG_NFS_SWAP=y

‎arch/arm64/configs/bcmrpi3_defconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -663,8 +663,7 @@ CONFIG_SERIAL_8250_BCM2835AUX=y
663663
CONFIG_SERIAL_OF_PLATFORM=y
664664
CONFIG_SERIAL_AMBA_PL011=y
665665
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
666-
CONFIG_SERIAL_SC16IS7XX=m
667-
CONFIG_SERIAL_SC16IS7XX_SPI=y
666+
CONFIG_SERIAL_SC16IS7XX_CORE=m
668667
CONFIG_SERIAL_DEV_BUS=y
669668
CONFIG_TTY_PRINTK=y
670669
CONFIG_HW_RANDOM=y
@@ -1316,7 +1315,6 @@ CONFIG_UIO=m
13161315
CONFIG_UIO_PDRV_GENIRQ=m
13171316
CONFIG_VHOST_VSOCK=m
13181317
CONFIG_STAGING=y
1319-
CONFIG_PRISM2_USB=m
13201318
CONFIG_R8712U=m
13211319
CONFIG_VT6656=m
13221320
CONFIG_STAGING_MEDIA=y
@@ -1463,6 +1461,7 @@ CONFIG_PSTORE=y
14631461
CONFIG_PSTORE_CONSOLE=y
14641462
CONFIG_PSTORE_RAM=y
14651463
CONFIG_NFS_FS=y
1464+
CONFIG_NFS_V2=y
14661465
CONFIG_NFS_V3_ACL=y
14671466
CONFIG_NFS_V4=y
14681467
CONFIG_NFS_SWAP=y

0 commit comments

Comments
 (0)