From: Marijan Limov <marijan.limov@gmail.com>
Date: 星期四, 19 May 2022 23:42:02 +0000 (+0200)
Subject: Split beryllium into beryllium-tianma and beryllium-ebbg
X-Git-Tag: v2.0rc2~8
X-Git-Url: https://git.renegade-project.org/?a=commitdiff_plain;h=13af52a1bd167e93b718bbc0a0269d9a3f217e2b;p=edk2-sdm845.git

Split beryllium into beryllium-tianma and beryllium-ebbg
---

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e051c55..9df6f5b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,7 +26,8 @@ jobs:
           - enchilada
           - fajita
           - polaris
-          - beryllium
+          - beryllium-tianma
+          - beryllium-ebbg
           - perseus
           - nx616j
           - m1892
@@ -54,7 +55,7 @@ jobs:
       - name: Install requires packages
         run: |
           sudo apt-get update
-          sudo apt-get -y install build-essential uuid-dev iasl nasm gcc-aarch64-linux-gnu python3-distutils python3-pil python3-git gettext
+          sudo apt-get -y install build-essential uuid-dev iasl nasm gcc-aarch64-linux-gnu python3-distutils python3-pil python3-git gettext wine
 
       - name: Build device ${{ matrix.device }}
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 658b849..f14583f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,8 @@ jobs:
       matrix:
         device:
           - akershus
-          - beryllium
+          - beryllium-tianma
+          - beryllium-ebbg
           - dipper
           - draco
           - enchilada
@@ -44,7 +45,7 @@ jobs:
       - name: Install requires packages
         run: |
           sudo apt-get update
-          sudo apt-get -y install build-essential uuid-dev iasl nasm gcc-aarch64-linux-gnu python3-distutils python3-pil python3-git gettext
+          sudo apt-get -y install build-essential uuid-dev iasl nasm gcc-aarch64-linux-gnu python3-distutils python3-pil python3-git gettext wine
 
       - name: Build device ${{ matrix.device }}
         run: |
diff --git a/Dockerfile b/Dockerfile
index 756ce33..123d1ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get -y install build-essential uuid-dev iasl nasm gcc-aarch64-linux-gnu abootimg python3-distutils python3-pil python3-git gettext locales \
+RUN apt-get update && apt-get -y install build-essential uuid-dev iasl nasm gcc-aarch64-linux-gnu abootimg python3-distutils python3-pil python3-git gettext locales wine \
     && rm -rf /var/lib/apt/lists/* \
     && locale-gen en_US.UTF-8
 ENV LANG en_US.utf8
diff --git a/build.sh b/build.sh
index ad36fa8..dc3b0f0 100755
--- a/build.sh
+++ b/build.sh
@@ -6,7 +6,8 @@ DEVICES=(
 	enchilada
 	fajita
 	polaris
-	beryllium
+	beryllium-tianma
+	beryllium-ebbg
 	perseus
 	nx616j
 	m1882
@@ -59,11 +60,26 @@ function _build(){
 	[ -d "${WORKSPACE}" ]||mkdir "${WORKSPACE}"
 	set -x
 	make -C "${_EDK2}/BaseTools"||exit "$?"
+	
+	EXT="" #support for both panels of beryllium
+	if [ "${DEVICE}" == "beryllium-tianma" ]
+	then cp sdm845Pkg/AcpiTables/beryllium/panel-tianma.asl sdm845Pkg/AcpiTables/beryllium/panel.asl
+		DEVICE="beryllium"
+		EXT="-tianma"
+		GEN_ACPI=true
+	fi
+	if [ "${DEVICE}" == "beryllium-ebbg" ]
+	then cp sdm845Pkg/AcpiTables/beryllium/panel-ebbg.asl sdm845Pkg/AcpiTables/beryllium/panel.asl
+		DEVICE="beryllium"
+		EXT="-ebbg"
+		GEN_ACPI=true
+	fi
+	
 	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"
+	rm -f "${OUTDIR}/boot-${DEVICE}${EXT}.img" uefi_img "uefi-${DEVICE}.img.gz" "uefi-${DEVICE}.img.gz-dtb"
 	case "${MODE}" in
 		RELEASE)_MODE=RELEASE;;
 		*)_MODE=DEBUG;;
@@ -100,9 +116,9 @@ function _build(){
 		--os_version "${BOOTIMG_OS_VERSION}" \
 		--os_patch_level "${BOOTIMG_OS_PATCH_LEVEL}" \
 		--header_version 1 \
-		-o "${OUTDIR}/boot-${DEVICE}.img" \
+		-o "${OUTDIR}/boot-${DEVICE}${EXT}.img" \
 		||return "$?"
-	echo "Build done: ${OUTDIR}/boot-${DEVICE}.img"
+	echo "Build done: ${OUTDIR}/boot-${DEVICE}${EXT}.img"
 	set +x
 }