From: Paul Walmsley <paul.walmsley@sifive.com>
Date: Sat, 23 Nov 2019 02:59:09 +0000 (-0800)
Subject: Merge branch 'next/nommu' into for-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb;p=linux.git

Merge branch 'next/nommu' into for-next

Conflicts:
	arch/riscv/boot/Makefile
	arch/riscv/include/asm/sbi.h
---

5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb
diff --cc arch/riscv/Kconfig
index bc7598fc5f008,babc8a0d3d2e1..ca3b5541ae93b
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -31,10 -31,9 +31,10 @@@ config RISC
  	select GENERIC_SMP_IDLE_THREAD
  	select GENERIC_ATOMIC64 if !64BIT
  	select HAVE_ARCH_AUDITSYSCALL
 +	select HAVE_ARCH_SECCOMP_FILTER
  	select HAVE_ASM_MODVERSIONS
  	select HAVE_MEMBLOCK_NODE_MAP
- 	select HAVE_DMA_CONTIGUOUS
+ 	select HAVE_DMA_CONTIGUOUS if MMU
  	select HAVE_FUTEX_CMPXCHG if FUTEX
  	select HAVE_PERF_EVENTS
  	select HAVE_PERF_REGS
diff --cc arch/riscv/boot/Makefile
index 88356650c9926,433ccbcabb239..a474f98ce4fae
--- a/arch/riscv/boot/Makefile
+++ b/arch/riscv/boot/Makefile
@@@ -24,18 -24,11 +24,23 @@@ $(obj)/Image: vmlinux FORC
  $(obj)/Image.gz: $(obj)/Image FORCE
  	$(call if_changed,gzip)
  
+ loader.o: $(src)/loader.S $(obj)/Image
+ 
+ $(obj)/loader: $(obj)/loader.o $(obj)/Image $(obj)/loader.lds FORCE
+ 	$(Q)$(LD) -T $(obj)/loader.lds -o $@ $(obj)/loader.o
+ 
 +$(obj)/Image.bz2: $(obj)/Image FORCE
 +	$(call if_changed,bzip2)
 +
 +$(obj)/Image.lz4: $(obj)/Image FORCE
 +	$(call if_changed,lz4)
 +
 +$(obj)/Image.lzma: $(obj)/Image FORCE
 +	$(call if_changed,lzma)
 +
 +$(obj)/Image.lzo: $(obj)/Image FORCE
 +	$(call if_changed,lzo)
 +
  install:
  	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
  	$(obj)/Image System.map "$(INSTALL_PATH)"