git: 5a0061214930 - main - arm64: Move device scmi to std.arm

The branch main has been updated by manu:

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

commit 5a00612149308403ecbf26f56a46f11190211911
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-01-25 07:28:22 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-01-25 07:28:22 +0000

    arm64: Move device scmi to std.arm
    
    The scmi driver in its current form requires the arm_doorbell
    driver to communicate with the firmware.
    The arm_doorbell is only found in ARM Juno reference board (and
    apparently on Morello too).
    If we want to use scmi on other platform (like some rockchip or imx
    soc), the driver needs to be updated to support svc/shmem communication
    with the firmware.
    For now since it can be only used with arm_doorbell move the device to
    std.arm otherwise kernel configs like ALLWINNER or ROCKCHIP fails to build.
    
    Reviewed by:    br, imp
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
    Differential Revision:  https://reviews.freebsd.org/D37953
---
 sys/arm64/conf/std.arm | 3 +++
 sys/arm64/conf/std.dev | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/arm64/conf/std.arm b/sys/arm64/conf/std.arm
index d17c80b78fff..2b40fd7b0eb8 100644
--- a/sys/arm64/conf/std.arm
+++ b/sys/arm64/conf/std.arm
@@ -11,6 +11,9 @@ device		pl061			# Arm PL061 GPIO controller
 # Serial (COM) ports
 device		pl011
 
+# Firmware
+device		scmi			# System Control Management Interface
+
 device		arm_doorbell		# ARM Message Handling Unit (MHU)
 
 options 	FDT
diff --git a/sys/arm64/conf/std.dev b/sys/arm64/conf/std.dev
index affe3d3014a3..1725cec626e4 100644
--- a/sys/arm64/conf/std.dev
+++ b/sys/arm64/conf/std.dev
@@ -109,6 +109,4 @@ options 	HID_DEBUG		# enable debug msgs
 device		hid			# Generic HID support
 
 # Firmware
-device		scmi			# System Control Management Interface
-
 device		mmio_sram		# Generic on-chip SRAM