Skip to content

head.S: move skl_info and bootloader_data fields back #25

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.

Sign up for GitHub

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
m-iwanicki wants to merge 1 commit into
base: skl-loader-amdsl-noblob
Choose a base branch
from
Open

head.S: move skl_info and bootloader_data fields back #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions head.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ GLOBAL(sl_header)
.long 0xffffffff /* Reserved */
.long _end_of_signed + 0x640 /* Total Length including signature and pubkey raw data */
.word soc_flag /* Offset to SOCFLAG Structure, see below */
.word skl_info /* Offset to SKL info with UUID and version */
.word bootloader_data /* Offset to SLRT filled by the bootloader */

soc_flag:
/*
Expand All @@ -66,6 +64,8 @@ soc_flag:
.long 0x00a10f00
.long 0x00a80f00
.long 0x00aa0f00
.word skl_info /* Offset to SKL info with UUID and version */
.word bootloader_data /* Offset to SLRT filled by the bootloader */
ENDDATA(sl_header)

.text
Expand Down
2 changes: 1 addition & 1 deletion sanity_check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
. util.sh

SKL_INFO=`hexdump "$SLB_FILE" -s30 -n2 -e '/2 "%u"'`
SKL_INFO=`hexdump "$SLB_FILE" -s66 -n2 -e '/2 "%u"'`

if ! od --format=x8 --skip-bytes=$SKL_INFO --read-bytes=16 $SLB_FILE | grep -q "e91192048e26f178 02ccc4765bc82a83"; then
echo "ERROR: SKL UUID missing or misplaced in $SLB_FILE" >&2
Expand Down