aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@gmail.com>2022-06-24 19:30:50 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-27 22:34:07 +0200
commit2b392383e62ce37b2be13e1cf4dc6c328e32d2ee (patch)
tree8a27ff86907559c26d546253ede7bbc6c740c979 /target
parent9c609080b0318bf77ffb44961c1e174cf861f588 (diff)
downloadupstream-2b392383e62ce37b2be13e1cf4dc6c328e32d2ee.tar.gz
upstream-2b392383e62ce37b2be13e1cf4dc6c328e32d2ee.tar.bz2
upstream-2b392383e62ce37b2be13e1cf4dc6c328e32d2ee.zip
x86: fix damaged config 5.10 refresh
Restore CONFIG_I8K + CONFIG_INTEL_INT0002_VGPIO that got removed when I refreshed the config. Each x86 target gets its own CONFIG_CRYPTO_BLAKE2S + LIB settings as only the x86_64 can use the accelerated x86 version. Also remove two extra spaces that sneaked into geode's config. Fixes: 539e60539a2f ("generic: enable CRYPTO_LIB_BLAKE2S[_X86|_ARM]") Signed-off-by: Christian Lamparter <chunkeey@gmail.com> (cherry picked from commit 9fc2d58bf8b37f80e8027dc55b6007e0bfa66ebe)
Diffstat (limited to 'target')
-rw-r--r--target/linux/x86/config-5.104
-rw-r--r--target/linux/x86/geode/config-5.102
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/x86/config-5.10 b/target/linux/x86/config-5.10
index d60f3d8303..ec27bb7945 100644
--- a/target/linux/x86/config-5.10
+++ b/target/linux/x86/config-5.10
@@ -64,11 +64,9 @@ CONFIG_CPU_SUP_UMC_32=y
CONFIG_CPU_SUP_ZHAOXIN=y
CONFIG_CRASH_CORE=y
CONFIG_CRC16=y
-CONFIG_CRYPTO_BLAKE2S=y
CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32C=y
# CONFIG_CRYPTO_CRC32_PCLMUL is not set
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
CONFIG_CRYPTO_RNG2=y
# CONFIG_CRYPTO_SERPENT_SSE2_586 is not set
@@ -159,6 +157,7 @@ CONFIG_HW_RANDOM_VIA=y
# CONFIG_HYPERVISOR_GUEST is not set
CONFIG_HZ_PERIODIC=y
CONFIG_I8253_LOCK=y
+# CONFIG_I8K is not set
CONFIG_IA32_FEAT_CTL=y
# CONFIG_IB700_WDT is not set
# CONFIG_IBMASR is not set
@@ -169,6 +168,7 @@ CONFIG_INITRAMFS_SOURCE=""
CONFIG_INPUT=y
CONFIG_INPUT_KEYBOARD=y
CONFIG_INSTRUCTION_DECODER=y
+# CONFIG_INTEL_INT0002_VGPIO is not set
# CONFIG_INTEL_PCH_THERMAL is not set
# CONFIG_INTEL_POWERCLAMP is not set
# CONFIG_INTEL_SCU_PCI is not set
diff --git a/target/linux/x86/geode/config-5.10 b/target/linux/x86/geode/config-5.10
index 372630c102..1cb3bad952 100644
--- a/target/linux/x86/geode/config-5.10
+++ b/target/linux/x86/geode/config-5.10
@@ -35,7 +35,7 @@ CONFIG_ACPI_THERMAL=y
CONFIG_ALIX=y
CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
# CONFIG_ATA_PIIX is not set
-CONFIG_CRYPTO_BLAKE2S=y
+CONFIG_CRYPTO_BLAKE2S=y
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
CONFIG_CS5535_CLOCK_EVENT_SRC=y
CONFIG_CS5535_MFGPT=y