mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'riscv/for-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

Browse Source 
Pull RISC-V fixes from Paul Walmsley:
 "Two minor build fixes:

   - Fix builds of the ELF loader when built with 'make -j1' (nommu
     only)

   - Fix CONFIG_SOC_SIFIVE builds when CONFIG_TTY is disabled (found
     during randconfig testing)"

* tag 'riscv/for-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: only select serial sifive if TTY is enabled
  riscv: Fix build dependency for loader
This commit is contained in:
Linus Torvalds
2019-12-15 12:27:31 -08:00
parent b01d7cb41f bc3e8f5d42
commit 1522d9da40
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/riscv/Kconfig.socs
View File

@@ -2,8 +2,8 @@ menu "SoC selection"
config SOC_SIFIVE config SOC_SIFIVE
bool "SiFive SoCs" bool "SiFive SoCs"
select SERIAL_SIFIVE select SERIAL_SIFIVE if TTY
select SERIAL_SIFIVE_CONSOLE select SERIAL_SIFIVE_CONSOLE if TTY
select CLK_SIFIVE select CLK_SIFIVE
select CLK_SIFIVE_FU540_PRCI select CLK_SIFIVE_FU540_PRCI
select SIFIVE_PLIC select SIFIVE_PLIC

2
arch/riscv/boot/Makefile
View File

@@ -24,7 +24,7 @@ $(obj)/Image: vmlinux FORCE
$(obj)/Image.gz: $(obj)/Image FORCE $(obj)/Image.gz: $(obj)/Image FORCE
$(call if_changed,gzip) $(call if_changed,gzip)
loader.o: $(src)/loader.S $(obj)/Image $(obj)/loader.o: $(src)/loader.S $(obj)/Image
$(obj)/loader: $(obj)/loader.o $(obj)/Image $(obj)/loader.lds FORCE $(obj)/loader: $(obj)/loader.o $(obj)/Image $(obj)/loader.lds FORCE
$(Q)$(LD) -T $(obj)/loader.lds -o $@ $(obj)/loader.o $(Q)$(LD) -T $(obj)/loader.lds -o $@ $(obj)/loader.o