diff options
| author | Paul Walmsley <paul.walmsley@sifive.com> | 2019-11-23 03:59:09 +0100 |
|---|---|---|
| committer | Paul Walmsley <paul.walmsley@sifive.com> | 2019-11-23 03:59:09 +0100 |
| commit | 5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb (patch) | |
| tree | b9f61d0544ed06b7f07000a11797711cdd97d83f /arch/riscv/lib/Makefile | |
| parent | Merge branch 'next/misc' into for-next (diff) | |
| parent | riscv: provide a flat image loader (diff) | |
| download | linux-5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb.tar.xz linux-5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb.zip | |
Merge branch 'next/nommu' into for-next
Conflicts:
arch/riscv/boot/Makefile
arch/riscv/include/asm/sbi.h
Diffstat (limited to 'arch/riscv/lib/Makefile')
| -rw-r--r-- | arch/riscv/lib/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index 267feaa10f6a..47e7a8204460 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only -lib-y += delay.o -lib-y += memcpy.o -lib-y += memset.o -lib-y += uaccess.o - -lib-$(CONFIG_64BIT) += tishift.o +lib-y += delay.o +lib-y += memcpy.o +lib-y += memset.o +lib-$(CONFIG_MMU) += uaccess.o +lib-$(CONFIG_64BIT) += tishift.o |