checkpointing a config that boots to user space, but serial still does not work

This commit is contained in:
Trammell hudson 2018-01-19 15:53:05 -05:00
parent 07f7653999
commit 4895e4704f
Failed to extract signature
3 changed files with 67 additions and 180 deletions

View File

@ -137,16 +137,17 @@ $(call map,build-ffs,$(dxe-y))
$(build)/$(linux_dir)/arch/x86/boot/bzImage: linux.intermediate
# Generate a firmware file with a well known guid
# Create a compressed FFS from a volume image
%.lz.ffs: %.full.vol
./bin/create-ffs \
--compress \
--type FIRMWARE_VOLUME_IMAGE \
-o "$@" \
"$^"
# If you have to fit within the normal UEFI image, the volume is
# limited to 0x47 blocks.
#
# But you can also replace the entire region from 0x310000
# up to PEI at 0xE40000, which leaves us almost 11 MB of space.
#
# x3550m5 -- pei starts at 0xb00000, bios is from 0x1000 == 0xaff
nerf-$(BOARD).full.vol: $(addsuffix .ffs,$(dxe-y)) Acpi-data.$(BOARD).ffs # blobs/r630/acpi-data.ffs.uncompressed
# Generate a firmware file with a well known guid
nerf-$(BOARD).full.vol: $(addsuffix .ffs,$(dxe-y)) # Acpi-data.$(BOARD).ffs # blobs/r630/acpi-data.ffs.uncompressed
$(EDK2_DIR)/GenFv \
--numberblock $$[$(NERF_FULL_SIZE)/0x1000] \
--blocksize 0x1000 \
@ -154,15 +155,7 @@ nerf-$(BOARD).full.vol: $(addsuffix .ffs,$(dxe-y)) Acpi-data.$(BOARD).ffs # blo
-o $@ \
$(addprefix -f ,$^)
@head -2 $@.txt
-$(RM) $@.txt $@.map
#nerf-$(BOARD).lz.ffs: nerf-$(BOARD).full.vol
nerf-$(BOARD).lz.ffs: vendor-$(BOARD).full.rom
./bin/create-ffs \
--compress \
--type FIRMWARE_VOLUME_IMAGE \
-o "$@" \
"$^"
@-$(RM) $@.txt $@.map
nerf-$(BOARD).vol: nerf-$(BOARD).lz.ffs
$(EDK2_DIR)/GenFv \
@ -172,7 +165,8 @@ nerf-$(BOARD).vol: nerf-$(BOARD).lz.ffs
-o $@ \
$(addprefix -f ,$^)
@head -2 $@.txt
-$(RM) $@.txt $@.map
@-$(RM) $@.txt $@.map
# You must provide your own r630.rom as input for the ME and PEI sections.
@ -203,7 +197,7 @@ vendor-files-y := $(shell awk \
blobs/$(BOARD)/vendor-files.txt \
)
vendor-$(BOARD).full.rom: \
vendor-$(BOARD).full.vol: \
EmuVariableRuntimeDxe.ffs \
$(vendor-files-y) \
Linux.ffs \
@ -215,6 +209,17 @@ vendor-$(BOARD).full.rom: \
--FvNameGuid 4652454e-482f-6165-6473-2f4c696e7578 \
-o $@ \
$(addprefix -f ,$^)
@head -2 $@.txt
@-$(RM) $@.txt $@.map
vendor-$(BOARD).vol: vendor-$(BOARD).lz.ffs
$(EDK2_DIR)/GenFv \
--numberblock $$[$(NERF_SIZE)/0x1000] \
--blocksize 0x1000 \
--FvNameGuid decafbad-89ab-cdef-5a5a-5a5a5a5a5a5a \
-o $@ \
$(addprefix -f ,$^)
@head -2 $@.txt
@-$(RM) $@.txt $@.map
nerf.intermediate: edk2.intermediate nerf-$(BOARD).rom

View File

