Merge branch 'freebsd/current/main' into hardened/current/master

stand/Makefile

@@ -37,7 +37,7 @@ INTERP_DEPENDS+=	lua
 .include <bsd.arch.inc.mk>
 
 S.${MK_EFI}+=		efi
-.if ${MK_FDT} != "no"
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "powerpc64"
 S.${MK_LOADER_KBOOT}+=	kboot
 .endif
 S.${MK_LOADER_UBOOT}+=	uboot

stand/kboot/kboot/Makefile

@@ -24,12 +24,15 @@ SRCS=	\
 		hostdisk.c \
 		hostfs.c \
 		init.c \
-		kbootfdt.c \
 		main.c \
 		seg.c \
 		util.c \
 		vers.c
 
+.if ${MK_FDT} != "no"
+SRCS+=		kbootfdt.c
+.endif
+
 .if ${MK_LOADER_ZFS} != "no"
 CFLAGS+=	-I${ZFSSRC}
 CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include

stand/kboot/kboot/main.c

@@ -26,7 +26,9 @@
 #include <stand.h>
 #include <sys/param.h>
 #include <sys/boot.h>
+#ifdef LOADER_FDT_SUPPORT
 #include <fdt_platform.h>
+#endif
 
 #include <machine/cpufunc.h>
 #include <bootstrap.h>
@@ -620,6 +622,7 @@ kboot_zfs_probe(void)
 #endif
 }
 
+#ifdef LOADER_FDT_SUPPORT
 /*
  * Since proper fdt command handling function is defined in fdt_loader_cmd.c,
  * and declaring it as extern is in contradiction with COMMAND_SET() macro
@@ -634,4 +637,4 @@ command_fdt(int argc, char *argv[])
 }
 
 COMMAND_SET(fdt, "fdt", "flattened device tree handling", command_fdt);
-
+#endif

sys/cam/scsi/scsi_da.c

@@ -881,6 +881,11 @@ static struct da_quirk_entry da_quirk_table[] =
 		{T_DIRECT, SIP_MEDIA_REMOVABLE, "JetFlash", "Transcend*",
 		 "*"}, /*quirks*/ DA_Q_NO_RC16
 	},
+	{
+		/* ADATA USB sticks lie on RC16. */
+		{T_DIRECT, SIP_MEDIA_REMOVABLE, "ADATA", "USB Flash Drive*",
+		 "*"}, /*quirks*/ DA_Q_NO_RC16
+	},
 	{
 		/*
 		 * I-O Data USB Flash Disk