From 1c818e41266764c3da89186f0471462c2fa02d6e Mon Sep 17 00:00:00 2001 From: Zhuowei Zhang Date: Sat, 23 Feb 2019 19:04:49 -0800 Subject: [PATCH] Replace UEFI Shell with a Linux kernel to test booting --- .gitignore | 1 + Pixel3XL/Pixel3XL.dsc | 22 ---------------------- Pixel3XL/Pixel3XL.fdf | 15 ++++++++------- 3 files changed, 9 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 70f7308..df22e30 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ uefi.img +linux.efi diff --git a/Pixel3XL/Pixel3XL.dsc b/Pixel3XL/Pixel3XL.dsc index 69ba90c..0b8e704 100644 --- a/Pixel3XL/Pixel3XL.dsc +++ b/Pixel3XL/Pixel3XL.dsc @@ -259,25 +259,3 @@ NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } - ShellPkg/Application/Shell/Shell.inf { - - ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf - NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf - NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf - NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf - NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf - NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf - NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf - NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf - NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf - HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf - - gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE - gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 - } -!ifdef $(INCLUDE_TFTP_COMMAND) - ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf -!endif #$(INCLUDE_TFTP_COMMAND) diff --git a/Pixel3XL/Pixel3XL.fdf b/Pixel3XL/Pixel3XL.fdf index f4734cc..983cd7f 100644 --- a/Pixel3XL/Pixel3XL.fdf +++ b/Pixel3XL/Pixel3XL.fdf @@ -26,12 +26,12 @@ [FD.PIXEL3XL_UEFI] BaseAddress = 0xd0000000|gArmTokenSpaceGuid.PcdFdBaseAddress # The base address of the Firmware in NOR Flash. -Size = 0x00200000|gArmTokenSpaceGuid.PcdFdSize # The size in bytes of the FLASH Device +Size = 0x01000000|gArmTokenSpaceGuid.PcdFdSize # The size in bytes of the FLASH Device ErasePolarity = 1 # This one is tricky, it must be: BlockSize * NumBlocks = Size BlockSize = 0x00001000 -NumBlocks = 0x200 +NumBlocks = 0x1000 ################################################################################ # @@ -68,7 +68,7 @@ DATA = { 0x00, 0x00, 0x00, 0x00 # res5 } -0x00008000|0x001f8000 +0x00008000|0xff8000 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize FV = FVMAIN_COMPACT @@ -200,10 +200,6 @@ READ_LOCK_STATUS = TRUE # # UEFI applications # - INF ShellPkg/Application/Shell/Shell.inf -!ifdef $(INCLUDE_TFTP_COMMAND) - INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf -!endif #$(INCLUDE_TFTP_COMMAND) # # Bds @@ -214,6 +210,11 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf INF MdeModulePkg/Application/UiApp/UiApp.inf + # Linux (pretends to be uefi shell) + FILE APPLICATION = 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1 { + SECTION PE32 = Pixel3XL/linux.efi + } + [FV.FVMAIN_COMPACT] FvAlignment = 8 ERASE_POLARITY = 1