From 7784e01cb37a8c3eedd7cd972a0915b241f4c2f2 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Tue, 5 Nov 2019 13:47:29 +0200 Subject: [PATCH] Update riscv64 configs - Set CONFIG_NR_CPUS to max number of CPUs, (from) 8 --> (to) 32 - Adjust config_generation to fix build_configs.sh failure Signed-off-by: David Abdurachmanov --- configs/config_generation | 2 +- kernel-riscv64-debug.config | 8 +++++--- kernel-riscv64.config | 8 +++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/configs/config_generation b/configs/config_generation index ceb322781..bd6de1567 100644 --- a/configs/config_generation +++ b/configs/config_generation @@ -10,7 +10,7 @@ ORDER=fedora # x86_64 x86_64=generic:generic-x86:generic-x86-x86_64 -x86_64-debug=generic:generic-x86:generic-x86-x86_64:debug:debug-x86:debug-x86-x86_64 +x86_64-debug=generic:generic-x86:generic-x86-x86_64:debug:debug-x86 # i686 i686=generic:generic-x86:generic-x86-i686 diff --git a/kernel-riscv64-debug.config b/kernel-riscv64-debug.config index fc08d43af..2fe36638f 100644 --- a/kernel-riscv64-debug.config +++ b/kernel-riscv64-debug.config @@ -959,7 +959,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_INFO_BTF is not set +CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set @@ -1515,7 +1515,9 @@ CONFIG_FSI_SCOM=m # CONFIG_FSL_QDMA is not set CONFIG_FS_MBCACHE=y CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set @@ -3593,7 +3595,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOUVEAU_DEBUG_MMU=y # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set CONFIG_NOZOMI=m -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=32 CONFIG_NS83820=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set diff --git a/kernel-riscv64.config b/kernel-riscv64.config index 63cbcb0cf..e1506e57a 100644 --- a/kernel-riscv64.config +++ b/kernel-riscv64.config @@ -958,7 +958,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_INFO_BTF is not set +CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set @@ -1498,7 +1498,9 @@ CONFIG_FSI_SCOM=m # CONFIG_FSL_QDMA is not set CONFIG_FS_MBCACHE=y CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set @@ -3572,7 +3574,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3 # CONFIG_NOUVEAU_DEBUG_MMU is not set # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set CONFIG_NOZOMI=m -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=32 CONFIG_NS83820=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set