tty, uboot: Update ttySI0 to ttySIF0 for riscv64

ttySI0 was a name of HiFive Unleashed serial console. It was changed to ttySIF0.

tty, uboot: Update ttySI0 to ttySIF0 for riscv64
741d59ab · Nikita Ermakov · Anton Midyukov · d61cf032 · 741d59ab · 741d59ab
Commit 741d59ab authored Jan 27, 2021 by Nikita Ermakov Committed by Anton Midyukov Apr 04, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

config.mk features.in/tty/config.mk +1 -1

config.mk features.in/uboot/config.mk +4 -0

No files found.
--- a/features.in/tty/config.mk
+++ b/features.in/tty/config.mk
@@ -9,7 +9,7 @@ ifeq (distro,$(IMAGE_CLASS))
 endif

 comma := ,
-use/tty/S0 use/tty/SI0 use/tty/AMA0: use/tty/%: use/tty
+use/tty/S0 use/tty/SIF0 use/tty/AMA0: use/tty/%: use/tty
 	@$(call add,THE_PACKAGES,agetty)
 	@$(call add,TTY_DEV,tty$*)
 	@$(call set,TTY_RATE,115200)

--- a/features.in/uboot/config.mk
+++ b/features.in/uboot/config.mk
@@ -7,7 +7,11 @@ endif
 endif

 ifeq (,$(filter-out riscv64,$(ARCH)))
+ifeq (,$(filter-out qcow2 qcow2c,$(IMAGE_TYPE)))
 UBOOT_TTY := use/tty/S0
+else
+UBOOT_TTY := use/tty/SIF0
+endif
 endif

 ifneq (,$(filter-out i586 x86_64,$(ARCH)))