@ -22,19 +22,19 @@ e9bbeba6-5e97-487e-80e2-528a4a14b326 FpkConfigUpdateWolfPass
57e81aa9-9b3f-4398-a925-1d13b53ca265 DMIMarginUpdateDxeWolfPass
788dd6a1-f1ee-4bba-a925-c0e7d66271bd SystemBoardDxe
2e6a521c-f697-402d-9774-98b2b7e140f3 PlatformType
bfe40e55-e8a9-43eb-9005-59c0522fd256 IioAspmWA
# bfe40e55-e8a9-43eb-9005-59c0522fd256 IioAspmWA
825ac08e-16c8-4b9a-8fdb-ec2bfeb813cf SpdRawData
dae6b815-877d-4597-a637-cfcfccc431ed PlatformStatusCodeHandlerDxe
d3be40fc-81d9-45fb-b8b0-f4774e91bc9d SysconfigSysinfoHide
b88303f6-2e0e-41cc-8510-f5892bf1d9d9 PlatformVariableInitDxe
9f7dcade-11ea-448a-a46f-76e003657dd1 VariableSmmRuntimeDxe
417b885b-1737-4bbe-9b09-4414696d93ac StartupMarkerFileBootOrder
96fcec89-bbd9-4413-93cd-144631db7431 SmbiosPcTable
213609e5-3451-4395-9ed6-8ceceadb74a7 SecureBootErrorHandlerDxe
99677785-7339-4fab-b15a-ceb7354cccaa SecureBootProvisionDxe
3bc456c8-c12c-4c86-9902-73b183a1fb72 SecureBootSetup
d564771b-573e-4dd5-a6f2-f4c30c610815 SecureBootCtrlDxe
62dc08ac-a651-4ee9-af81-eaa9261e9780 S3NvramSave
# 9f7dcade-11ea-448a-a46f-76e003657dd1 VariableSmmRuntimeDxe
# 417b885b-1737-4bbe-9b09-4414696d93ac StartupMarkerFileBootOrder
# 96fcec89-bbd9-4413-93cd-144631db7431 SmbiosPcTable
# 213609e5-3451-4395-9ed6-8ceceadb74a7 SecureBootErrorHandlerDxe
# 99677785-7339-4fab-b15a-ceb7354cccaa SecureBootProvisionDxe
# 3bc456c8-c12c-4c86-9902-73b183a1fb72 SecureBootSetup
# d564771b-573e-4dd5-a6f2-f4c30c610815 SecureBootCtrlDxe
#62dc08ac-a651-4ee9-af81-eaa9261e9780 S3NvramSave
7f8d35bd-0ce3-4654-b5d3-73fc4b38aabf PlatformEarlyDxe
bae7599f-3c6b-43b7-bdf0-9ce07aa91aa6 CpuIoDxe
a19b1fe7-c1bc-49f8-875f-54a5d542443f CpuIo2Dxe
@ -49,17 +49,17 @@ f099d67f-71ae-4c36-b2a3-dceb0eb2b7d8 WatchdogTimer
378d7b65-8da9-4773-b6e4-a47826a833e1 PcRtc
b601f8c4-43b7-4784-95b1-f4226cb40cee RuntimeDxe
d58ebce1-af26-488d-be66-c164417f8c13 PciHostBridge
3ffcae95-23cf-4967-94f5-16352f68e43b PpmInitialize
# 3ffcae95-23cf-4967-94f5-16352f68e43b PpmInitialize
4143c17d-54bc-4903-9958-2454216bb21e LpcPlatform
2a537c0e-5d9c-45d3-a6ce-3ad02d3e3b53 ReserveMem
ad608272-d07f-4964-801e-7bd3b7888652 MonotonicCounterRuntimeDxe
f80697e9-7fd6-4665-8646-88e33ef71dfc SecurityStubDxe
42857f0a-13f2-4b21-8a23-53d3f714b840 CapsuleRuntimeDxe
37d00905-5a90-4b82-9d44-011990b28a8d CpPcBiosId
# 37d00905-5a90-4b82-9d44-011990b28a8d CpPcBiosId
9622e42c-8e38-4a08-9e8f-54f784652f6b AcpiTableDxe
4495e47e-42a9-4007-8c17-b6664f909d04 BlockIoDxe
9b680fce-ad6b-4f3a-b60b-f59899003443 DevicePathDxe
aa7b4695-00b4-4468-ad92-99370ac031c5 LegacyRegion2
# aa7b4695-00b4-4468-ad92-99370ac031c5 LegacyRegion2
96b5c032-df4c-4b6e-8232-438dcf448d0e NullMemoryTestDxe
de23acee-cf55-4fb6-aa77-984ab53de823 PchInitDxe
e052d8a6-224a-4c32-8d37-2e0ae162364d PchSmbusDxe
@ -71,53 +71,53 @@ fc1b7640-3466-4c06-b1cc-1c935394b5c2 PchSerialGpio
bb1fbd4f-2e30-4793-9bed-74f672bc8ffe PchResetRuntime
5aab83e5-f027-4ca7-bfd0-16358cc9e453 WdtDxe
253e85e9-993b-439b-b74c-6120f77b4723 PlatformReset
bb55f6b2-5a6f-4cd0-b128-6243d73acc97 PlatformPreVariableDxe
# bb55f6b2-5a6f-4cd0-b128-6243d73acc97 PlatformPreVariableDxe
433fbed1-d908-434d-a10b-4b0524537375
13381490-aa8f-466a-8c65-26a0247c8d00 DFSDxe
# 13381490-aa8f-466a-8c65-26a0247c8d00 DFSDxe
ad70855e-0cc5-4abf-8979-be762a949ea3 IncompatiblePciDeviceSupport
f34f24d7-7531-4b83-9116-bd03fcf99878 SyscfgSyncDxe
#f34f24d7-7531-4b83-9116-bd03fcf99878 SyscfgSyncDxe
e2441b64-7ef4-41fe-b3a3-8caa7f8d3017 PciPlatform
02a6de33-3ea9-4c17-8ea2-5681cc7afded VMDVROC2
dc2378e1-11d3-49f7-9425-61f8430011b8 VMDVROC1
# 02a6de33-3ea9-4c17-8ea2-5681cc7afded VMDVROC2
# dc2378e1-11d3-49f7-9425-61f8430011b8 VMDVROC1
93b80004-9fb3-11d4-9a3a-0090273fc14d PciBusDxe
6a3def38-0a45-4107-a74e-abf2b8eaed86 MemorySubClass
c8885b5c-48ba-44e1-b992-7f3dc826b36f PlatformDevsUpdate
# c8885b5c-48ba-44e1-b992-7f3dc826b36f PlatformDevsUpdate
f9d88642-0737-49bc-81b5-6889cd57d9ea SmbiosDxe
d27fed59-abb4-4fed-bead-2a878c7e4a7e SmbiosMeasurementDxe
# d27fed59-abb4-4fed-bead-2a878c7e4a7e SmbiosMeasurementDxe
87ab821c-79b8-4ef6-a913-21d22063f55f AcpiPlatform
274f0c8f-9e57-41d8-9966-29ccd48d31c2 SmmAccess
8faad0a7-02b4-432f-8f5c-b880965d8b41 SmmCommunicationBuffer
bdce85bb-fbaa-4f4e-9264-501a2c249581 S3SaveStateDxe
2bded685-f733-455f-a840-43a22b791fb3 AcpiS3SaveDxe
# bdce85bb-fbaa-4f4e-9264-501a2c249581 S3SaveStateDxe
# 2bded685-f733-455f-a840-43a22b791fb3 AcpiS3SaveDxe
7c46c6a4-362f-4964-af20-9333e552dcc3 PciHotPlug
55e76644-78a5-4a82-a900-7126a5798892 HeciInitDxe
# 55e76644-78a5-4a82-a900-7126a5798892 HeciInitDxe
abbce13d-e25a-4d9f-a1f9-2f7710786892 Platform
515fac42-8580-4ce6-91c3-aff7d15694cd SmbiosMisc
fcb337d0-bb67-4fa7-83d9-67cc7b0baf9d SmbiosIFWI
# 515fac42-8580-4ce6-91c3-aff7d15694cd SmbiosMisc
# fcb337d0-bb67-4fa7-83d9-67cc7b0baf9d SmbiosIFWI
7e374e25-8e01-4fee-87f2-390c23c606cd EfiAcpiTableStorage
a381a73e-23c9-4939-8f88-30b544dc4023
f59daa23-d5d5-4d16-91fc-d03abdc12ffe BmcAcpiDxe
64a11188-5b86-4f59-a702-73365896e65e AcpiVTD
ee0bff80-2b33-4005-8ef1-3f9b23c25136 GetCpuInfo
34fb5a1b-e3cd-4893-9403-0a39ba62fda0 SvSmmSupport
# ee0bff80-2b33-4005-8ef1-3f9b23c25136 GetCpuInfo
# 34fb5a1b-e3cd-4893-9403-0a39ba62fda0 SvSmmSupport
06d20d84-a032-4e25-969a-346d255e46d1 CpuCsrAccess
c4eb3614-4986-42b9-8c0d-9fe118278908 CrystalRidge
e72527cf-505b-4b50-99cd-a32467fa4aa4 AsfTable
# e72527cf-505b-4b50-99cd-a32467fa4aa4 AsfTable
4896840d-46bb-412b-a30a-a62abfb3682f
63809859-f029-41c3-9f34-eeeb9ea787a5 IioInit
6ec99217-69bb-4ad6-9b4e-8f4ab9af72b9 ResetTesting
# 6ec99217-69bb-4ad6-9b4e-8f4ab9af72b9 ResetTesting
6b6fd380-2c55-42c6-98bf-cbbc5a9aa666 SocketSetup
deb0ee00-18df-415c-af03-74d09b0aad87 JedecNvDimm
2fa2a6da-11d5-4dc3-999a-749648b03c56 PiSmmIpl
e94f54cd-81eb-47ed-aec3-856f5dc157a9 PiSmmCore
d96a2393-8790-4baa-9ceb-42533f016ee9 RegAccessSMM
7d94b7a4-b8d7-4371-8d12-92083adf5e47 SmiVariable
23a089b3-eed5-4ac5-b2ab-43e3298c2343 VariableSmm
# 7d94b7a4-b8d7-4371-8d12-92083adf5e47 SmiVariable
# 23a089b3-eed5-4ac5-b2ab-43e3298c2343 VariableSmm
f5ac7057-5650-466e-b692-76a47223efb0 AcpiSmmPlatform
a3ff0ef5-0c28-42f5-b544-8c7de1e80014 PiSmmCpuDxeSmm
b0d6ed53-b844-43f5-bd2f-61095264e77e PchSmiDispatcher
a47ee2d8-f60e-42fd-8e58-7bd65ee4c29b CpuIo2Smm
470cb248-e8ac-473c-bb4f-81069a1fe6fd SmmFaultTolerantWriteDxe
6d4baa0b-f431-4370-af19-99d6209239f6 BiosGuardServices
a469ddbd-16d0-4535-bae3-77274bd70b4c FwBlockServiceSmm
27f4917b-a707-4aad-9676-26df168cbf0d PchSpiSmm
# 470cb248-e8ac-473c-bb4f-81069a1fe6fd SmmFaultTolerantWriteDxe
# 6d4baa0b-f431-4370-af19-99d6209239f6 BiosGuardServices
# a469ddbd-16d0-4535-bae3-77274bd70b4c FwBlockServiceSmm
# 27f4917b-a707-4aad-9676-26df168cbf0d PchSpiSmm

