Split beryllium into beryllium-tianma and beryllium-ebbg

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e051c55c251937409b8359d4e6d75dbf3b09bf2b..9df6f5bd6f11f338025feb1b10b3676c9d7a7e70 100644 (file)
--- 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 658b8494cb7331754c5297d6a73b3605ca1b109c..f14583fa53b4fd222799bd47d674ebd0c649606d 100644 (file)
--- 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 756ce33c672efb1a95c377174ae2c8b482f0fb3e..123d1ca2ab3f9909e69014b6f48d50c2dc62a242 100644 (file)
--- 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 ad36fa8b016d420bc796b91fb24ed4149a5a8a5a..dc3b0f0c216fe914c00c4a5d79d5c987b288bb78 100755 (executable)
--- 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
 }