[NOT FOR MERGE] Apu2 uefi stripped

Readme.md

@@ -15,13 +15,6 @@ To build on Linux run:
 
 `build -D SERIAL_TERMINAL=FALSE -D SECURE_BOOT_ENABLE=TRUE -D BOOTLOADER=COREBOOT -DPS2_KEYBOARD_ENABLE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc`
 
-To add PXE support on Intel PRO/1000 network cards run:
-
-`build -D NETWORK_INTEL_PRO1000=TRUE -D NETWORK_ENABLE=TRUE -D NETWORK_PXE_BOOT=TRUE -D SERIAL_TERMINAL=FALSE -D SECURE_BOOT_ENABLE=TRUE -D BOOTLOADER=COREBOOT -DPS2_KEYBOARD_ENABLE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc`
-
-To use iPXE as payload:
-`build -D NETWORK_IPXE=TRUE -D SERIAL_TERMINAL=FALSE -D SECURE_BOOT_ENABLE=TRUE -D BOOTLOADER=COREBOOT -DPS2_KEYBOARD_ENABLE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc`
-
 # License Details
 
 The majority of the content in the EDK II open source project uses a

UefiPayloadPkg/Library/CbSMMStoreLib/CorebootSMMStore.c

@@ -145,7 +145,7 @@ SMMStoreRead (
     return EFI_NO_RESPONSE;
   }
 
-  CopyMem (Buffer, (VOID *)(mSmmStoreInfo->ComBuffer + Offset), *NumBytes);
+  CopyMem (Buffer, (VOID *)(UINTN)(mSmmStoreInfo->ComBuffer + Offset), *NumBytes);
 
   return EFI_SUCCESS;
 }
