git: df6ae1140005 - stable/14 - kboot: Move termios to libkboot

From: Warner Losh <imp_at_FreeBSD.org>
Date: Tue, 16 Apr 2024 20:12:25 UTC
The branch stable/14 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=df6ae1140005f9ac821d85f9ef6c6895e69c6b0b

commit df6ae1140005f9ac821d85f9ef6c6895e69c6b0b
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-01-28 19:28:30 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-04-16 19:54:21 +0000

    kboot: Move termios to libkboot
    
    Sponsored by:           Netflix
    
    (cherry picked from commit 36ef238cb604c827c696e975281f63d90641005f)
---
 stand/kboot/{kboot => include}/arch/aarch64/termios_arch.h   | 0
 stand/kboot/{kboot => include}/arch/amd64/termios_arch.h     | 0
 stand/kboot/{kboot => include}/arch/powerpc64/termios_arch.h | 0
 stand/kboot/{kboot => include}/termios.h                     | 0
 stand/kboot/{kboot => include}/termios_gen.h                 | 0
 stand/kboot/kboot/Makefile                                   | 1 -
 stand/kboot/libkboot/Makefile                                | 3 ++-
 stand/kboot/{kboot => libkboot}/termios.c                    | 0
 8 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stand/kboot/kboot/arch/aarch64/termios_arch.h b/stand/kboot/include/arch/aarch64/termios_arch.h
similarity index 100%
rename from stand/kboot/kboot/arch/aarch64/termios_arch.h
rename to stand/kboot/include/arch/aarch64/termios_arch.h
diff --git a/stand/kboot/kboot/arch/amd64/termios_arch.h b/stand/kboot/include/arch/amd64/termios_arch.h
similarity index 100%
rename from stand/kboot/kboot/arch/amd64/termios_arch.h
rename to stand/kboot/include/arch/amd64/termios_arch.h
diff --git a/stand/kboot/kboot/arch/powerpc64/termios_arch.h b/stand/kboot/include/arch/powerpc64/termios_arch.h
similarity index 100%
rename from stand/kboot/kboot/arch/powerpc64/termios_arch.h
rename to stand/kboot/include/arch/powerpc64/termios_arch.h
diff --git a/stand/kboot/kboot/termios.h b/stand/kboot/include/termios.h
similarity index 100%
rename from stand/kboot/kboot/termios.h
rename to stand/kboot/include/termios.h
diff --git a/stand/kboot/kboot/termios_gen.h b/stand/kboot/include/termios_gen.h
similarity index 100%
rename from stand/kboot/kboot/termios_gen.h
rename to stand/kboot/include/termios_gen.h
diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile
index 475f863b77bd..055027b85eb2 100644
--- a/stand/kboot/kboot/Makefile
+++ b/stand/kboot/kboot/Makefile
@@ -29,7 +29,6 @@ SRCS=	\
 		kbootfdt.c \
 		main.c \
 		seg.c \
-		termios.c \
 		util.c \
 		vers.c
 
diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile
index 33674da83661..d9ce08cb0856 100644
--- a/stand/kboot/libkboot/Makefile
+++ b/stand/kboot/libkboot/Makefile
@@ -8,7 +8,8 @@ CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 
 SRCS=	crt1.c \
 	host_syscall.S \
-	host_syscalls.c
+	host_syscalls.c \
+	termios.c
 
 .sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 
diff --git a/stand/kboot/kboot/termios.c b/stand/kboot/libkboot/termios.c
similarity index 100%
rename from stand/kboot/kboot/termios.c
rename to stand/kboot/libkboot/termios.c