diff options
| author | Baptiste Jonglez <git@bitsofnetworks.org> | 2017-07-15 22:57:55 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-10-16 09:43:43 +0200 |
| commit | cabf775e64ba337d96f393447bf0347e129e9157 (patch) | |
| tree | cf7681ca558e1200a7f0d6e599c3c571b5b646fa /target/linux/x86/64 | |
| parent | da0219ed9f990e5a951197c2c9c6a916d17109d1 (diff) | |
| download | upstream-cabf775e64ba337d96f393447bf0347e129e9157.tar.gz upstream-cabf775e64ba337d96f393447bf0347e129e9157.tar.bz2 upstream-cabf775e64ba337d96f393447bf0347e129e9157.zip | |
x86: Refresh subtargets kernel config
This was done by simply running `make kernel_menuconfig CONFIG_TARGET=subtarget`
and then saving without changing any option.
Having consistent kernel config is important to avoid surprises, such
as the issue fixed with 6f0367c9 (where Xen support was silently
disabled when building the kernel, although it was present in the
initial config)
As far as I understand the build system, this shouldn't have any
user-visible impact, because the build system already merges the
various kernel configs during build.
Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
Diffstat (limited to 'target/linux/x86/64')
| -rw-r--r-- | target/linux/x86/64/config-default | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default index 9948c288c5..9ca2cc9ead 100644 --- a/target/linux/x86/64/config-default +++ b/target/linux/x86/64/config-default @@ -30,7 +30,6 @@ CONFIG_ACPI_THERMAL=y # CONFIG_ACPI_WMI is not set CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_ARCH_HAS_PMEM_API=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" @@ -52,8 +51,11 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y CONFIG_CONNECTOR=y CONFIG_CPU_RMAP=y CONFIG_CRC_T10DIF=y -CONFIG_CRYPTO_AES_X86_64=y +CONFIG_CRYPTO_ABLK_HELPER=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_AES_NI_INTEL=y +CONFIG_CRYPTO_AES_X86_64=y # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set @@ -63,7 +65,14 @@ CONFIG_CRYPTO_AES_NI_INTEL=y # CONFIG_CRYPTO_CHACHA20_X86_64 is not set CONFIG_CRYPTO_CRCT10DIF=y # CONFIG_CRYPTO_CRCT10DIF_PCLMUL is not set +CONFIG_CRYPTO_CRYPTD=y # CONFIG_CRYPTO_DES3_EDE_X86_64 is not set +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_GLUE_HELPER_X86=y +CONFIG_CRYPTO_LRW=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_NULL2=y # CONFIG_CRYPTO_POLY1305_X86_64 is not set # CONFIG_CRYPTO_SALSA20_X86_64 is not set # CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set @@ -77,6 +86,7 @@ CONFIG_CRYPTO_CRCT10DIF=y # CONFIG_CRYPTO_TWOFISH_AVX_X86_64 is not set # CONFIG_CRYPTO_TWOFISH_X86_64 is not set # CONFIG_CRYPTO_TWOFISH_X86_64_3WAY is not set +CONFIG_CRYPTO_XTS=y # CONFIG_EARLY_PRINTK_EFI is not set CONFIG_EFI=y CONFIG_EFIVAR_FS=m @@ -111,7 +121,9 @@ CONFIG_GENERIC_CPU=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_GPIOLIB=y # CONFIG_GPIO_104_IDIO_16 is not set +CONFIG_GPIO_ACPI=y # CONFIG_GPIO_AMDPT is not set +CONFIG_GPIO_DEVRES=y # CONFIG_GPIO_F7188X is not set # CONFIG_GPIO_INTEL_MID is not set # CONFIG_GPIO_IT87 is not set @@ -197,6 +209,7 @@ CONFIG_NET_FLOW_LIMIT=y CONFIG_NR_CPUS=8 # CONFIG_NUMA is not set CONFIG_OUTPUT_FORMAT="elf64-x86-64" +CONFIG_PADATA=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y # CONFIG_PARAVIRT_DEBUG is not set |