View File

@ -473,7 +473,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_LEGACY_VSYSCALL_EMULATE=y
# CONFIG_LEGACY_VSYSCALL_NONE is not set
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="earlyprintk=serial,ttyS0,115200 console=ttyS0,115200n8 pci=realloc"
CONFIG_CMDLINE="earlyprintk=serial,ttyS0,115200 console=ttyS0,115200n8 nosmp debug"
# CONFIG_CMDLINE_OVERRIDE is not set
# CONFIG_MODIFY_LDT_SYSCALL is not set
CONFIG_HAVE_LIVEPATCH=y
@ -752,8 +752,7 @@ CONFIG_GENERIC_CPU_AUTOPROBE=y
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_MMIO=y
CONFIG_DMA_SHARED_BUFFER=y
# CONFIG_FENCE_TRACE is not set
# CONFIG_DMA_SHARED_BUFFER is not set
#
# Bus devices
@ -1231,16 +1230,16 @@ CONFIG_DEVMEM=y
CONFIG_SERIAL_EARLYCON=y
CONFIG_SERIAL_8250=y
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
# CONFIG_SERIAL_8250_PNP is not set
CONFIG_SERIAL_8250_PNP=y
# CONFIG_SERIAL_8250_FINTEK is not set
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_PCI=y
# CONFIG_SERIAL_8250_PCI is not set
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
# CONFIG_SERIAL_8250_MANY_PORTS is not set
# CONFIG_SERIAL_8250_SHARE_IRQ is not set
CONFIG_SERIAL_8250_DETECT_IRQ=y
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
# CONFIG_SERIAL_8250_RSA is not set
# CONFIG_SERIAL_8250_FSL is not set
# CONFIG_SERIAL_8250_DW is not set
@ -1548,139 +1547,26 @@ CONFIG_MFD_SYSCON=y
# CONFIG_AGP is not set
# CONFIG_VGA_ARB is not set
# CONFIG_VGA_SWITCHEROO is not set
CONFIG_DRM=y
# CONFIG_DRM_DP_AUX_CHARDEV is not set
CONFIG_DRM_KMS_HELPER=y
CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_FBDEV_EMULATION=y
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
CONFIG_DRM_TTM=y
#
# I2C encoder or helper chips
#
# CONFIG_DRM_I2C_CH7006 is not set
# CONFIG_DRM_I2C_SIL164 is not set
# CONFIG_DRM_I2C_NXP_TDA998X is not set
# CONFIG_DRM_RADEON is not set
# CONFIG_DRM_AMDGPU is not set
# CONFIG_DRM is not set
#
# ACP (Audio CoProcessor) Configuration
#
# CONFIG_DRM_NOUVEAU is not set
# CONFIG_DRM_I915 is not set
# CONFIG_DRM_VGEM is not set
# CONFIG_DRM_VMWGFX is not set
# CONFIG_DRM_GMA500 is not set
# CONFIG_DRM_UDL is not set
# CONFIG_DRM_AST is not set
CONFIG_DRM_MGAG200=y
# CONFIG_DRM_CIRRUS_QEMU is not set
# CONFIG_DRM_QXL is not set
# CONFIG_DRM_BOCHS is not set
CONFIG_DRM_BRIDGE=y
#
# Display Interface Bridges
#
# CONFIG_DRM_ANALOGIX_ANX78XX is not set
# CONFIG_DRM_LEGACY is not set
#
# Frame buffer Devices
#
CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FB_CMDLINE=y
CONFIG_FB_NOTIFY=y
# CONFIG_FB_DDC is not set
CONFIG_FB_BOOT_VESA_SUPPORT=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
CONFIG_FB_SYS_FILLRECT=y
CONFIG_FB_SYS_COPYAREA=y
CONFIG_FB_SYS_IMAGEBLIT=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_SYS_FOPS=y
CONFIG_FB_DEFERRED_IO=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
#
# Frame buffer hardware drivers
#
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_PM2 is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_ARC is not set
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_VGA16 is not set
CONFIG_FB_VESA=y
# CONFIG_FB_EFI is not set
# CONFIG_FB_N411 is not set
# CONFIG_FB_HGA is not set
# CONFIG_FB_OPENCORES is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_NVIDIA is not set
# CONFIG_FB_RIVA is not set
# CONFIG_FB_I740 is not set
# CONFIG_FB_LE80578 is not set
CONFIG_FB_MATROX=y
# CONFIG_FB_MATROX_MILLENIUM is not set
# CONFIG_FB_MATROX_MYSTIQUE is not set
CONFIG_FB_MATROX_G=y
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_RADEON is not set
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_SIS is not set
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_PM3 is not set
# CONFIG_FB_CARMINE is not set
# CONFIG_FB_SMSCUFX is not set
# CONFIG_FB_UDL is not set
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
# CONFIG_FB_SIMPLE is not set
# CONFIG_FB_SM712 is not set
# CONFIG_FB is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
# CONFIG_VGASTATE is not set
CONFIG_HDMI=y
#
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
# CONFIG_VGACON_SOFT_SCROLLBACK is not set
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_DUMMY_CONSOLE_COLUMNS=80
CONFIG_DUMMY_CONSOLE_ROWS=25
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
CONFIG_LOGO=y
CONFIG_LOGO_LINUX_MONO=y
CONFIG_LOGO_LINUX_VGA16=y
CONFIG_LOGO_LINUX_CLUT224=y
# CONFIG_SOUND is not set
#
@ -2733,10 +2619,6 @@ CONFIG_CORDIC=m
CONFIG_IRQ_POLL=y
CONFIG_MPILIB=m
CONFIG_UCS2_STRING=y
CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
# CONFIG_SG_SPLIT is not set
CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_SG_CHAIN=y