@@ -186,7 +186,7 @@ SMMStoreWrite (
   mArgComBuf->raw_write.bufoffset = Offset;
   mArgComBuf->raw_write.block_id = Lba;
 
-  CopyMem ((VOID *)(mSmmStoreInfo->ComBuffer + Offset), Buffer, *NumBytes);
+  CopyMem ((VOID *)(UINTN)(mSmmStoreInfo->ComBuffer + Offset), Buffer, *NumBytes);
 
   Result = call_smm(mSmmStoreInfo->ApmCmd, SMMSTORE_CMD_RAW_WRITE, mArgComBufPhys);
   if (Result == SMMSTORE_RET_FAILURE) {

UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c

@@ -555,11 +555,6 @@ PlatformBootManagerAfterConsole (
   //
   PlatformRegisterFvBootOption (PcdGetPtr (PcdShellFile), L"UEFI Shell", LOAD_OPTION_ACTIVE);
 
-  //
-  // Register iPXE
-  //
-  PlatformRegisterFvBootOption (PcdGetPtr (PcdiPXEFile), L"iPXE Network boot", LOAD_OPTION_ACTIVE);
-
   Print (L"Pess ESC to enter Boot Manager Menu.\n");
 }
 

UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

@@ -69,7 +69,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
   gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand
   gUefiPayloadPkgTokenSpaceGuid.PcdShellFile
-  gUefiPayloadPkgTokenSpaceGuid.PcdiPXEFile
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity

UefiPayloadPkg/UefiPayloadPkg.dec

@@ -63,9 +63,6 @@ gUefiPayloadPkgTokenSpaceGuid.PcdPayloadStackTop|0x90000|UINT32|0x10000004
 ## FFS filename to find the shell application.
 gUefiPayloadPkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }|VOID*|0x10000005
 
-### FFS filename to find the ipxe application.
-gUefiPayloadPkgTokenSpaceGuid.PcdiPXEFile|{ 0xC7, 0x53, 0x86, 0xb6, 0xA1, 0xEE, 0x35, 0x44, 0xA1, 0x99, 0xA4, 0x4F, 0x59, 0xE4, 0x47, 0x6C }|VOID*|0x10000006
-
 ## Used to help reduce fragmentation in the EFI memory map
 gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x08|UINT32|0x10000012
 gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x04|UINT32|0x10000013

UefiPayloadPkg/UefiPayloadPkg.fdf

@@ -11,15 +11,15 @@
 ################################################################################
 [FD.UefiPayload]
 BaseAddress   = 0x800000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemBase
-Size          = 0x800000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize
+Size          = 0x140000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize
 ErasePolarity = 1
 BlockSize     = 0x1000
-NumBlocks     = 0x800
+NumBlocks     = 0x140
 
-0x00000000|0x040000
+0x00000000|0x020000
 FV = PEIFV
 
-0x00040000|0x7C0000
+0x00020000|0x120000
 FV = DXEFV
 
 ################################################################################
@@ -166,95 +166,29 @@ INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
 INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
 INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
-INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
+#INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
 INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
 INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 
 INF FatPkg/EnhancedFatDxe/Fat.inf
 
-#
-# Filesystem drivers
-#
-!if $(ARCH) == IA32
-INF  RuleOverride=BINARY USE = IA32 FSDrivers/exfat.inf
-INF  RuleOverride=BINARY USE = IA32 FSDrivers/ext2.inf
-INF  RuleOverride=BINARY USE = IA32 FSDrivers/ntfs.inf
-INF  RuleOverride=BINARY USE = IA32 FSDrivers/ext4.inf
-!else
-INF  RuleOverride=BINARY USE = X64 FSDrivers/exfat.inf
-INF  RuleOverride=BINARY USE = X64 FSDrivers/ext2.inf
-INF  RuleOverride=BINARY USE = X64 FSDrivers/ntfs.inf
-INF  RuleOverride=BINARY USE = X64 FSDrivers/ext4.inf
-!endif
-
 #
 # SD/eMMC Support
 #
-INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
-INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
-INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+#INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+#INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+#INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
 
 #
 # Usb Support
 #
-INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
+#INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
 INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
 INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
 INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
 INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
 INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
 
-#
-# Network Support
-#
-!include NetworkPkg/Network.fdf.inc
-
-
-#
-# Network modules (only available on X64)
-# Available at https://downloadcenter.intel.com/download/29137?v=t
-#
-!if $(NETWORK_ENABLE)
-!if $(ARCH) == IA32
-  # FIXME
-!else
-!if $(NETWORK_INTEL_GBE)
-  FILE DRIVER = D25C6DB6-0218-4BE9-802A-2841A7DA5ABE {
-    SECTION PE32 = UefiPayloadPkg/NetworkDrivers/E0027X7.EFI
-  }
-!endif
-!if $(NETWORK_INTEL_40GBE)
-  FILE DRIVER = F49F4961-BE4F-4102-A07D-111E148D0974 {
-    SECTION PE32 = UefiPayloadPkg/NetworkDrivers/E4015X5.EFI
-  }
-!endif
-!if $(NETWORK_INTEL_10GBE)
-  FILE DRIVER = 3E04EC12-5FDA-4BA8-88BB-5AB1467F280E {
-    SECTION PE32 = UefiPayloadPkg/NetworkDrivers/E7512X4.EFI
-  }
-!endif
-!if $(NETWORK_INTEL_PRO1000)
-  FILE DRIVER = BF21AF15-235B-4387-B62B-79134BC81E22 {
-    SECTION PE32 = UefiPayloadPkg/NetworkDrivers/E9112X3.EFI
-  }
-!endif
-!endif
-!endif
-
-#
-# iPXE support
-#
-!if (NETWORK_IPXE)
-  FILE FREEFORM = B68653C7-EEA1-4435-A199-A44F59E4476C {
-   SECTION PE32 = UefiPayloadPkg/NetworkDrivers/ipxe.efi
-  }
-!endif
-
-#
-# Random Number Generator
-#
-INF SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
-
 #
 # Security
 #