Skip to content

Commit 943edf9

Browse files
committed
tools: move tools/x86_fsp in tools/scripts/x86_fsp
1 parent a8cbc61 commit 943edf9

16 files changed

+31
-21
lines changed

.github/workflows/test-x86-fsp-qemu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ jobs:
2020
git config --global user.name "Your Name"
2121
- name: run test
2222
run: |
23-
./tools/x86_fsp/qemu/test_qemu.sh
23+
./tools/scripts/x86_fsp/qemu/test_qemu.sh

docs/Targets.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2084,7 +2084,7 @@ A test ELF/Multiboot2 image is provided as well. To test `config/examples/x86_fs
20842084
cp config/examples/x86_fsp_qemu.config .config
20852085
20862086
# Create necessary Intel FSP binaries from edk2 repo
2087-
./tools/x86_fsp/qemu/qemu_build_fsp.sh
2087+
./tools/scripts/x86_fsp/qemu/qemu_build_fsp.sh
20882088
20892089
# build wolfboot
20902090
make
@@ -2093,10 +2093,10 @@ make
20932093
make test-app/image.elf
20942094
20952095
# make_hd.sh sign the image, creates a file-based hard disk image with GPT table and raw partitions and then copies the signed images into the partitions.
2096-
IMAGE=test-app/image.elf tools/x86_fsp/qemu/make_hd.sh
2096+
IMAGE=test-app/image.elf tools/scripts/x86_fsp/qemu/make_hd.sh
20972097
20982098
# run wolfBoot + test-image
2099-
./tools/x86_fsp/qemu/qemu.sh
2099+
./tools/scripts/x86_fsp/qemu/qemu.sh
21002100
```
21012101

21022102
#### Sample boot output using config/examples/x86_fsp_qemu.config
@@ -2316,7 +2316,7 @@ The correct steps to run the example:
23162316
cp config/examples/x86_fsp_qemu_seal.config .config
23172317
23182318
# create necessary Intel FSP binaries from edk2 repo
2319-
tools/x86_fsp/qemu/qemu_build_fsp.sh
2319+
tools/scripts/x86_fsp/qemu/qemu_build_fsp.sh
23202320
23212321
# make keytools and tpmtools
23222322
make keytools
@@ -2329,22 +2329,22 @@ make tpmtools
23292329
make CFLAGS_EXTRA="-DHAVE_ECC256"
23302330
23312331
# compute the value of PCR0 to sign with TPM key
2332-
PCR0=$(python ./tools/x86_fsp/compute_pcr.py --target qemu wolfboot_stage1.bin | tail -n 1)
2332+
PCR0=$(python ./tools/scripts/x86_fsp/compute_pcr.py --target qemu wolfboot_stage1.bin | tail -n 1)
23332333
23342334
# sign the policy
23352335
./tools/tpm/policy_sign -ecc256 -key=tpm_seal_key.key -pcr=0 -pcrdigest=$PCR0
23362336
23372337
# install the policy
2338-
./tools/x86_fsp/tpm_install_policy.sh policy.bin.sig
2338+
./tools/scripts/x86_fsp/tpm_install_policy.sh policy.bin.sig
23392339
23402340
# make test-app
23412341
make test-app/image.elf
23422342
23432343
# make_hd.sh sign the image, creates a file-based hard disk image with GPT table and raw partitions and then copy the signed images into the partitions.
2344-
IMAGE=test-app/image.elf SIGN=--ecc384 tools/x86_fsp/qemu/make_hd.sh
2344+
IMAGE=test-app/image.elf SIGN=--ecc384 tools/scripts/x86_fsp/qemu/make_hd.sh
23452345
23462346
# run wolfBoot + test-image, use -t to emulate a TPM (requires swtpm)
2347-
./tools/x86_fsp/qemu/qemu.sh -t
2347+
./tools/scripts/x86_fsp/qemu/qemu.sh -t
23482348
```
23492349

23502350
For more advanced uses of TPM, please check [TPM.md](TPM.md) to configure wolfBoot
@@ -2359,11 +2359,11 @@ To compile a flashable image run the following steps:
23592359

23602360
```
23612361
cp config/examples/kontron_vx3060_s2.config .config
2362-
./tools/x86_fsp/tgl/tgl_download_fsp.sh
2362+
./tools/scripts/x86_fsp/tgl/tgl_download_fsp.sh
23632363
make tpmtools
2364-
./tools/x86_fsp/tgl/assemble_image.sh -k
2364+
./tools/scripts/x86_fsp/tgl/assemble_image.sh -k
23652365
make CFLAGS_EXTRA="-DHAVE_ECC256"
2366-
./tools/x86_fsp/tgl/assemble_image.sh -n /path/to/original/flash/dump
2366+
./tools/scripts/x86_fsp/tgl/assemble_image.sh -n /path/to/original/flash/dump
23672367
```
23682368

23692369
they produce a file named `final_image.bin` inside the root folder of the

tools/x86_fsp/qemu/0002-add-W-no-warnings-to-compile-with-gcc-12.patch renamed to tools/scripts/x86_fsp/qemu/0002-add-W-no-warnings-to-compile-with-gcc-12.patch

File renamed without changes.

tools/x86_fsp/qemu/0003-disable-optmizaion-patch-for-edk2.patch renamed to tools/scripts/x86_fsp/qemu/0003-disable-optmizaion-patch-for-edk2.patch

File renamed without changes.

tools/x86_fsp/qemu/0004-fix-PatchFv-make-regex-match-both-8-and-16-length-ad.patch renamed to tools/scripts/x86_fsp/qemu/0004-fix-PatchFv-make-regex-match-both-8-and-16-length-ad.patch

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)