From b60d3c441ced12e2be2cb64b555c994dd2c91d9a Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Fri, 13 Dec 2019 22:11:23 +0200 Subject: [PATCH] Rever back to ea5cbbcfce8c734 This reverts the last 11 commits used for debuggin to a last decent state. Signed-off-by: David Abdurachmanov --- configs/fedora/generic/riscv/CONFIG_CMDLINE | 2 +- configs/fedora/generic/riscv/CONFIG_NR_CPUS | 2 +- kernel-riscv64-debug.config | 7 ++----- kernel-riscv64.config | 7 ++----- kernel.spec | 10 +++++----- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/configs/fedora/generic/riscv/CONFIG_CMDLINE b/configs/fedora/generic/riscv/CONFIG_CMDLINE index c3974e6af..f3083e1e5 100644 --- a/configs/fedora/generic/riscv/CONFIG_CMDLINE +++ b/configs/fedora/generic/riscv/CONFIG_CMDLINE @@ -1 +1 @@ -CONFIG_CMDLINE="console=ttySIF0 earlycon rw rootwait root=/dev/mmcblk0p4 debug ignore_loglevel LANG=en_US.UTF-8" +CONFIG_CMDLINE="" diff --git a/configs/fedora/generic/riscv/CONFIG_NR_CPUS b/configs/fedora/generic/riscv/CONFIG_NR_CPUS index 8832f8943..1d82a8537 100644 --- a/configs/fedora/generic/riscv/CONFIG_NR_CPUS +++ b/configs/fedora/generic/riscv/CONFIG_NR_CPUS @@ -1 +1 @@ -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=32 diff --git a/kernel-riscv64-debug.config b/kernel-riscv64-debug.config index d552fdae1..6c57bbced 100644 --- a/kernel-riscv64-debug.config +++ b/kernel-riscv64-debug.config @@ -737,11 +737,8 @@ CONFIG_CM32181=m CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set +CONFIG_CMDLINE="" # CONFIG_CMDLINE_BOOL is not set -CONFIG_CMDLINE="console=ttySIF0 earlycon rw rootwait root=/dev/mmcblk0p4 debug ignore_loglevel LANG=en_US.UTF-8" -# CONFIG_CMDLINE_EXTEND is not set -CONFIG_CMDLINE_FALLBACK=y -# CONFIG_CMDLINE_FORCE is not set # CONFIG_CMDLINE_PARTITION is not set CONFIG_CMODEL_MEDANY=y # CONFIG_CMODEL_MEDLOW is not set @@ -3609,7 +3606,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 2d92d4b36..552a4813b 100644 --- a/kernel-riscv64.config +++ b/kernel-riscv64.config @@ -736,11 +736,8 @@ CONFIG_CM32181=m CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set +CONFIG_CMDLINE="" # CONFIG_CMDLINE_BOOL is not set -CONFIG_CMDLINE="console=ttySIF0 earlycon rw rootwait root=/dev/mmcblk0p4 debug ignore_loglevel LANG=en_US.UTF-8" -# CONFIG_CMDLINE_EXTEND is not set -CONFIG_CMDLINE_FALLBACK=y -# CONFIG_CMDLINE_FORCE is not set # CONFIG_CMDLINE_PARTITION is not set CONFIG_CMODEL_MEDANY=y # CONFIG_CMODEL_MEDLOW is not set @@ -3588,7 +3585,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 diff --git a/kernel.spec b/kernel.spec index c7e31a7bc..811eb7ae6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -187,7 +187,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 %if 0%{?fedora} # Kernel headers are being split out into a separate package @@ -214,7 +214,7 @@ Summary: The Linux kernel # pkg_release is what we'll fill in for the rpm Release: field %if 0%{?released_kernel} -%define pkg_release %{fedora_build}%{?buildid}.4.riscv64%{?dist} +%define pkg_release %{fedora_build}%{?buildid}.1.riscv64%{?dist} %else @@ -229,7 +229,7 @@ Summary: The Linux kernel %else %define gittag .git0 %endif -%define pkg_release 0%{?rctag}%{?gittag}.%{fedora_build}%{?buildid}.4.riscv64%{?dist} +%define pkg_release 0%{?rctag}%{?gittag}.%{fedora_build}%{?buildid}.1.riscv64%{?dist} %endif @@ -728,12 +728,12 @@ Patch505: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch # RISC-V SECCOMP support v2 (posted on linux-riscv) # http://lists.infradead.org/pipermail/linux-riscv/2019-August/006235.html -#Patch550: 0001-riscv-add-support-for-SECCOMP.patch +Patch550: 0001-riscv-add-support-for-SECCOMP.patch # RISC-V SiFive Unleashed CPUFreq support # WIP, private dev branch # https://github.com/sifive/riscv-linux/commits/dev/paulw/cpufreq-dt-aloe-v5.3-rc4 -#Patch552: 0002-SiFive-Unleashed-CPUFreq.patch +Patch552: 0002-SiFive-Unleashed-CPUFreq.patch # END OF PATCH DEFINITIONS