Skip to content
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

UefiPayloadPkg: Minor fixes #10571

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

UefiPayloadPkg: Minor fixes #10571

wants to merge 3 commits into from

Conversation

sjg20
Copy link

@sjg20 sjg20 commented Dec 27, 2024

Description

Here are a few fixes for Universal Payload (UPL) which are applicable to master, to help it work with U-Boot

These are brought in from my main PR[1], as that is still dependent on Benjamin Doron's work and cannot be reviewed yet.

  • Breaking change?
    • Breaking change - Does this PR cause a break in build or boot behavior?
    • Examples: Does it add a new library class or move a module to a different repo.
  • Impacts security?
    • Security - Does this PR have a direct security impact?
    • Examples: Crypto algorithm change or buffer overflow fix.
  • Includes tests?
    • Tests - Does this PR include any explicit test code?
    • Examples: Unit tests or integration tests.

How This Was Tested

Using U-Boot branch 'upl' at sjg.u-boot.org

./scripts/build-qemu.sh -a x86 -w -u ~dev/edk2/Build/UefiPayloadPkgIA32/UniversalPayload.fit -rs

Integration Instructions

N/A

[1] #10570

Update to version 1.7.2 which has setprop_bool(). Take from
https://github.com/dgibson/dtc.git commit:

   18f4f30 ("build: fix -Dtools=false build")

Signed-off-by: Simon Glass <[email protected]>
At present Tianocore is started as a 32-bit image, even on 64-bit
machines. So for now, set the architecture accordingly.

Note that FIT uses "i386" rather than "x86"

Signed-off-by: Simon Glass <[email protected]>
When developing this script it is helpful to get a full traceback when
something goes wrong. Raise an exception to ensure this.

Signed-off-by: Simon Glass <[email protected]>
@@ -130,10 +130,10 @@ def BuildUniversalPayload(Args):
BuildDir = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/UefiPayloadPkg{}").format (Args.Arch))
if Args.Arch == 'X64':
BuildArch = "X64"
FitArch = "x86_64"
FitArch = "i386"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I said on the other change, this shouldn't be here. coreboot will call payloads in 32-bit mode no matter what, so coreboot will always pass -a IA32 to the script

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants