diff --git a/edk2-non-osi b/edk2-non-osi index d877c29..fabc1df 160000 --- a/edk2-non-osi +++ b/edk2-non-osi @@ -1 +1 @@ -Subproject commit d877c297ad39c19cfc4a953f078e339557b39a80 +Subproject commit fabc1df61a5944bc6a7bc3ca023a85648e7025ce diff --git a/edk2-platforms b/edk2-platforms index ba60f3c..3176197 160000 --- a/edk2-platforms +++ b/edk2-platforms @@ -1 +1 @@ -Subproject commit ba60f3cc562c94ed748c9b317490dfd9f1db5d23 +Subproject commit 317619784482159fab892f4649c01b4b7be404c4 diff --git a/scripts/deps.sh b/scripts/deps.sh index 3278b9b..cea29db 100755 --- a/scripts/deps.sh +++ b/scripts/deps.sh @@ -20,6 +20,7 @@ then gnat \ mtools \ nasm \ + python3-distutils \ uuid-dev \ zlib1g-dev else diff --git a/scripts/minplatform.sh b/scripts/minplatform.sh index 674c041..97a709a 100755 --- a/scripts/minplatform.sh +++ b/scripts/minplatform.sh @@ -2,10 +2,39 @@ set -e -BUILD_TYPE=RELEASE -TOOLCHAIN=GCC5 +if [ -z "$1" ] +then + echo "$0 [model]" >&2 + exit 1 +fi +MODEL="$1" + +if [ ! -d "models/${MODEL}" ] +then + echo "model '${MODEL}' not found" >&2 + exit 1 +fi +MODEL_DIR="$(realpath "models/${MODEL}")" + +case "${MODEL}" in + galp3 | galp3-b) + PLATFORM=GalagoPro3 + ;; + *) + echo "model '${MODEL}' has no matching platform" >&2 + exit 1 + ;; +esac + +rm -rf "build/${MODEL}" +mkdir -p "build/${MODEL}" + +# Copy correct VBT +mkdir -p "build/${MODEL}/${PLATFORM}/Gop" +cp -v "models/${MODEL}/vbt.rom" "build/${MODEL}/${PLATFORM}/Gop/Vbt.bin" export PACKAGES_PATH="\ +$(realpath "build/${MODEL}"):\ $(realpath edk2-platforms/Platform/Intel):\ $(realpath edk2-platforms/Silicon/Intel):\ $(realpath edk2-non-osi/Silicon/Intel):\ @@ -14,11 +43,10 @@ $(realpath FSP)" pushd edk2 >/dev/null make -C BaseTools --jobs="$(nproc)" source edksetup.sh --reconfig - - build \ - -a IA32 \ - -a X64 \ - -b "${BUILD_TYPE}" \ - -t "${TOOLCHAIN}" \ - -p KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc +popd >/dev/null + +pushd edk2-platforms/Platform/Intel >/dev/null + python3 build_bios.py \ + --platform "${PLATFORM}" \ + --RELEASE popd >/dev/null