From nobody Sat Apr 27 04:45:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+42246+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42246+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1560310161; cv=none; d=zoho.com; s=zohoarc; b=S3TBUV/BpZqPL0Pptyot3IptWJpgGFcebfQx/c6CCk1XomH7gY/l6mL8qCx7GbaUuOtHuVfyxyEsdTv/jPr8HEqpVY5HvBy0jSoDPeQWQwDoLbyPXlDG3A5ncVcu2+YOUG62aBhYcRcTCMD0tqJBIstUcQX5A5i2tP2762uMB5s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560310161; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=tWehQ+yTz+RCGIcmiXdBO0+rw9qNPAxbMQBijiLd2J4=; b=SLgCukm4yLEoGBOI0O4j1SJ919QimZ+CApT5G8vcp1GjfvVI1QE7wH8huM7pToL3FV57FQIJNnCRpKqVR3EZezdPcmX2nQd9dkATLoVQVciwherDh4/JmF+S4j4E/45D4RGXb6JMosOiq3J5LGl/TDGEYjAD0OILCtoW89fqZ3U= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42246+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1560310161066151.71126432280903; Tue, 11 Jun 2019 20:29:21 -0700 (PDT) Return-Path: X-Received: from mga18.intel.com (mga18.intel.com []) by groups.io with SMTP; Tue, 11 Jun 2019 20:29:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jun 2019 20:29:20 -0700 X-ExtLoop1: 1 X-Received: from cchiu4-mobl1.gar.corp.intel.com ([10.5.240.31]) by orsmga002.jf.intel.com with ESMTP; 11 Jun 2019 20:29:18 -0700 From: "Chiu, Chasel" To: devel@edk2.groups.io Cc: Michael Kubacki , Nate DeSimone , Liming Gao Subject: [edk2-devel] [PATCH 1/2] Platform/Intel: Update Kabylake build steps. Date: Wed, 12 Jun 2019 11:29:11 +0800 Message-Id: <20190612032912.5336-2-chasel.chiu@intel.com> In-Reply-To: <20190612032912.5336-1-chasel.chiu@intel.com> References: <20190612032912.5336-1-chasel.chiu@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,chasel.chiu@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1560310160; bh=Rco12RmtX9tRlQqXUEP9z6u7Qxgv0tWj91tseePLNkA=; h=Cc:Date:From:Reply-To:Subject:To; b=qZKWtIkVvmU5DY5d40xkV/H9GqoL3uM8InCvcj+WY1dPd9N7/T/d4fwZpgfpNnR1nzE Kbuy3gGokeJ9lt7DOOpm7J4H2shcA2tHg/RmCOcKQry858IajJZIi3Ff6tkK6r2usDSfH HzdMQpFG5wIh3ZuFG1MhqcWBwfv72d3LuUg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D1905 KabylakeOpenBoardPkg no longer supported batch file build, it only supports build_bios.py. ReadMe.md should be updated and batch files should be removed. Test: both API mode and Dispatch mode can build successfully by build_bios.py Cc: Michael Kubacki Cc: Nate DeSimone Cc: Liming Gao Signed-off-by: Chasel Chiu Reviewed-by: Nate DeSimone --- Platform/Intel/Readme.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Platform/Intel/Readme.md b/Platform/Intel/Readme.md index 443fb409b3..cc0151066e 100644 --- a/Platform/Intel/Readme.md +++ b/Platform/Intel/Readme.md @@ -101,7 +101,7 @@ return back to the minimum platform caller. * ``git clone https://github.com/tianocore/edk2-non-osi.git -b devel-Min= Platform`` =20 * FSP repository - * ``git clone https://github.com/IntelFsp/FSP.git -b Kabylake`` + * ``git clone https://github.com/IntelFsp/FSP.git`` =20 ### Build =20 @@ -132,7 +132,8 @@ return back to the minimum platform caller. | --capsule | capsule build enabled | | --silent | silent build enabled | | --performance | performance build enabled | - | --fsp | fsp build enabled | + | --fsp | fsp wrapper build enabled | + | --fspapi | API mode fsp wrapper build enabled | | | =20 * For more information on build options @@ -140,6 +141,8 @@ return back to the minimum platform caller. =20 * Note * Python 2.7.16 and Python 3.7.3 compatible + * Some dependency Python scripts might only support 2.x or 3.x, if that = happened use + "py -2" or "py -3" to launch build_bios.py * This python build script has been tested on Windows 10 and Ubuntu 16.0= 4.5 LTS * See [cross-platform limitations](#Known-limitations) =20 @@ -186,12 +189,7 @@ return back to the minimum platform caller. =20 **Building with the batch scripts** -For KabylakeOpenBoardPkg -1. Open command window, go to the workspace directory, e.g. c:\Kabylake. -2. Type "cd edk2-platforms\Platform\Intel\KabylakeOpenBoardPkg\KabylakeRvp= 3". -3. Type "GitEdk2MinKabylake.bat" to setup GIT environment. -4. Type "prep" and make prebuild finish for debug build, "prep r" for rele= ase build. -5. Type "bld" to build Kaby Lake reference platform UEFI firmware image. +KabylakeOpenBoardPkg does not support batch scripts, please use build_bios= .py. =20 For PurleyOpenBoardPkg 1. Open command window, go to the workspace directory, e.g. c:\Purley. --=20 2.13.3.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42246): https://edk2.groups.io/g/devel/message/42246 Mute This Topic: https://groups.io/mt/32037607/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 27 04:45:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+42247+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42247+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1560310163; cv=none; d=zoho.com; s=zohoarc; b=XXYW2i/C70P8P7oWhUaqIFcIqBYpM4E/V6blZsXhXmQDMdwYUSeaZXveWwECyb7sR61dg/hm32ufvZ3IqjC6TQOrUmUA0NJn8emvEhjw+DQ4YBZGGhE0O+MDh/fuxYQISoOzHVDlU14DwyaRFuuXI3Rg88H3O+m9xaZZQV/EZ+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560310163; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=v+lCKwSaQEwCiLitT42zqh7UXc3s1f9PbplGOka9aoc=; b=a01rbiAlGYbJfeHDahKI2+QjaQ0AJoqF+/qJjo3bOR10REc9xbW/wcoF7d112ZAgFe6w1UeHzEEueCu2bVjtrswgzun4mawLNpsIcNrF+gKCUBN1ovO4A3zNTQ57ae+X6x4J5wZ2u/ZxOiNfy2sX5c2KeI9PNlxZUHNiNGePWP8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42247+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1560310163282192.98036563780022; Tue, 11 Jun 2019 20:29:23 -0700 (PDT) Return-Path: X-Received: from mga18.intel.com (mga18.intel.com []) by groups.io with SMTP; Tue, 11 Jun 2019 20:29:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jun 2019 20:29:22 -0700 X-ExtLoop1: 1 X-Received: from cchiu4-mobl1.gar.corp.intel.com ([10.5.240.31]) by orsmga002.jf.intel.com with ESMTP; 11 Jun 2019 20:29:20 -0700 From: "Chiu, Chasel" To: devel@edk2.groups.io Cc: Michael Kubacki , Nate DeSimone , Liming Gao Subject: [edk2-devel] [PATCH 2/2] KabylakeOpenBoardPkg: Update Kabylake build steps. Date: Wed, 12 Jun 2019 11:29:12 +0800 Message-Id: <20190612032912.5336-3-chasel.chiu@intel.com> In-Reply-To: <20190612032912.5336-1-chasel.chiu@intel.com> References: <20190612032912.5336-1-chasel.chiu@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,chasel.chiu@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1560310162; bh=KbAbvjeTWhGIa9Ma/DOi680QFgENiPgEFq6kHVuEbkc=; h=Cc:Date:From:Reply-To:Subject:To; b=TJk0MsQz+FuKg4GcgzNeVrVl0SkGcnOhoBx7xWGHHkaoHSyj90xGbdeJ+Gh/Zmuqpvo YACb2MgvnvJKByNIaTp2tiqRpCP61AWe2hFREmrqMKNmNafTwRvJkyycelcF3GSIQeXY5 EwiYxH/AGizHrKx22djMHdLqDpLfyhTliMc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D1905 Remove build batch files because they are obsolete. Use build_bios.py from now. Test: both API mode and Dispatch mode can build successfully by build_bios.py Cc: Michael Kubacki Cc: Nate DeSimone Cc: Liming Gao Signed-off-by: Chasel Chiu Reviewed-by: Nate DeSimone --- Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.bat | = 79 -----------------------------------------------------------------------= -------- Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat | = 159 -----------------------------------------------------------------------= ---------------------------------------------------------------------------= ------------- Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat | = 48 ------------------------------------------------ Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat | = 39 --------------------------------------- Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat | = 215 -----------------------------------------------------------------------= ---------------------------------------------------------------------------= --------------------------------------------------------------------- Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat | = 79 -----------------------------------------------------------------------= -------- 6 files changed, 619 deletions(-) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKab= ylake.bat b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKaby= lake.bat deleted file mode 100644 index 3bb13df80a..0000000000 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.b= at +++ /dev/null @@ -1,79 +0,0 @@ -@REM @file -@REM -@REM Copyright (c) 2017, Intel Corporation. All rights reserved.
-@REM SPDX-License-Identifier: BSD-2-Clause-Patent -@REM - -@echo off - -pushd ..\..\..\..\..\ - -@REM Set WORKSPACE environment. -set WORKSPACE=3D%cd% -echo. -echo Set WORKSPACE as: %WORKSPACE% -echo. - -@REM Check whether Git has been installed and been added to system path. -git --help >nul 2>nul -if %ERRORLEVEL% NEQ 0 ( - echo. - echo The 'git' command is not recognized. - echo Please make sure that Git is installed and has been added to system= path. - echo. - goto :EOF -) - -@REM Create the Conf directory under WORKSPACE -if not exist %WORKSPACE%\Conf ( - mkdir Conf -) - -@REM Set other environments. -@REM Basic Rule: -@REM Platform override Silicon override Core -@REM Source override Binary - -set PACKAGES_PATH=3D%WORKSPACE%\edk2-platforms\Platform\Intel;%WORKSPACE%\= edk2-platforms\Silicon\Intel;%WORKSPACE%\edk2-non-osi\Silicon\Intel;%WORKSP= ACE%\FSP;%WORKSPACE%\edk2;%WORKSPACE% -set EDK_TOOLS_BIN=3D%WORKSPACE%\edk2-BaseTools-win32 - -@if not defined PYTHON_HOME ( - @if exist C:\Python27 ( - set PYTHON_HOME=3DC:\Python27 - ) -) - -set EDK_SETUP_OPTION=3D -@rem if python is installed, disable the binary base tools. -if defined PYTHON_HOME ( - set EDK_TOOLS_BIN=3D - set EDK_SETUP_OPTION=3D--nt32 -) -pushd %WORKSPACE%\edk2 -call edksetup.bat %EDK_SETUP_OPTION% -popd -pushd %WORKSPACE% -@rem if python is installed, nmake BaseTools source and enable BaseTools s= ource build -@if defined PYTHON_HOME ( - nmake -f %BASE_TOOLS_PATH%\Makefile -) -popd - -set openssl_path=3D%WORKSPACE% - -popd - -goto :EOF - -:Help -echo. -echo Usage: -echo GitEdk2.bat [-w Workspace_Directory] (optional) [-b Branch_Name] (opt= ional) -echo. -echo -w A absolute/relative path to be the workspace. -echo Default value is the current directory. -echo. -echo -b The branch name of the repository. Currently, only master, udk2= 015, -echo trunk (same as master) and bp13 (same as udk2015) are supported. -echo Default value is master. -echo. diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat b/Pla= tform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat deleted file mode 100644 index 449660b75d..0000000000 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat +++ /dev/null @@ -1,159 +0,0 @@ -@REM @file -@REM -@REM Copyright (c) 2017, Intel Corporation. All rights reserved.
-@REM SPDX-License-Identifier: BSD-2-Clause-Patent -@REM - -:: Useage: bld [/s] [/f ] [/r] -:: -:: For a given build command, 3 options may be passed into this batch file= via command prompt: -:: 1) /s =3D Redirects all output to a file called EDK2.log(Prep.log must = be existed), which will be located at the root. -:: 2) /f =3D Defines the passing in of a single override to a feature PCD = that is used in the platform -:: DSC file. If this parameter is used, it is to be followed immediate= ly after by both the feature -:: pcd name and value. FeaturePcd is the full PCD name, like gMinPlatfo= rmPkgTokenSpaceGuid.PcdOptimizeCompilerEnable -:: 3) /r =3D Useful for faster rebuilds when no changes have been made to = .inf files. Passes -u to -:: build.exe to skip the generation of makefiles. -:: 4) rom =3D Build Bios.rom only and building SPIs will be skipped. -:: - -@echo on - -cd %WORKSPACE% - -@REM -@REM Build FSP Binary -@REM -@if not defined FSP_BINARY_BUILD goto :SkipFspBinaryBuild -@if %FSP_BINARY_BUILD% EQU FALSE goto :SkipFspBinaryBuild -@set FSP_BUILD_PARAMETER=3D/d -@set FSP_PKG_NAME=3DKabylakeFspPkg -@if /I "%TARGET%" =3D=3D "RELEASE" ( - @if "%FSP_TEST_RELEASE%"=3D=3D"TRUE" ( - set FSP_BUILD_PARAMETER=3D/tr - ) else ( - set FSP_BUILD_PARAMETER=3D/r - ) -) - -@if %FSP_WRAPPER_BUILD% EQU FALSE goto :BldEnd -:SkipFspBinaryBuild - -@if %FSP_WRAPPER_BUILD% EQU FALSE goto :SkipPatchFspBinFvsBaseAddress -del /f %WORKSPACE_FSP_BIN%\KabylakeFspBinPkg\Fsp_Rebased*.fd - -cd %WORKSPACE% - -if exist %WORKSPACE_PLATFORM%\%PROJECT%\OpenBoardPkgPcd.dsc attrib -r %WOR= KSPACE_PLATFORM%\%PROJECT%\OpenBoardPkgPcd.dsc -@call %PYTHON_HOME%\python.exe %WORKSPACE_PLATFORM%\%PLATFORM_PACKAGE%\Too= ls\Fsp\RebaseAndPatchFspBinBaseAddress.py %WORKSPACE_PLATFORM%\%PLATFORM_BO= ARD_PACKAGE%\Include\Fdf\FlashMapInclude.fdf %WORKSPACE_FSP_BIN%\KabylakeFs= pBinPkg Fsp.fd %WORKSPACE_PLATFORM%\%PROJECT%\OpenBoardPkgPcd.dsc 0x0 - -@if %ERRORLEVEL% NEQ 0 ( - @echo !!! ERROR:RebaseAndPatchFspBinBaseAddress failed!!! - set SCRIPT_ERROR=3D1 - goto :BldFail -) - -cd %WORKSPACE% - -copy /y /b %WORKSPACE_FSP_BIN%\KabylakeFspBinPkg\Fsp_Rebased_S.fd+%WORKSPA= CE_FSP_BIN%\KabylakeFspBinPkg\Fsp_Rebased_M.fd+%WORKSPACE_FSP_BIN%\Kabylake= FspBinPkg\Fsp_Rebased_T.fd %WORKSPACE_FSP_BIN%\KabylakeFspBinPkg\Fsp_Rebase= d.fd -:SkipPatchFspBinFvsBaseAddress - - -@SET SILENT_MODE=3DFALSE -@SET REBUILD_MODE=3D -@SET BUILD_ROM_ONLY=3D - -:: Loop through arguements until all are processed - -:BUILD_FLAGS_LOOP - -@if "%~1" =3D=3D "" goto BUILD_FLAGS_LOOP_DONE - -@if "%~1" =3D=3D "/f" ( - shift - goto BUILD_FLAGS_LOOP -) -@if "%~1" =3D=3D "/s" ( - SET SILENT_MODE=3DTRUE - shift - goto BUILD_FLAGS_LOOP -) -@if "%~1" =3D=3D "/r" ( - SET REBUILD_MODE=3D-u - shift - goto BUILD_FLAGS_LOOP -) -@if "%~1" =3D=3D "rom" ( - SET BUILD_ROM_ONLY=3Drom - shift - goto BUILD_FLAGS_LOOP -) -:: Unknown build flag. -shift -goto BUILD_FLAGS_LOOP -:BUILD_FLAGS_LOOP_DONE - -:: Output the build variables the user has selected. - -@echo. -@echo User Selected build options: -@echo SILENT_MODE =3D %SILENT_MODE% -@echo REBUILD_MODE =3D %REBUILD_MODE% -@echo BUILD_ROM_ONLY =3D %BUILD_ROM_ONLY% -@echo. - -@if %SILENT_MODE% EQU TRUE goto BldSilent - -call build -n %NUMBER_OF_PROCESSORS% %REBUILD_MODE% %EXT_BUILD_FLAGS% - -@if %ERRORLEVEL% NEQ 0 goto BldFail -@echo. -@echo Running postbuild.bat to complete the build process. -@echo. -call %WORKSPACE_PLATFORM%\%PROJECT%\postbuild.bat %BUILD_ROM_ONLY% -@if %SCRIPT_ERROR% EQU 1 goto BldFail -@goto BldSuccess - -:BldSilent -@if exist Build.log del Build.log - -@echo. > Build.log -@echo ********************************************************************= **** >> Build.log -@echo *********** Build.bat is launched here *******= **** >> Build.log -@echo ********************************************************************= **** >> Build.log -@echo. >> Build.log - -call build -n %NUMBER_OF_PROCESSORS% %REBUILD_MODE% %EXT_BUILD_FLAGS% 1>>B= uild.log 2>&1 - -@if %ERRORLEVEL% NEQ 0 goto BldFail -@echo. >> Build.log -@echo Running postbuild.bat to complete the build process. >> Build.log -@echo. >> Build.log -@call %WORKSPACE_PLATFORM%\%PROJECT%\postbuild.bat %BUILD_ROM_ONLY% 1>>Bui= ld.log 2>&1 -@If %SCRIPT_ERROR% EQU 1 goto BldFail - -:BldSuccess -@echo. -@echo TARGET: %TARGET% -@echo TOOL_CHAIN_TAG: %TOOL_CHAIN_TAG% -@echo BIOS location: %BUILD_DIR%\FV -@echo. -@echo The EDKII BIOS build has successfully completed! -@echo. -@REM - -@goto BldEnd - -:BldFail -cd %WORKSPACE_PLATFORM%\%PROJECT% -@echo. -@echo The EDKII BIOS Build has failed! -@echo. -@exit /b 1 - -:BldEnd -@if %SILENT_MODE% EQU TRUE ( - @if exist EDK2.log del EDK2.log - @if exist Prep.log if exist Build.log copy Prep.log+Build.log EDK2.log -) - -cd %WORKSPACE_PLATFORM%\%PROJECT% \ No newline at end of file diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat b/Pla= tform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat deleted file mode 100644 index 76c078ac05..0000000000 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat +++ /dev/null @@ -1,48 +0,0 @@ -@REM @file -@REM -@REM Copyright (c) 2017, Intel Corporation. All rights reserved.
-@REM SPDX-License-Identifier: BSD-2-Clause-Patent -@REM - -@echo off -echo. -echo Run build cleanall... -echo. - -cd .. - -if not defined WORKSPACE set WORKSPACE=3D%cd% -if not defined WORKSPACE_PLATFORM set WORKSPACE_PLATFORM=3D%cd% -if not defined WORKSPACE_SILICON set WORKSPACE_SILICON=3D%cd% - -REM build cleanall - -echo. -echo Directories to clean... -echo. - -if exist %WORKSPACE%\build rmdir /q /s %WORKSPACE%\build -if exist %WORKSPACE%\conf\.cache rmdir /q /s %WORKSPACE%\conf\.cache - -echo. -echo Files to clean... -echo. - -if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log -if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.t= xt -if exist %WORKSPACE%\Conf\FrameworkDatabase.db del %WORKSPACE%\Conf\Framew= orkDatabase.db -if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt -if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt -@REM *.c.c is generated by Catalog Debug feature across code tree. -@REM -del /s *.c.c > nul 2>&1 - -cd %WORKSPACE_PLATFORM%\%PROJECT% - -del /f /q Prep.log > nul 2>&1 -del /f /q ..\Build.log > nul 2>&1 - -echo. -echo All done... -echo. -@echo on diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat= b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat deleted file mode 100644 index 1f934fb333..0000000000 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat +++ /dev/null @@ -1,39 +0,0 @@ -@REM @file -@REM -@REM Copyright (c) 2017, Intel Corporation. All rights reserved.
-@REM SPDX-License-Identifier: BSD-2-Clause-Patent -@REM - -@REM # -@REM # Module Name: -@REM # -@REM # postbuild.bat -@REM # -@REM # Abstract: -@REM # -@REM # Post build script. -@REM # -@REM #--*/ - -@set SCRIPT_ERROR=3D0 - -@if /I not "%0" =3D=3D "%WORKSPACE_PLATFORM%\%PROJECT%\postbuild.bat" ( - if /I not "%0" =3D=3D "%WORKSPACE_PLATFORM%\%PROJECT%\postbuild" ( - echo. - echo !!! ERROR !!! This postbuild.bat must run under workspace root us= ing "%WORKSPACE_PLATFORM%\%PROJECT%\postbuild.bat" !!! - echo. - set SCRIPT_ERROR=3D1 - goto :EOF - ) -) - -@cd %WORKSPACE_PLATFORM% - -@cd %WORKSPACE% - -@if %FSP_WRAPPER_BUILD% EQU TRUE ( - del /f %WORKSPACE_FSP_BIN%\KabylakeFspBinPkg\Fsp_Rebased*.fd -) - -@if %FSP_WRAPPER_BUILD% EQU TRUE exit /b - diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat = b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat deleted file mode 100644 index 9ec800ae6f..0000000000 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat +++ /dev/null @@ -1,215 +0,0 @@ -@REM @file -@REM Pre build script. -@REM -@REM Copyright (c) 2017, Intel Corporation. All rights reserved.
-@REM SPDX-License-Identifier: BSD-2-Clause-Patent -@REM - -cd .. - - -@REM -@REM Set build capsule flag with default being OFF -@REM - -@set CAPSULE_BUILD=3D0 - -@if /I "%2" =3D=3D "TRUE" ( - @set CAPSULE_BUILD=3D1 - goto StartCapsulePrep -) - -:StartCapsulePrep -@REM -@REM Define platform specific environment variables. -@REM -if not defined WORKSPACE_PLATFORM set WORKSPACE_PLATFORM=3D%WORKSPACE%\edk= 2-platforms\Platform\Intel -if not defined WORKSPACE_SILICON set WORKSPACE_SILICON=3D%WORKSPACE%\edk2-= platforms\Silicon\Intel -if not defined WORKSPACE_PLATFORM_BIN set WORKSPACE_PLATFORM_BIN=3D%WORKSP= ACE%\edk2-non-osi\Platform\Intel -if not defined WORKSPACE_SILICON_BIN set WORKSPACE_SILICON_BIN=3D%WORKSPAC= E%\edk2-non-osi\Silicon\Intel -if not defined WORKSPACE_FSP_BIN set WORKSPACE_FSP_BIN=3D%WORKSPACE%\FSP -if not defined WORKSPACE_CORE set WORKSPACE_CORE=3D%WORKSPACE%\edk2 -if not defined PLATFORM_PACKAGE set PLATFORM_PACKAGE=3DMinPlatformPkg -if not defined PLATFORM_BOARD_PACKAGE set PLATFORM_BOARD_PACKAGE=3DKabylak= eOpenBoardPkg -if not defined BOARD set BOARD=3DKabylakeRvp3 -if not defined PROJECT set PROJECT=3D%PLATFORM_BOARD_PACKAGE%\%BOARD% - -@set SCRIPT_ERROR=3D0 - -@set CATALOG_DEBUG=3D0 - -@REM Set basic environment. -@echo. -@echo Prebuild: Run edksetup.bat batch file. -@echo. -@if %CATALOG_DEBUG% =3D=3D 0 ( - @del Conf\build_rule.txt -) -cd %WORKSPACE_CORE% -@call edksetup.bat -cd %WORKSPACE% -@set EFI_SOURCE=3D%WORKSPACE_CORE% - -@REM -@REM Setup Visual Studio environment. Order of precedence is 2012, 2013, 2= 010 and then 2008. -@REM -@REM NOTE: To override precedence set TOOL_CHAIN_TAG before calling prep.b= at. -@REM Example: set TOOL_CHAIN_TAG=3DVS2008 -@REM - -@REM Check if tool chain has not been selected and Visual Studio 2014 is i= nstalled. -@if not defined TOOL_CHAIN_TAG ( - if defined VS140COMNTOOLS ( - set TOOL_CHAIN_TAG=3DVS2015 - ) -) - -@REM If Visual Studio 2014 is selected by priority or by preference, setup= the environment variables. -@if /I "%TOOL_CHAIN_TAG%"=3D=3D"VS2015" ( - echo. - echo Prebuild: Set the VS2015 environment. - echo. - if not defined VSINSTALLDIR call "%VS140COMNTOOLS%\vsvars32.bat" - if /I "%VS140COMNTOOLS%" =3D=3D "C:\Program Files\Microsoft Visual Studi= o 14.0\Common7\Tools\" ( - set TOOL_CHAIN_TAG=3DVS2015 - ) else ( - set TOOL_CHAIN_TAG=3DVS2015x86 - ) -) - -@REM Check if tool chain has not been selected and Visual Studio 2013 is i= nstalled. -@if not defined TOOL_CHAIN_TAG ( - if defined VS120COMNTOOLS ( - set TOOL_CHAIN_TAG=3DVS2013 - ) -) - -@REM If Visual Studio 2013 is selected by priority or by preference, setup= the environment variables. -@if /I "%TOOL_CHAIN_TAG%"=3D=3D"VS2013" ( - echo. - echo Prebuild: Set the VS2013 environment. - echo. - if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat" - if /I "%VS120COMNTOOLS%" =3D=3D "C:\Program Files\Microsoft Visual Studi= o 12.0\Common7\Tools\" ( - set TOOL_CHAIN_TAG=3DVS2013 - ) else ( - set TOOL_CHAIN_TAG=3DVS2013x86 - ) -) - -@REM If no supported version of Visual Studio was detected, return an erro= r. -@if not defined TOOL_CHAIN_TAG ( - echo. - echo !!! ERROR !!! Visual Studio not installed correctly!!! - echo. - set SCRIPT_ERROR=3D1 - goto :EndPreBuild -) - -echo Show CL revision -cl - -@REM Set build TARGET. -@if /I "%1" =3D=3D "" ( - set TARGET=3DDEBUG - set TARGET_SHORT=3DD -) else if /I "%1" =3D=3D "DEBUG" ( - set TARGET=3DDEBUG - set TARGET_SHORT=3DD -) else if /I "%1" =3D=3D "TEST_RELEASE" ( - set TARGET=3DRELEASE - set TARGET_SHORT=3DR -) else if /I "%1" =3D=3D "RELEASE" ( - set TARGET=3DRELEASE - set TARGET_SHORT=3DR -) else if /I "%1" =3D=3D "RELEASE_PDB" ( - set TARGET=3DRELEASE - set TARGET_SHORT=3DR -) else ( - echo. - echo !!! ERROR !!! Incorrect TARGET option for prebuild.bat. !!! - echo. - set SCRIPT_ERROR=3D1 - goto :EndPreBuild -) - -@set BUILD_DIR_PATH=3D%WORKSPACE%\Build\%PROJECT%\%TARGET%_%TOOL_CHAIN_TAG% -@set BUILD_DIR=3DBuild\%PROJECT%\%TARGET%_%TOOL_CHAIN_TAG% -@set BUILD_X64=3D%BUILD_DIR_PATH%\X64 -@set BUILD_IA32=3D%BUILD_DIR_PATH%\IA32 - - -@echo. -@echo Prebuild: Set build environment. -@echo. -@if not exist %BUILD_DIR_PATH% ( - mkdir %BUILD_DIR_PATH% -) - -@findstr /V "ACTIVE_PLATFORM TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_= CONF" %WORKSPACE%\Conf\target.txt > %BUILD_DIR_PATH%\target.txt -@echo ACTIVE_PLATFORM =3D %WORKSPACE_PLATFORM%/%PLATFORM_BOARD_PACKAGE%/%B= OARD%/OpenBoardPkg.dsc >> %BUILD_DIR_PATH%\target.txt -@echo TARGET =3D %TARGET% >> %BU= ILD_DIR_PATH%\target.txt -@echo TARGET_ARCH =3D IA32 X64 >> %BU= ILD_DIR_PATH%\target.txt -@echo TOOL_CHAIN_TAG =3D %TOOL_CHAIN_TAG% >> %BU= ILD_DIR_PATH%\target.txt -@echo BUILD_RULE_CONF =3D Conf/build_rule.txt >> %BU= ILD_DIR_PATH%\target.txt -@move /Y %BUILD_DIR_PATH%\target.txt Conf - -@if %CAPSULE_BUILD% =3D=3D 1 ( - goto EndCapsulePrep -) - -@REM -@REM Set %FSP_WRAPPER_BUILD% -@REM -@set FSP_WRAPPER_BUILD=3DTRUE - -@if %FSP_WRAPPER_BUILD% EQU TRUE ( - @REM Create dummy Fsp_Rebased_S_padded.fd to build the BiosInfo.inf if i= t is wrapper build, due to the SECTION inclusion - echo "" > %WORKSPACE_FSP_BIN%\KabylakeFspBinPkg\Fsp_Rebased_S_padded.fd - attrib -r %WORKSPACE_FSP_BIN%\KabylakeFspBinPkg\Fsp_Rebased_S_padded.fd -) - -@REM -@REM Set %PERFORMANCE_BUILD% -@REM -@set PERFORMANCE_BUILD=3DFALSE - -@REM -@REM Set %FSP_BINARY_BUILD% and %FSP_TEST_RELEASE% -@REM -@set FSP_BINARY_BUILD=3DFALSE -@set FSP_TEST_RELEASE=3DFALSE - -@if "FSP_BINARY_BUILD"=3D=3D"TRUE" ( - @if %FSP_WRAPPER_BUILD% EQU FALSE goto :EndPreBuild -) - -@if not exist %BUILD_X64% ( - mkdir %BUILD_X64% -) - -@set SECURE_BOOT_ENABLE=3DFALSE - -@REM -@REM Skip BIOS_SIZE_OPTION if it is predefined -@REM -@if NOT "%BIOS_SIZE_OPTION%" =3D=3D "" goto BiosSizeDone - -@set BIOS_SIZE_OPTION=3D - -@REM default size option is 7M -@set BIOS_SIZE_OPTION=3D-DBIOS_SIZE_OPTION=3DSIZE_70 - -:BiosSizeDone -@echo BIOS_SIZE_OPTION=3D%BIOS_SIZE_OPTION% - -@echo EFI_SOURCE =3D %EFI_SOURCE% -@echo TARGET =3D %TARGET% -@echo TARGET_ARCH =3D IA32 X64 -@echo TOOL_CHAIN_TAG =3D %TOOL_CHAIN_TAG% -@echo WORKSPACE =3D %WORKSPACE% -@echo WORKSPACE_CORE =3D %WORKSPACE_CORE% -@echo EXT_BUILD_FLAGS =3D %EXT_BUILD_FLAGS% -@echo. -:EndPreBuild -cd %WORKSPACE_PLATFORM%\%PROJECT% diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat b/Pl= atform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat deleted file mode 100644 index 2ab785f27c..0000000000 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat +++ /dev/null @@ -1,79 +0,0 @@ -@REM @file -@REM -@REM Copyright (c) 2017, Intel Corporation. All rights reserved.
-@REM SPDX-License-Identifier: BSD-2-Clause-Patent -@REM - -@echo OFF -@set PrepRELEASE=3DDEBUG -@set SILENT_MODE=3DFALSE -@set CapsuleBuild=3DFALSE - -@set EXT_CONFIG_CLEAR=3D -@set EXT_BUILD_FLAGS=3D - -:CmdLineParse -if "" =3D=3D "%1" ( - goto Continue -) else if "r" =3D=3D "%1" ( - set PrepRELEASE=3DRELEASE -) else if "tr" =3D=3D "%1" ( - set PrepRELEASE=3DTEST_RELEASE -) else if "rp" =3D=3D "%1" ( - set PrepRELEASE=3DRELEASE_PDB -) else if "s" =3D=3D "%1" ( - set SILENT_MODE=3DTRUE -) else if "help" =3D=3D "%1" ( - goto PrepHelp -) else ( - echo Invalid input arguments: %1 - echo. - goto PrepHelp -) -SHIFT -goto CmdLineParse - -:PrepHelp -@echo Preparation for BIOS build. -@echo. -@echo prep [r][rp][s][help] -@echo. -@echo r To do release build. Default is debug build. See note 1 -@echo rp To do release build with Symbols - For source level debu= gging. See note 1 -@echo s To build in silent mode. . See note 1 -@echo. -@echo 1) Re-running prep without these arguments cannot be used for -@echo incremental build. Hence, these inputs must be supplied each time -@echo prep are desired to be re-run. -@echo. -goto PrepDone - -:Continue -@echo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -if exist %WORKSPACE%\Prep.log del %WORKSPACE%\Prep.log - -:PrepReleaseCheck - -@if %SILENT_MODE% EQU TRUE goto BldSilent - -call prebuild.bat %PrepRelease% %CapsuleBuild% -goto PrePrepDone - -:BldSilent -@echo ********************************************************************= **** >> %WORKSPACE%\Prep.log -@echo *********** Prebuild.bat is launched here *******= **** >> %WORKSPACE%\Prep.log -@echo ********************************************************************= **** >> %WORKSPACE%\Prep.log -call prebuild.bat %PrepRelease% %CapsuleBuild% 1>>%WORKSPACE%\Prep.log 2>&1 - -:PrePrepDone -@If %SCRIPT_ERROR% EQU 1 goto PrepFail -@goto PrepDone - -:PrepFail -@echo. -@echo !! The EDKII BIOS build has failed in prep! -@echo. -@exit /b 1 - -:PrepDone \ No newline at end of file --=20 2.13.3.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42247): https://edk2.groups.io/g/devel/message/42247 Mute This Topic: https://groups.io/mt/32037609/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-