From: Sophon <strongtz@yeah.net>
Date: 星期三, 19 Jan 2022 02:33:36 +0000 (+0800)
Subject: Add support for building DSDT using MS asl with wine
X-Git-Tag: v1.1~17
X-Git-Url: https://git.renegade-project.org/?a=commitdiff_plain;h=f6e7a13bd7f547c248c6fe22f6b514f0740581f5;p=edk2-sdm845.git

Add support for building DSDT using MS asl with wine

Signed-off-by: Sophon <strongtz@yeah.net>
---

diff --git a/build.sh b/build.sh
index b971e98..e1a6622 100755
--- a/build.sh
+++ b/build.sh
@@ -40,7 +40,7 @@ function _help(){
 	echo "	--all, -a:               build all devices."
 	echo "	--chinese, -c:           use Fastgit for submodule cloning."
 	echo "  --release MODE, -r MODE: Release mode for building, default is 'RELEASE', 'DEBUG' alternatively."
-	echo "	--acpi, -A:              compile acpi. (not implemented yet)"
+	echo "	--acpi, -A:              compile DSDT using MS asl with wine"
 	echo "	--clean, -C:             clean workspace and output."
 	echo "	--distclean, -D:         clean up all files that are not in repo."
 	echo "	--outputdir, -O:         output folder."
@@ -59,8 +59,8 @@ function _build(){
 	[ -d "${WORKSPACE}" ]||mkdir "${WORKSPACE}"
 	set -x
 	make -C "${_EDK2}/BaseTools"||exit "$?"
-	if "${GEN_ACPI}" && ! iasl -ve "sdm845Pkg/AcpiTables/${DEVICE}/Dsdt.asl"
-	then echo "iasl failed with ${?}" >&2;return 1
+	if "${GEN_ACPI}" && ! (cd sdm845Pkg/AcpiTables/${DEVICE}/ && wine ../bin/asl-x64.exe Dsdt.asl && cd ../../..)
+	then echo "asl build failed. Have you installed wine?" >&2;return 1
 	fi
 	# based on the instructions from edk2-platform
 	rm -f "${OUTDIR}/boot-${DEVICE}.img" uefi_img "uefi-${DEVICE}.img.gz" "uefi-${DEVICE}.img.gz-dtb"
diff --git a/sdm845Pkg/AcpiTables b/sdm845Pkg/AcpiTables
index 8f1e956..c6978f6 160000
--- a/sdm845Pkg/AcpiTables
+++ b/sdm845Pkg/AcpiTables
@@ -1 +1 @@
-Subproject commit 8f1e956bc4122642bb930ee88695fe524a1a8373
+Subproject commit c6978f6f7787b90be3f9ad452e0601add80b9b6b