renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

RISC-V updates for v5.5-rc2

Browse Source 
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)
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEElRDoIDdEz9/svf2Kx4+xDQu9KksFAl32kkUACgkQx4+xDQu9
 KkuJVxAAg9/moBsltjLQ6hIiqgYN3xa5uvcfzGGGCQt9+6HqUObGPuKKo21Cny4V
 nOCePsXETCHaUhpEm9bS/aBLdSs4SiyghgNAidI5njd5e2h3eBk3/usINalJq3tT
 tZd1aS7csOgvuibWf3kdyca1RBa2mnQToARj/ZvVEG2LteVm0Z6Nm5eQftkuE1z7
 jMSdR44hbNEVZxA6FP0ZBgyP7eB7GjE8z8w5XGk4jSDYGtdmlBx1Hb7vzCVoGjM+
 VhgXJ/7fWqixSDahk37jKf6Bfcg40iny8iUjlkG04cBFaYvmHgDuiI6VjifIKxzK
 rdjtTLZ5JhG0OsQ4EdcnDGmeuhiD9Vm2OageWvJ1FR/VqUzO8mq1THgha2YE/gCs
 jvrVMNzeaju8i9df6e7boQcVFD7Y+thAr8EQHI7mZInY/+Jvlh4TT8nkuXNg9c+I
 DfMMbJDtU73LJPyVtjqj7b1MX/R5G8TWCBZ8KEtvAVi96NqyeNUc2vo8iE6isgRQ
 IHnuqYsgUMO+BUPqakYXMwpSq2/l8SmpcVArkLp5bi0+Zq9qYSx0tdzDKCQBnaHo
 5Uk3jNgwcydPCxRHSk+cZZyWOB2YxRNxIfX0RTVqaV1H91VQSDox+hmNCOBxGOtH
 ptoXpWO7U7oab7n+7qGFOrlmXEP2pAjGvthGoytMB9wT92Fdv7Y=
 =PVYW
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2019-12-15 12:27:31 -08:00
commit 1522d9da40
2 changed files with 3 additions and 3 deletions
Show Stats 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
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

2
arch/riscv/boot/Makefile
View File

@ -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