git: aa39abd8e58f - main - arm64: Move Azure-specific config from std.hyperv to std.azure

The branch main has been updated by jrtc27:

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

commit aa39abd8e58f6559ad87ac7e9de2096c202ccce2
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-03-14 04:12:31 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-03-14 04:12:31 +0000

    arm64: Move Azure-specific config from std.hyperv to std.azure
    
    Hyper-V does not provide Mellanox hardware, some of Azure's instances
    do, thus the configuration to enable them does not belong in the generic
    std.hyperv config.
    
    Fixes:  15e7fa83ef3c ("arm64: Hyper-V: Add vPCI and Mellanox driver modules into build")
---
 sys/arm64/conf/GENERIC    |  1 +
 sys/arm64/conf/std.azure  | 15 +++++++++++++++
 sys/arm64/conf/std.hyperv | 10 ----------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
index c53132b0c225..2267429f16d0 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -29,6 +29,7 @@ include		"std.allwinner"
 include		"std.altera"
 include		"std.amd"
 include		"std.arm"
+include		"std.azure"
 include		"std.broadcom"
 include		"std.cavium"
 include		"std.ec2"
diff --git a/sys/arm64/conf/std.azure b/sys/arm64/conf/std.azure
new file mode 100644
index 000000000000..97ce7f0ae24c
--- /dev/null
+++ b/sys/arm64/conf/std.azure
@@ -0,0 +1,15 @@
+#
+# Azure support
+#
+
+device		hyperv
+
+options 	COMPAT_LINUXKPI
+device		xz
+
+device		mlx5
+device		mlxfw
+device		mlx5en
+options 	RATELIMIT
+options 	KERN_TLS
+device		firmware
diff --git a/sys/arm64/conf/std.hyperv b/sys/arm64/conf/std.hyperv
index b742c75da131..97492e6179b5 100644
--- a/sys/arm64/conf/std.hyperv
+++ b/sys/arm64/conf/std.hyperv
@@ -4,13 +4,3 @@
 
 #hyper-v support
 device		hyperv
-
-options 	COMPAT_LINUXKPI
-device		xz
-
-device		mlx5
-device		mlxfw
-device		mlx5en
-options 	RATELIMIT
-options 	KERN_TLS
-device		firmware