Skip to content

Commit 63ad6f9

Browse files
committed
WiP cryptsetup 2.6.1: review config/linux-x230-flash.config config/linux-x230-legacy.config to reduce added options
1 parent 568fb31 commit 63ad6f9

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

config/linux-x230-flash.config

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y
156156
# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
157157
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
158158
CONFIG_LD_ORPHAN_WARN=y
159-
CONFIG_SYSCTL=y
160159
CONFIG_SYSCTL_EXCEPTION_TRACE=y
161160
CONFIG_HAVE_PCSPKR_PLATFORM=y
162161
CONFIG_EXPERT=y
@@ -1504,7 +1503,7 @@ CONFIG_DUMMY_CONSOLE=y
15041503
CONFIG_DUMMY_CONSOLE_COLUMNS=80
15051504
CONFIG_DUMMY_CONSOLE_ROWS=25
15061505
CONFIG_FRAMEBUFFER_CONSOLE=y
1507-
CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
1506+
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
15081507
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
15091508
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
15101509
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@@ -2134,7 +2133,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
21342133
#
21352134
CONFIG_PROC_FS=y
21362135
# CONFIG_PROC_KCORE is not set
2137-
CONFIG_PROC_SYSCTL=y
2136+
# CONFIG_PROC_SYSCTL is not set
21382137
# CONFIG_PROC_PAGE_MONITOR is not set
21392138
# CONFIG_PROC_CHILDREN is not set
21402139
CONFIG_PROC_PID_ARCH_STATUS=y

config/linux-x230-legacy.config

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
680680
# CONFIG_IOSCHED_BFQ is not set
681681
# end of IO Schedulers
682682

683-
CONFIG_ASN1=y
684683
CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
685684
CONFIG_INLINE_READ_UNLOCK=y
686685
CONFIG_INLINE_READ_UNLOCK_IRQ=y
@@ -822,12 +821,10 @@ CONFIG_PCI_MSI=y
822821
CONFIG_PCI_MSI_IRQ_DOMAIN=y
823822
CONFIG_PCI_QUIRKS=y
824823
# CONFIG_PCI_DEBUG is not set
825-
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
826824
# CONFIG_PCI_STUB is not set
827-
# CONFIG_PCI_PF_STUB is not set
828825
CONFIG_PCI_ATS=y
829826
CONFIG_PCI_LOCKLESS_CONFIG=y
830-
CONFIG_PCI_IOV=y
827+
# CONFIG_PCI_IOV is not set
831828
CONFIG_PCI_PRI=y
832829
CONFIG_PCI_PASID=y
833830
CONFIG_PCI_LABEL=y
@@ -1624,7 +1621,7 @@ CONFIG_DUMMY_CONSOLE=y
16241621
CONFIG_DUMMY_CONSOLE_COLUMNS=80
16251622
CONFIG_DUMMY_CONSOLE_ROWS=25
16261623
CONFIG_FRAMEBUFFER_CONSOLE=y
1627-
CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
1624+
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
16281625
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
16291626
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
16301627
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@@ -2376,9 +2373,7 @@ CONFIG_CRYPTO_HASH2=y
23762373
CONFIG_CRYPTO_RNG=y
23772374
CONFIG_CRYPTO_RNG2=y
23782375
CONFIG_CRYPTO_AKCIPHER2=y
2379-
CONFIG_CRYPTO_AKCIPHER=y
23802376
CONFIG_CRYPTO_KPP2=y
2381-
CONFIG_CRYPTO_KPP=y
23822377
CONFIG_CRYPTO_ACOMP2=y
23832378
CONFIG_CRYPTO_MANAGER=y
23842379
CONFIG_CRYPTO_MANAGER2=y
@@ -2396,8 +2391,8 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=y
23962391
#
23972392
# Public-key cryptography
23982393
#
2399-
CONFIG_CRYPTO_RSA=y
2400-
CONFIG_CRYPTO_DH=y
2394+
# CONFIG_CRYPTO_RSA is not set
2395+
# CONFIG_CRYPTO_DH is not set
24012396
# CONFIG_CRYPTO_ECDH is not set
24022397
# CONFIG_CRYPTO_ECRDSA is not set
24032398
# CONFIG_CRYPTO_SM2 is not set
@@ -2428,10 +2423,9 @@ CONFIG_CRYPTO_ECB=y
24282423
# CONFIG_CRYPTO_PCBC is not set
24292424
CONFIG_CRYPTO_XTS=y
24302425
# CONFIG_CRYPTO_KEYWRAP is not set
2431-
CONFIG_CRYPTO_NHPOLY1305=y
24322426
# CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set
24332427
# CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set
2434-
CONFIG_CRYPTO_ADIANTUM=y
2428+
# CONFIG_CRYPTO_ADIANTUM is not set
24352429
CONFIG_CRYPTO_ESSIV=y
24362430

24372431
#
@@ -2497,7 +2491,7 @@ CONFIG_CRYPTO_AES_NI_INTEL=y
24972491
# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set
24982492
# CONFIG_CRYPTO_FCRYPT is not set
24992493
# CONFIG_CRYPTO_SALSA20 is not set
2500-
CONFIG_CRYPTO_CHACHA20=y
2494+
# CONFIG_CRYPTO_CHACHA20 is not set
25012495
# CONFIG_CRYPTO_CHACHA20_X86_64 is not set
25022496
# CONFIG_CRYPTO_SERPENT is not set
25032497
# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set
@@ -2563,11 +2557,9 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
25632557
#
25642558
CONFIG_CRYPTO_LIB_AES=y
25652559
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
2566-
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
25672560
# CONFIG_CRYPTO_LIB_CHACHA is not set
25682561
# CONFIG_CRYPTO_LIB_CURVE25519 is not set
25692562
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
2570-
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
25712563
# CONFIG_CRYPTO_LIB_POLY1305 is not set
25722564
# CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
25732565
CONFIG_CRYPTO_LIB_SHA256=y
@@ -2619,9 +2611,7 @@ CONFIG_DQL=y
26192611
CONFIG_GLOB=y
26202612
# CONFIG_GLOB_SELFTEST is not set
26212613
CONFIG_NLATTR=y
2622-
CONFIG_CLZ_TAB=y
26232614
# CONFIG_IRQ_POLL is not set
2624-
CONFIG_MPILIB=y
26252615
CONFIG_UCS2_STRING=y
26262616
CONFIG_HAVE_GENERIC_VDSO=y
26272617
CONFIG_GENERIC_GETTIMEOFDAY=y

0 commit comments

Comments
 (0)