diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-09-30 10:33:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-09-30 10:33:24 +1000 |
| commit | 63a4be617a6883056eb0515427aeadbcf4104041 (patch) | |
| tree | 464612034271b64b1a121e85901ec88773a636c2 | |
| parent | f508f7af17a583f001b99bf1f4e15008c35136a8 (diff) | |
| parent | 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa (diff) | |
| download | devel-63a4be617a6883056eb0515427aeadbcf4104041.tar.gz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
# Conflicts:
# arch/nds32/Kconfig
| -rw-r--r-- | arch/nds32/Kbuild | 3 | ||||
| -rw-r--r-- | arch/nds32/Kconfig | 4 | ||||
| -rw-r--r-- | arch/nds32/Makefile | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/nds32/Kbuild b/arch/nds32/Kbuild index a4e40e534e6a84..565b9bc3c9db4f 100644 --- a/arch/nds32/Kbuild +++ b/arch/nds32/Kbuild @@ -1 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-y += kernel/ mm/ +obj-$(CONFIG_FPU) += math-emu/ +obj-y += boot/dts/ diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig index aea26e739543aa..5d06ab4b133820 100644 --- a/arch/nds32/Kconfig +++ b/arch/nds32/Kconfig @@ -34,7 +34,6 @@ config NDS32 select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_PERF_EVENTS select IRQ_DOMAIN - select LOCKDEP_SUPPORT select MODULES_USE_ELF_RELA select OF select OF_EARLY_FLATTREE @@ -63,6 +62,9 @@ config GENERIC_LOCKBREAK def_bool y depends on PREEMPTION +config LOCKDEP_SUPPORT + def_bool y + config STACKTRACE_SUPPORT def_bool y diff --git a/arch/nds32/Makefile b/arch/nds32/Makefile index c17fc3a755c38b..7dc0766f4e4b0f 100644 --- a/arch/nds32/Makefile +++ b/arch/nds32/Makefile @@ -27,8 +27,6 @@ export TEXTADDR # If we have a machine-specific directory, then include it in the build. -core-y += arch/nds32/kernel/ arch/nds32/mm/ -core-$(CONFIG_FPU) += arch/nds32/math-emu/ libs-y += arch/nds32/lib/ ifneq '$(CONFIG_NDS32_BUILTIN_DTB)' '""' @@ -50,7 +48,6 @@ CHECKFLAGS += -D__NDS32_EB__ endif boot := arch/nds32/boot -core-y += $(boot)/dts/ Image: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ |