Conditional compilation & remove redefinition

Description:
Conditionally compile ACPICA only if system is amd64.

Until arm64 compat is introduced, all of ACPICA needs
to be conditionally compiled like so.

After my GSoC final deliverable (Lua bindings), the next
goal will be arm64 compat.

Sponsored by: Google Summer of Code 2025
Signed-off-by: Kayla Powell (AKA Kat) <[email protected]>

Author: kpowkitty

stand/efi/acpica/Osd/OsdMemory.c renamed to stand/efi/acpica/amd64/Osd/OsdMemory.c

@@ -27,9 +27,6 @@
 #ifndef INIT_ACPI_H
 #define INIT_ACPI_H
 
-#include <efi.h>
-#include <efilib.h>
-
 #define ACPI_LOADER 0x00020000
 
 #include <contrib/dev/acpica/include/acpi.h>

stand/efi/acpica/include/init_acpi.h

@@ -24,16 +24,10 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/_inttypes.h>
-
-#include <efi.h>
-
 #include <stand.h>
-
 #include <acpi.h>
 #include <accommon.h>
 #include <acoutput.h>
-
 #include <init_acpi.h>
 
 #define _COMPONENT ACPI_LOADER

stand/efi/acpica/init_acpi.c

@@ -34,9 +34,10 @@ SRCS=	autoload.c \
 SRCS+= acpi_detect.c
 .PATH: ${.CURDIR}/../acpica
 
+.if ${MACHINE_ARCH} == "amd64"
 SRCS+= OsdMemory.c osunixxf.c
 
-.PATH: ${.CURDIR}/../acpica/amd64/Osd
+.PATH: ${.CURDIR}/../acpica/amd64/Osd/
 .PATH: ${.CURDIR}/../contrib/dev/acpica/os_specific/service_layers
 
 CFLAGS+=	-DACPI_SINGLE_THREADED \
@@ -77,6 +78,7 @@ SRCS+=	libefi.c utinit.c utglobal.c utresrc.c utlock.c utownerid.c \
 .PATH: ${SYSDIR}/contrib/dev/acpica/components/hardware
 .PATH: ${SYSDIR}/contrib/dev/acpica/components/events
 .PATH: ${SYSDIR}/contrib/dev/acpica/components/parser
+.endif # ACPICA
 
 CFLAGS+=	-I${.CURDIR}/../loader
 .if ${MK_LOADER_ZFS} != "no"

stand/efi/loader/Makefile

@@ -70,6 +70,7 @@
 #include "actbl.h"
 
 #include <init_acpi.h>
+#include <acpi_detect.h>
 
 #include "loader_efi.h"
 
@@ -1230,10 +1231,12 @@ main(int argc, CHAR16 *argv[])
 
 	devinit();
 
+#if defined(__amd64__)
 	/* Initialize ACPI Subsystem and Tables. */
 	if ((ret = init_acpi()) != 0) {
 		printf("Failed to initialize ACPI\n.");
 	}
+#endif
 
 	/*
 	 * Detect console settings two different ways: one via the command