Skip to content

Commit

Permalink
(WIP) update coreboot
Browse files Browse the repository at this point in the history
DO NOT MERGE! We want coreboot-4.10, not coreboot-git. This is for testing only!
DO NOT MERGE! This is unfinished.

Update coreboot from 4.8.1 to the git master branch HEAD at build-time and
port patches:
* 0000-measure-boot -> 0001
* 0030-sandybridge -> 0002

TODO:
* backport patch 0009-Add-heads-TPM-measurements-to-Skylake-Kabylake -> 0003
* coreboot defconfig update for all boards!
  including: instead of 0007-intel-fsp-fsp2_0-Fix-FSP-2.0-headers-to-match-github
  (configure FSP_USE_REPO?) Needed for skylake/kabylake
* coreboot's DIV_ROUND_UP statement expression usage in sha1.h doesn't work for me.
  help wanted, see sha1.h for the details.
* TEST! especially skylake/kabylake
* switch to coreboot 4.10 and remove all old patches

All other patches against coreboot-4.8.1 seem to be part of coreboot now.

For an overview of the changes in coreboot, see
https://doc.coreboot.org/releases/coreboot-4.9-relnotes.html
  • Loading branch information
merge committed May 21, 2019
1 parent 08ad2d4 commit 1bbfceb
Show file tree
Hide file tree
Showing 4 changed files with 540 additions and 8 deletions.
2 changes: 0 additions & 2 deletions config/coreboot-x230.config
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/x230/bzImage"
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
CONFIG_LINUX_INITRD="../../build/x230/initrd.cpio.xz"
CONFIG_DEBUG_SMM_RELOCATION=y
12 changes: 6 additions & 6 deletions modules/coreboot
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
modules-$(CONFIG_COREBOOT) += coreboot

#coreboot_version := git
#coreboot_repo := https://github.com/osresearch/coreboot
coreboot_version := 4.8.1
coreboot_version := git
coreboot_repo := https://github.com/coreboot/coreboot
# coreboot_version := 4.8.1
coreboot_base_dir := coreboot-$(coreboot_version)
coreboot_dir := $(coreboot_base_dir)/$(BOARD)
coreboot_tar := coreboot-$(coreboot_version).tar.xz
coreboot_url := https://www.coreboot.org/releases/$(coreboot_tar)
coreboot_hash := f0ddf4db0628c1fe1e8348c40084d9cbeb5771400c963fd419cda3995b69ad23
# coreboot_tar := coreboot-$(coreboot_version).tar.xz
# coreboot_url := https://www.coreboot.org/releases/$(coreboot_tar)
# coreboot_hash := f0ddf4db0628c1fe1e8348c40084d9cbeb5771400c963fd419cda3995b69ad23

# Coreboot builds are specialized on a per-target basis.
# The builds are done in a per-target subdirectory
Expand Down
Loading

0 comments on commit 1bbfceb

Please sign in to comment.