UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / UefiPayloadPkg / BuildAndIntegrationInstructions.txt

diff --git a/UefiPayloadPkg/BuildAndIntegrationInstructions.txt b/UefiPayloadPkg/BuildAndIntegrationInstructions.txt
index 2cacd48904498e0d13393328131b81e5f0e06477..01b3d7f99298133136d50783d67eb6c276502337 100644 (file)
--- a/UefiPayloadPkg/BuildAndIntegrationInstructions.txt
+++ b/UefiPayloadPkg/BuildAndIntegrationInstructions.txt
@@ -1,6 +1,6 @@
 ================================================================================\r
 Build And Integration Instructions\r
-2019 March 27th\r
+2020 Aug 1st\r
 ================================================================================\r
 \r
 ================================================================================\r
@@ -35,27 +35,25 @@ integrate it into coreboot or Slim Bootloader firmware.
 B. HOW TO BUILD\r
 ================================================================================\r
 1. Run the below two commands in windows command prompt window:\r
-   edksetup.bat\r
+   > edksetup.bat\r
 \r
-   For debug ia32 build:\r
-   build -a IA32 -p UefiPayloadPkg\UefiPayloadPkgIa32.dsc -b DEBUG -t <ToolChain> -D BOOTLOADER=<Bootloader>\r
+   For pure X64 build:\r
+   > build -a X64 -p UefiPayloadPkg\UefiPayloadPkg.dsc -b <BuildType> -t <ToolChain>\r
+     -D BOOTLOADER=<Bootloader>\r
 \r
-   For release ia32 build:\r
-   build -a IA32 -p UefiPayloadPkg\UefiPayloadPkgIa32.dsc -b RELEASE -t <ToolChain> -D BOOTLOADER=<Bootloader>\r
+   For X64 build with IA32 entry point:\r
+   > build -a IA32 -a X64 -p UefiPayloadPkg\UefiPayloadPkg.dsc -b <BuildType> -t <ToolChain>\r
+     -D BOOTLOADER=<Bootloader>\r
 \r
-   For debug X64 build:\r
-   build -a IA32 -a X64 -p UefiPayloadPkg\UefiPayloadPkgIa32X64.dsc -b DEBUG -t <ToolChain> -D BOOTLOADER=<Bootloader>\r
-\r
-   For release X64 build:\r
-   build -a IA32 -a X64 -p UefiPayloadPkg\UefiPayloadPkgIa32X64.dsc -b RELEASE -t <ToolChain> -D BOOTLOADER=<Bootloader>\r
-\r
-   <ToolChain> is the EDK II build environment on your host. Currently it was tested\r
-   with VS2015x86 toolchain.\r
+   <BuildType> support 'DEBUG', 'RELEASE' and 'NOOPT'.\r
+   <ToolChain> is the EDK II build environment on your host. Tested with VS2015x86 toolchain.\r
    <Bootloader> could be "SBL" for Slim Bootloader and "COREBOOT" for coreboot.\r
 \r
    Refer to https://github.com/tianocore/tianocore.github.io/wiki/UDK2018-How-to-Build for\r
    details about EDK II build steps.\r
 \r
+   NOTE: Pure 32bit UEFI payload support could be added if required later.\r
+\r
 2. If build is successfully, the payload image (UEFIPAYLOAD.fd) will be generated inside the\r
    folder of Build\UefiPayloadPkg.\r
 \r
@@ -65,12 +63,14 @@ C. HOW TO INTEGRATE INTO COREBOOT
 1. Copy the payload image (UEFIPAYLOAD.fd) into the top-level directory of Coreboot source tree.\r
 2. Run "make menuconfig" in linux console to start Coreboot configuration surface.\r
 3. In the Payload section,\r
-   1) Choose "An ELF executable payload" for the option of "Add a payload".\r
-   2) Type the path of payload image for the option of "Payload path and filename".\r
-   3) Select the option of "Use LZMA compression for payloads".\r
+   1) Choose "Tianocore Payload" for the option of "Add a payload".\r
+   2) Update the path of payload image for the option of "Tianocore binary".\r
+   3) Choose "UEFIPayload" for the option of "Tianocore Payload".\r
 4. If the graphics console is required in UEFI payload, enable framebuffer initialization in coreboot.\r
    This could be done by enabling native graphics or using VGA BIOS option rom.\r
 5. Build the coreboot firmware image.\r
+6. If meet build error "E: Not a usable UEFI firmware volume.", please update Coreboot source tree\r
+   to the latest, or refer https://review.coreboot.org/c/coreboot/+/57296\r
 \r
 ================================================================================\r
 D. HOW TO INTEGRATE INTO SLIM BOOTLOADER\r