-
-
Notifications
You must be signed in to change notification settings - Fork 22
Misc QEMU fixes #839
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
mkopec
wants to merge
2
commits into
dasharo
Choose a base branch
from
qemu_fixes
base: dasharo
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Misc QEMU fixes #839
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,10 +2,12 @@ CONFIG_LOCALVERSION="v0.2.1-rc1" | |
| CONFIG_OPTION_BACKEND_NONE=y | ||
| CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y | ||
| CONFIG_EDK2_BOOT_TIMEOUT=3 | ||
| CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=35 | ||
| CONFIG_TPM_MEASURED_BOOT=y | ||
| CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp" | ||
| CONFIG_CPU_QEMU_X86_TSEG_SMM=y | ||
| CONFIG_UDK_202005_BINDING=y | ||
| CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS=y | ||
| CONFIG_DRIVERS_EFI_VARIABLE_STORE=y | ||
| CONFIG_DRIVERS_EFI_FW_INFO=y | ||
| CONFIG_DRIVERS_EFI_MAIN_FW_GUID="20651b14-8653-4d9b-a75a-67fa76e0ada5" | ||
|
|
@@ -20,6 +22,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y | |
| CONFIG_PAYLOAD_EDK2=y | ||
| CONFIG_EDK2_CBMEM_LOGGING=y | ||
| CONFIG_EDK2_SERIAL_SUPPORT=y | ||
| CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D ABOVE_4G_MEMORY=TRUE" | ||
| CONFIG_BUILD_IPXE=y | ||
| CONFIG_IPXE_ADD_SCRIPT=y | ||
| CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe" | ||
|
|
@@ -33,10 +36,26 @@ CONFIG_EDK2_SETUP_PASSWORD=y | |
| CONFIG_EDK2_PERFORMANCE_MEASUREMENT_ENABLE=y | ||
| CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y | ||
| CONFIG_EDK2_DASHARO_SECURITY_OPTIONS=y | ||
| CONFIG_EDK2_SHOW_CAMERA_OPTION=y | ||
| CONFIG_EDK2_SHOW_WIFI_BT_OPTION=y | ||
| CONFIG_EDK2_DASHARO_INTEL_ME_OPTIONS=y | ||
| CONFIG_EDK2_DASHARO_USB_CONFIG=y | ||
| CONFIG_EDK2_DASHARO_NETWORK_CONFIG=y | ||
| CONFIG_EDK2_DASHARO_CHIPSET_CONFIG=y | ||
| CONFIG_EDK2_DASHARO_POWER_CONFIG=y | ||
| CONFIG_EDK2_SLEEP_TYPE_OPTION=y | ||
| CONFIG_EDK2_FAN_CURVE_OPTION=y | ||
| CONFIG_EDK2_BATTERY_CONFIG_OPTION=y | ||
| CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_OPTION=y | ||
| CONFIG_EDK2_DASHARO_PCI_CONFIG=y | ||
| CONFIG_EDK2_DASHARO_MEMORY_CONFIG=y | ||
| CONFIG_EDK2_DASHARO_SPD_PROFILE_OPTION=y | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. All these options weren't enabled in this config because they don't actually work. |
||
| CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y | ||
| CONFIG_EDK2_HAVE_2ND_UART=y | ||
| CONFIG_EDK2_DASHARO_CPU_CONFIG=y | ||
| CONFIG_EDK2_CORE_DISABLE_OPTION=y | ||
| CONFIG_EDK2_HYPERTHREADING_OPTION=y | ||
| CONFIG_EDK2_BOOT_MENU_KEY=0x0017 | ||
| CONFIG_EDK2_SETUP_MENU_KEY=0x000C | ||
| CONFIG_EDK2_RAM_DISK_ENABLE=y | ||
| CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ABOVE_4G_MEMORYis enabled by default.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It wasn't enabled when I was testing. Actually the Kconfig option
EDK2_ABOVE_4G_MEMORYis missing entirely from Kconfig files, so the Makefile will set it to False explicitly:coreboot/payloads/external/edk2/Makefile
Lines 191 to 194 in c7bf17c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I meant that it's enabled in the DSC file and didn't expect
CONFIG_EDK2_ABOVE_4G_MEMORYto be undefined. Apparently, it's a Dasharo-specific option which got broken at some point. Seems like we're always passingABOVE_4G_MEMORY=FALSEto EDK? Not sure we've ever intended that.