Skip to content

A15h#27

Closed
arhabd wants to merge 106 commits intotlaurion:d16_15h_coreboot_forkfrom
arhabd:a15h
Closed

A15h#27
arhabd wants to merge 106 commits intotlaurion:d16_15h_coreboot_forkfrom
arhabd:a15h

Conversation

@arhabd
Copy link
Copy Markdown

@arhabd arhabd commented Mar 11, 2025

minor changes to keep 15h fork up to date

akunterkontrolle and others added 30 commits February 11, 2025 11:25
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…for t480

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…ce its not sharing the same coreboot buildstack (something 25.X.X, need to check)

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…ack, since its not sharing the same coreboot buildstack (something 25.X.X, need to check)"

This reverts commit b1f279354388fd8e71abd9f1514246d7e9f6ed1c.

Hmmm....

WGET="" bin/fetch_coreboot_crossgcc_archive.sh "/home/user/heads/build/x86/coreboot-t480" "binutils" "/home/user/heads/packages/x86"
--2025-02-11 14:46:38--  https://ftpmirror.gnu.org/binutils/binutils-2.43.1.tar.xz
Resolving ftpmirror.gnu.org (ftpmirror.gnu.org)... 209.51.188.200, 2001:470:142:5::200
Connecting to ftpmirror.gnu.org (ftpmirror.gnu.org)|209.51.188.200|:443... connected.
HTTP request sent, awaiting response... 302 Moved Temporarily
Location: https://mirror.csclub.uwaterloo.ca/gnu/binutils/binutils-2.43.1.tar.xz [following]
--2025-02-11 14:46:40--  https://mirror.csclub.uwaterloo.ca/gnu/binutils/binutils-2.43.1.tar.xz
Resolving mirror.csclub.uwaterloo.ca (mirror.csclub.uwaterloo.ca)... 129.97.134.71, 2620:101:f000:4901:c5c:0:f:1055
Connecting to mirror.csclub.uwaterloo.ca (mirror.csclub.uwaterloo.ca)|129.97.134.71|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 28174300 (27M) [text/plain]
Saving to: '/home/user/heads/packages/x86/coreboot-crossgcc-binutils-2.43.1.tar.xz.tmp'

/home/user/heads/packages/x86/coreboot-crossgcc-binu 100%[=====================================================================================================================>]  26.87M  8.88MB/s    in 3.0s

2025-02-11 14:46:44 (8.88 MB/s) - '/home/user/heads/packages/x86/coreboot-crossgcc-binutils-2.43.1.tar.xz.tmp' saved [28174300/28174300]

/home/user/heads/packages/x86/coreboot-crossgcc-binutils-2.43.1.tar.xz.tmp: OK
touch "/home/user/heads/build/x86/coreboot-t480/.heads-crossgcc-pkg-binutils"
WGET="" bin/fetch_coreboot_crossgcc_archive.sh "/home/user/heads/build/x86/coreboot-t480" "gcc" "/home/user/heads/packages/x86"
--2025-02-11 14:46:44--  https://ftpmirror.gnu.org/gcc/gcc-14.2.0/gcc-14.2.0.tar.xz
Resolving ftpmirror.gnu.org (ftpmirror.gnu.org)... 209.51.188.200, 2001:470:142:5::200
Connecting to ftpmirror.gnu.org (ftpmirror.gnu.org)|209.51.188.200|:443... connected.
HTTP request sent, awaiting response... 302 Moved Temporarily
Location: https://mirror2.evolution-host.com/gnu/gcc/gcc-14.2.0/gcc-14.2.0.tar.xz [following]
--2025-02-11 14:46:44--  https://mirror2.evolution-host.com/gnu/gcc/gcc-14.2.0/gcc-14.2.0.tar.xz
Resolving mirror2.evolution-host.com (mirror2.evolution-host.com)... 167.114.8.249, 2607:5300:60:450d:c259:13f4:6df0:1
Connecting to mirror2.evolution-host.com (mirror2.evolution-host.com)|167.114.8.249|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 92306460 (88M) [application/x-xz]
Saving to: '/home/user/heads/packages/x86/coreboot-crossgcc-gcc-14.2.0.tar.xz.tmp'

/home/user/heads/packages/x86/coreboot-crossgcc-gcc- 100%[=====================================================================================================================>]  88.03M  32.9MB/s    in 2.7s

2025-02-11 14:46:48 (32.9 MB/s) - '/home/user/heads/packages/x86/coreboot-crossgcc-gcc-14.2.0.tar.xz.tmp' saved [92306460/92306460]

/home/user/heads/packages/x86/coreboot-crossgcc-gcc-14.2.0.tar.xz.tmp: OK
touch "/home/user/heads/build/x86/coreboot-t480/.heads-crossgcc-pkg-gcc"
WGET="" bin/fetch_coreboot_crossgcc_archive.sh "/home/user/heads/build/x86/coreboot-t480" "nasm" "/home/user/heads/packages/x86"
--2025-02-11 14:46:48--  https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/nasm-2.16.03.tar.bz2
Resolving www.nasm.us (www.nasm.us)... 198.137.202.136, 2607:7c80:54:3::136
Connecting to www.nasm.us (www.nasm.us)|198.137.202.136|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1361988 (1.3M) [application/x-bzip2]
Saving to: '/home/user/heads/packages/x86/coreboot-crossgcc-nasm-2.16.03.tar.bz2.tmp'

/home/user/heads/packages/x86/coreboot-crossgcc-nasm 100%[=====================================================================================================================>]   1.30M  2.90MB/s    in 0.4s

2025-02-11 14:46:49 (2.90 MB/s) - '/home/user/heads/packages/x86/coreboot-crossgcc-nasm-2.16.03.tar.bz2.tmp' saved [1361988/1361988]

/home/user/heads/packages/x86/coreboot-crossgcc-nasm-2.16.03.tar.bz2.tmp: OK
touch "/home/user/heads/build/x86/coreboot-t480/.heads-crossgcc-pkg-nasm"
WGET="" bin/fetch_coreboot_crossgcc_archive.sh "/home/user/heads/build/x86/coreboot-t480" "iasl" "/home/user/heads/packages/x86"
--2025-02-11 14:46:49--  https://distfiles.macports.org/acpica/acpica-unix-20241212.tar.gz
Resolving distfiles.macports.org (distfiles.macports.org)... 151.101.138.132
Connecting to distfiles.macports.org (distfiles.macports.org)|151.101.138.132|:443... connected.
HTTP request sent, awaiting response... 404 Not Found
2025-02-11 14:46:50 ERROR 404: Not Found.

Failed to download https://distfiles.macports.org/acpica/acpica-unix-20241212.tar.gz
Try mirrors for coreboot-crossgcc-acpica-unix-20241212.tar.gz
--2025-02-11 14:46:50--  https://storage.puri.st/heads-packages/coreboot-crossgcc-acpica-unix-20241212.tar.gz
Resolving storage.puri.st (storage.puri.st)... 146.190.140.226
Connecting to storage.puri.st (storage.puri.st)|146.190.140.226|:443... connected.
HTTP request sent, awaiting response... 404 Not Found
2025-02-11 14:46:51 ERROR 404: Not Found.

Failed to download https://storage.puri.st/heads-packages/coreboot-crossgcc-acpica-unix-20241212.tar.gz
--2025-02-11 14:46:51--  https://storage.puri.sm/heads-packages/coreboot-crossgcc-acpica-unix-20241212.tar.gz
Resolving storage.puri.sm (storage.puri.sm)... 146.190.140.226
Connecting to storage.puri.sm (storage.puri.sm)|146.190.140.226|:443... connected.
HTTP request sent, awaiting response... 404 Not Found
2025-02-11 14:46:52 ERROR 404: Not Found.

Failed to download https://storage.puri.sm/heads-packages/coreboot-crossgcc-acpica-unix-20241212.tar.gz

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…hon when used under nix docker

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…ls blobs scripts

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
… as base

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…onfig and config/coreboot-novacustom-nv4x_adl.config

Then saved back in oldconfig with ./docker_repro.sh make BOARD=t480-maximized coreboot.modify_and_save_oldconfig_in_place

Notes:
- Pr0 requirements don't stick, investigate
- real quick overview of config, just rying to get thing build here

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…EURL to use one of libreboot web mirror

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…ot 24.02 buildstack)

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…les in tree as per http://web.archive.org/web/20250211155526/https://notgivenby.github.io/heads-wiki/t480-port/#coreboot-config-for-t480 : No joy building, but will dump progress for others to pickup

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…ake first layer

Will fail at
Updating git submodules.
payloads/external/Makefile.mk:399: "Using host toolchain to build Linuxboot"
    GEN        build.h
    IFDTOOL    -p sklkbl -F t480-maximized/fmap-template.fmd ../../../blobs/t480/ifd_16
    HOSTCC     cbfstool/fmd_parser.o
    HOSTCC     cbfstool/fmd_scanner.o
make[1]: *** No rule to make target '../../../vendorfiles/kabylake/Fsp_M.fd', needed by 't480-maximized/coreboot.pre'.  Stop.
make[1]: *** Waiting for unfinished jobs....
File ../../../blobs/t480/ifd_16 is 4096 bytes
Wrote layout to t480-maximized/fmap-template.fmd

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…iles exist

For repro:
- To remove all files created by patches (would error to help dev remove them manually)
  - echo "bogus" | tee build/x86/coreboot-t480/.canary
  - sudo rm -rf build/x86/coreboot-t480/src/mainboard/lenovo/sklkbl_thinkpad/variants/t480*
  - sudo rm build/x86/libgpg-error-1.46/src/syscfg/lock-obj-pub.powerpc64le-unknown-linux-musl.h
- Remove all .canary files, outside of detected git forks to speedup local builds, rebuilding only new files with make magic
  - ./docker_repro.sh make BOARD=t480-maximized real.remove_canary_files-extract_patch_rebuild_what_changed
- Rebuild from sources: unpack archives/git clone, patch, build from source
  - ./docker_repro.sh make BOARD=t480-maximized

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…ream PR0 patchset https://review.coreboot.org/c/coreboot/+/85278

Repro:
git fetch https://review.coreboot.org/coreboot refs/changes/78/85278/3 && git format-patch -1 --stdout FETCH_HEAD > patches/coreboot-t480/85278-post-skylake-pr0.patch

Unfortunately
Applying patch file : patches/coreboot-t480/85278-post-skylake-pr0.patch
Checking patch build/x86/coreboot-t480/src/soc/intel/alderlake/finalize.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/cannonlake/finalize.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/common/block/lpc/Makefile.mk...
Checking patch build/x86/coreboot-t480/src/soc/intel/common/block/smm/smihandler.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/common/pch/include/intelpch/lockdown.h...
Checking patch build/x86/coreboot-t480/src/soc/intel/common/pch/lockdown/Kconfig...
Checking patch build/x86/coreboot-t480/src/soc/intel/common/pch/lockdown/Makefile.mk...
Checking patch build/x86/coreboot-t480/src/soc/intel/common/pch/lockdown/lockdown.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/common/pch/lockdown/lockdown_lpc.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/common/pch/lockdown/lockdown_spi.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/denverton_ns/lpc.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/elkhartlake/finalize.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/jasperlake/finalize.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/meteorlake/finalize.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/pantherlake/finalize.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/skylake/finalize.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/tigerlake/finalize.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/xeon_sp/finalize.c...
Checking patch build/x86/coreboot-t480/src/soc/intel/xeon_sp/lockdown.c...
error: while searching for:

static void lpc_lockdown_config(void)
{
	/* Set BIOS Interface Lock, BIOS Lock */
	lpc_set_bios_interface_lock_down();

	/* Only allow writes in SMM */
	if (CONFIG(BOOTMEDIA_SMM_BWP)) {
		lpc_set_eiss();
		lpc_enable_wp();
	}
	lpc_set_lock_enable();
}

void soc_lockdown_config(int chipset_lockdown)
{
	if (chipset_lockdown == CHIPSET_LOCKDOWN_FSP)
		return;

	lpc_lockdown_config();
	pmc_lockdown_config();
	sata_lockdown_config(chipset_lockdown);
	spi_lockdown_config(chipset_lockdown);

error: patch failed: build/x86/coreboot-t480/src/soc/intel/xeon_sp/lockdown.c:6
Applied patch build/x86/coreboot-t480/src/soc/intel/alderlake/finalize.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/cannonlake/finalize.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/common/block/lpc/Makefile.mk cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/common/block/smm/smihandler.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/common/pch/include/intelpch/lockdown.h cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/common/pch/lockdown/Kconfig cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/common/pch/lockdown/Makefile.mk cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/common/pch/lockdown/lockdown.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/common/pch/lockdown/lockdown_lpc.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/common/pch/lockdown/lockdown_spi.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/denverton_ns/lpc.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/elkhartlake/finalize.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/jasperlake/finalize.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/meteorlake/finalize.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/pantherlake/finalize.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/skylake/finalize.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/tigerlake/finalize.c cleanly.
Applied patch build/x86/coreboot-t480/src/soc/intel/xeon_sp/finalize.c cleanly.
Applying patch build/x86/coreboot-t480/src/soc/intel/xeon_sp/lockdown.c with 1 reject...
Rejected hunk #1.
make: *** [Makefile:570: /home/user/heads/build/x86/coreboot-t480/.canary] Error 1

Will have to edit patch

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…we are not interested into which are conflicting against coreboot upstream commit 2f1e4e5e8515dd350cc9d68b48d32a5b6b02ae6a

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…config

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…herwise build error

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
… after kexec call to final OS. Otherwise, problem with coreboot config)

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
Signed-off-by: gaspar-ilom <gasparilom@riseup.net>
…d error

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…add the CircleCI

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
Resolve conflicts, enable TPM2 support into board configs that was missing sorry
- remove blobs/kabylake/fetch_split_fsp.sh since unneeded if depending on full FSP from tree
  - removed fsp.fd files placed in blobs and references to it in @gaspar-ilom branch
  - removed blobs/kabylake/* altogether since unneeded
- remove patches/coreboot-24.02.01/* since we use another fork (currently modules/coreboot: t480, might be renamed to coreboot release to be reused later)
- t480 boards depend on targets/xx80_me_blobs.mk now, next commit will cleanup prior work artifacts not needed; @gaspar-ilom approach cleaner

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…mpler/merged of @gaspar-ilom

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…ose are not maximized boards. We have to draw the line somewhere.

- Reuse good tweeks from gaspar-ilom's provided config/coreboot-t480-maximized.config
- move config/coreboot-t480-maximized.config to config/coreboot-t480.config, delete config/coreboot-t480-maximized.config
- rename boards/t480-hotp-maximized -> boards/t480-hotp, boards/t480-maximized/t480-maximized -> boards/t480-maximized/t480
- Adapt CircleCI board naming accordingly

TODO:
- discuss need of thunderbold firmware presence in fw, that were part of @notgivenby prior work and now gone. Should it be brought back?
- Tweaks of config/coreboot-t480.config against prior commit, outside of blobs paths having change.

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…m cleaner merged/adapted work from @gaspar-ilom

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
gaspar-ilom and others added 12 commits March 7, 2025 17:27
…ade Mate Kukri

still not fixing things properly but at least it should now be possible to build older thinkpads without regressions.
prior, some code was just commented or unreachable. now we make this explicit with preprocessor directives.
heads should build all boards on this coreboot version from the same coreboot tree.

use CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON to decide what to compile
this should work for T480, T480S and older thinkpads

Signed-off-by: gaspar-ilom <gasparilom@riseup.net>
…am will need to fix thermal codepath: as of now its either other thinkpads or t480. Not good"

With 3466272 T480 thermal codepath does not break other boards anymore.
We move it back to circleci and maintained.

This reverts commit 730fdd1.

Signed-off-by: gaspar-ilom <gasparilom@riseup.net>
…hinkPad-T480s.patch: do not comment inclusion of thermal.asl"

Not necessary anymore as properly fixed by coreboot patch 0004 in 3466272

This reverts commit aa2b15d.

Signed-off-by: gaspar-ilom <gasparilom@riseup.net>
Signed-off-by: gaspar-ilom <gasparilom@riseup.net>
more patches are going to come for haswell nri so we want a clean naming scheme

Signed-off-by: gaspar-ilom <gasparilom@riseup.net>
…er, per notice at linuxboot#1908 (comment)

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…helper, per notice at linuxboot#1908 (comment)

Unfortunately the helper doesn't deal well with board inclusion: sed call is imperfect, and board config needs to be manually edited.

TODO: fix the helper when it will be the time to move back to tested/untested

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
… passing: -j8 --load-average=12 from current Makefile helper

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
Coreboot version  bump 24.02.01 ->  24.12 for most board + Thinkpad T480 addition (coreboot upstream in WiP state)
Board name was changed due to being untested.  It still builds, so the
packages still sync to mirrors for now.

Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
…d-talos-2

bin/seed_package_mirror.sh: Update talos-2 -> UNTESTED_talos-2
@tlaurion
Copy link
Copy Markdown
Owner

@arhabd

do
git rebase --signoff 1db5f9f^

Once you made sure your git config is linked properly with your name and email address per linuxboot/heads-wiki#119

Please comment there any in-between steps that was missing for others to enroll/understand git process leading a signed commits ( both signoff commit (Signed-off by commit log messages) and signing commits with gpg)

@arhabd
Copy link
Copy Markdown
Author

arhabd commented Mar 12, 2025

@arhabd

do git rebase --signoff 1db5f9f^

Once you made sure your git config is linked properly with your name and email address per linuxboot/heads-wiki#119

Please comment there any in-between steps that was missing for others to enroll/understand git process leading a signed commits ( both signoff commit (Signed-off by commit log messages) and signing commits with gpg)

i must have done a sub par job with searching the github for these instructions as i did mostly everything without them until right before pushing to here but i will give a shot at giving some input in the issue above

tlaurion and others added 5 commits March 13, 2025 14:05
…it from https://git.15h.org/mrothfuss/coreboot-15h/src/branch/4.11-tpm-measured-boot dating 20250126

Once fork switched, after repo is cloned, CTRL-C and:
- ./docker_repro.sh make BOARD=UNMAINTAINED_kgpe-d16_server-whiptail coreboot.modify_and_save_oldconfig_in_place
- Enable measured boot, save changes.

Changes were saved under config/coreboot-kgpe-d16_server-whiptail.config, see diff (a lot compared to 4.11 in master)

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
Signed-off-by: arhabd <arhabodey@proton.me>
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
Signed-off-by: arhabd <arhabodey@proton.me>
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
Signed-off-by: arhabd <arhabodey@proton.me>
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
…s with 15h fork

Rebased on master making arha commits co-signed since they were not signed-off

repro:
git fetch origin
git rebase --signoff origin/master
vi boards/*/*.config #so all boards point to 15h for coreboot fork
./docker_repro.sh make BOARD=*d16_boards* coreboot.modify_and_save_oldconfig_in_place #so oldconfig under config/coreboot* are updated with changes observable to15h fork, make sure measured boot on
vi .circleci/config.yml #to readd d16 boards, make them depend on musl-cross-make for workstation, and then reuse workstation build cache for other boards

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
@tlaurion
Copy link
Copy Markdown
Owner

Superseeded by linuxboot#1929

@tlaurion tlaurion closed this Mar 13, 2025
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.

7 participants