X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Externals%2FACPICA%2FMakefile;h=950f0abd15b827b7f7f1ea7a74ad46a73c537af3;hb=13078002b01ee4f63eb2001d2ef479a2a006ea32;hp=97d3414bc52313503a3ddf5499c1dc1ed8397702;hpb=479d0634670b58da044bc58149662adba0ad1d0b;p=tpg%2Facess2.git

diff --git a/Externals/ACPICA/Makefile b/Externals/ACPICA/Makefile
index 97d3414b..950f0abd 100644
--- a/Externals/ACPICA/Makefile
+++ b/Externals/ACPICA/Makefile
@@ -2,7 +2,9 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../../Makefile.cfg
 
-BIN := ../bin-$(ARCH)/libacpica.a
+ACPI_DEBUG ?= no
+
+BIN := ../Output/$(ARCH)-kernel/libacpica.a
 
 _VERS := $(patsubst acpica-unix-%.tar.gz,%,$(wildcard acpica-unix-*.tar.gz))
 _VERS := $(sort $(_VERS))
@@ -10,9 +12,9 @@ _LATEST := $(lastword $(_VERS))
 
 ifeq ($(ACPICAVER),)
  ifeq ($(_LATEST),)
-  $(warning Unable to find an archive matching acpica-unix-%.tar.gz)
+  $(warning Unable to find an archive matching acpica-unix-%.tar.gz in Externals/ACPICA)
   $(warning Go to https://www.acpica.org/downloads/ to get it)
-  $(error No ACPICA archive found)
+  $(error No ACPICA archive found, disable ACPI with 'USE_ACPICA=0')
  endif
  
  ifneq ($(_LATEST),$(_VERS))
@@ -30,6 +32,9 @@ CPPFLAGS	+= -I $(KERNELDIR)include -I$(KERNELDIR)arch/$(ARCHDIR)/include -D_MODU
 CPPFLAGS        += -I $(ACPICAROOT)source/include -D _ACESS -D __KERNEL__
 CPPFLAGS	+= -D ARCH=$(ARCH) -D ARCHDIR=$(ARCHDIR) -D PLATFORM=\"$(PLATFORM)\" -D ARCHDIR_IS_$(ARCHDIR)=1 -D PLATFORM_is_$(PLATFORM)=1
 CPPFLAGS	+= -D KERNEL_VERSION=$(KERNEL_VERSION) -ffreestanding
+ifneq ($(ACPI_DEBUG),no)
+  CPPFLAGS += -D ACPI_DEBUG_OUTPUT=1 -D ACPI_DISASSEMBLER=1
+endif
 CFLAGS  	+= -Wall -fno-stack-protector -Wstrict-prototypes -std=gnu99 -g
 
 SRCS := $(wildcard $(COMPDIR)*/*.c)