Commit 1522d9da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents b01d7cb4 bc3e8f5d

arch/riscv/Kconfig.socs

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ menu "SoC selection" 


config SOC_SIFIVE

	bool "SiFive SoCs"

	select SERIAL_SIFIVE

	select SERIAL_SIFIVE_CONSOLE

	select SERIAL_SIFIVE if TTY

	select SERIAL_SIFIVE_CONSOLE if TTY

	select CLK_SIFIVE

	select CLK_SIFIVE_FU540_PRCI

	select SIFIVE_PLIC

arch/riscv/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ $(obj)/Image: vmlinux FORCE 
$(obj)/Image.gz: $(obj)/Image FORCE

	$(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

	$(Q)$(LD) -T $(obj)/loader.lds -o $@ $(obj)/loader.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE