Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 800855ea authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/defconfig: Update defconfigs for v5.0-rc1 



Actual changes:
    -CONFIG_IOSCHED_DEADLINE=m
    -CONFIG_BATMAN_ADV_MCAST=y
    -# CONFIG_SCSI_MQ_DEFAULT is not set
    +CONFIG_CRYPTO_ADIANTUM=m
    +CONFIG_CRYPTO_STREEBOG=m

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent c097a39c

arch/m68k/configs/amiga_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_SUN_PARTITION=y

# CONFIG_EFI_PARTITION is not set

CONFIG_SYSV68_PARTITION=y

CONFIG_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m
@@ -304,7 +303,6 @@ CONFIG_DNS_RESOLVER=y 
CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m
@@ -342,7 +340,6 @@ CONFIG_BLK_DEV_GAYLE=y 
CONFIG_BLK_DEV_BUDDHA=y

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

# CONFIG_SCSI_MQ_DEFAULT is not set

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m
@@ -580,6 +577,7 @@ CONFIG_CRYPTO_LRW=m 
CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -589,6 +587,7 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_STREEBOG=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m

arch/m68k/configs/apollo_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_SUN_PARTITION=y

# CONFIG_EFI_PARTITION is not set

CONFIG_SYSV68_PARTITION=y

CONFIG_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m
@@ -300,7 +299,6 @@ CONFIG_DNS_RESOLVER=y 
CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m
@@ -327,7 +325,6 @@ CONFIG_ATA_OVER_ETH=m 
CONFIG_DUMMY_IRQ=m

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

# CONFIG_SCSI_MQ_DEFAULT is not set

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m
@@ -540,6 +537,7 @@ CONFIG_CRYPTO_LRW=m 
CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -549,6 +547,7 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_STREEBOG=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m

arch/m68k/configs/atari_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_SUN_PARTITION=y

# CONFIG_EFI_PARTITION is not set

CONFIG_SYSV68_PARTITION=y

CONFIG_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m
@@ -307,7 +306,6 @@ CONFIG_DNS_RESOLVER=y 
CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m
@@ -342,7 +340,6 @@ CONFIG_BLK_DEV_IDECD=y 
CONFIG_BLK_DEV_FALCON_IDE=y

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

# CONFIG_SCSI_MQ_DEFAULT is not set

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m
@@ -562,6 +559,7 @@ CONFIG_CRYPTO_LRW=m 
CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -571,6 +569,7 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_STREEBOG=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m

arch/m68k/configs/bvme6000_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ CONFIG_SOLARIS_X86_PARTITION=y 
CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_SUN_PARTITION=y

# CONFIG_EFI_PARTITION is not set

CONFIG_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m
@@ -297,7 +296,6 @@ CONFIG_DNS_RESOLVER=y 
CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m
@@ -324,7 +322,6 @@ CONFIG_ATA_OVER_ETH=m 
CONFIG_DUMMY_IRQ=m

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

# CONFIG_SCSI_MQ_DEFAULT is not set

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m
@@ -533,6 +530,7 @@ CONFIG_CRYPTO_LRW=m 
CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -542,6 +540,7 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_STREEBOG=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m

arch/m68k/configs/hp300_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_SUN_PARTITION=y

# CONFIG_EFI_PARTITION is not set

CONFIG_SYSV68_PARTITION=y

CONFIG_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_DEADLINE=m

CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m
@@ -299,7 +298,6 @@ CONFIG_DNS_RESOLVER=y 
CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m
@@ -326,7 +324,6 @@ CONFIG_ATA_OVER_ETH=m 
CONFIG_DUMMY_IRQ=m

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

# CONFIG_SCSI_MQ_DEFAULT is not set

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_CHR_DEV_OSST=m
@@ -542,6 +539,7 @@ CONFIG_CRYPTO_LRW=m 
CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -551,6 +549,7 @@ CONFIG_CRYPTO_RMD256=m 
CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_STREEBOG=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m