7469 loader should use acpica provided by OS

Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com> Approved by: Gordon Ross <gwr@nexenta.com>
illumos · Oct 15, 2016 · 8ab1c3f · 8ab1c3f
1 parent a1964bd
commit 8ab1c3f
Show file tree

Hide file tree

Showing 324 changed files with 3 additions and 211,136 deletions.
diff --git a/usr/src/boot/sys/boot/efi/boot1/Makefile b/usr/src/boot/sys/boot/efi/boot1/Makefile
@@ -20,8 +20,6 @@ CC=	$(GCC_ROOT)/bin/gcc
 LD=	$(GNU_ROOT)/bin/gld
 OBJCOPY= $(GNU_ROOT)/bin/gobjcopy
 OBJDUMP= $(GNU_ROOT)/bin/gobjdump
-OBJCOPY= /code/binutils-gdb/binutils/objcopy
-OBJDUMP= /code/binutils-gdb/binutils/objdump
 
 PROG=		boot1.sym
 MACHINE=$(MACH64)
@@ -40,7 +38,7 @@ CPPFLAGS=	-nostdinc
 CPPFLAGS +=	-I.
 CPPFLAGS +=	-I./../include
 CPPFLAGS +=	-I./../include/${MACHINE}
-CPPFLAGS +=	-I./../../../contrib/dev/acpica/include
+CPPFLAGS +=	-I$(SRC)/uts/intel/sys/acpi
 CPPFLAGS +=	-I./../../../../include
 CPPFLAGS +=	-I./../../../sys
 CPPFLAGS +=	-I./../../..

diff --git a/usr/src/boot/sys/boot/efi/loader/Makefile b/usr/src/boot/sys/boot/efi/loader/Makefile
@@ -43,7 +43,7 @@ CPPFLAGS +=	-I.
 CPPFLAGS +=	-I./arch/${MACHINE}
 CPPFLAGS +=	-I./../include
 CPPFLAGS +=	-I./../include/${MACHINE}
-CPPFLAGS +=	-I./../../../contrib/dev/acpica/include
+CPPFLAGS +=	-I$(SRC)/uts/intel/sys/acpi
 CPPFLAGS +=	-I./../../..
 CPPFLAGS +=	-I./../../i386/libi386
 CPPFLAGS +=	-I./../../zfs

diff --git a/usr/src/boot/sys/boot/i386/libi386/Makefile b/usr/src/boot/sys/boot/i386/libi386/Makefile
@@ -80,7 +80,7 @@ CFLAGS += -Dalloca=__builtin_alloca
 
 CFLAGS +=	-I../../common -I../common \
 		-I../btx/lib \
-		-I../../../contrib/dev/acpica/include \
+		-I$(SRC)/uts/intel/sys/acpi \
 		-I../../.. -I.
 # the location of libstand
 CFLAGS +=	-I../../../../lib/libstand/

diff --git a/usr/src/boot/sys/contrib/dev/acpica/acpica_prep.sh b/usr/src/boot/sys/contrib/dev/acpica/acpica_prep.sh