tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 1522d9da b01d7cb4

+3 -3
+2 -2
arch/riscv/Kconfig.socs
··· 2 2 3 3 config SOC_SIFIVE 4 4 bool "SiFive SoCs" 5 - select SERIAL_SIFIVE 6 - select SERIAL_SIFIVE_CONSOLE 5 + select SERIAL_SIFIVE if TTY 6 + select SERIAL_SIFIVE_CONSOLE if TTY 7 7 select CLK_SIFIVE 8 8 select CLK_SIFIVE_FU540_PRCI 9 9 select SIFIVE_PLIC
+1 -1
arch/riscv/boot/Makefile
··· 24 24 $(obj)/Image.gz: $(obj)/Image FORCE 25 25 $(call if_changed,gzip) 26 26 27 - loader.o: $(src)/loader.S $(obj)/Image 27 + $(obj)/loader.o: $(src)/loader.S $(obj)/Image 28 28 29 29 $(obj)/loader: $(obj)/loader.o $(obj)/Image $(obj)/loader.lds FORCE 30 30 $(Q)$(LD) -T $(obj)/loader.lds -o $@ $(obj)/loader.o