Skip to content

Commit

Permalink
(WIP) update coreboot to 4.11
Browse files Browse the repository at this point in the history
DO NOT MERGE! This is for testing only!

Update coreboot and configs from 4.8.1 to 4.11 and port the needed patches.

For an overview of the changes in coreboot, see
https://doc.coreboot.org/releases/coreboot-4.9-relnotes.html
https://doc.coreboot.org/releases/coreboot-4.10-relnotes.html
https://doc.coreboot.org/releases/coreboot-4.11-relnotes.html

tested on an X230 running Debian.

TODO:
* coreboot defconfig update for all boards!
  (configure FSP_USE_REPO?) Needed for skylake/kabylake
* test
  • Loading branch information
merge committed Nov 21, 2019
1 parent 4f0e778 commit 37d2293
Show file tree
Hide file tree
Showing 23 changed files with 343 additions and 134,278 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,7 @@ define define_module =
# that the files are all present. No signature hashes are checked in
# this case, since we don't have a stable version to compare against.
$(build)/$($1_base_dir)/.canary:
git clone $($1_repo) "$(build)/$($1_base_dir)"
cd $(build)/$($1_base_dir) && git submodule update --init --checkout
git clone --recurse-submodules $($1_repo) "$(build)/$($1_base_dir)"
if [ -r patches/$1.patch ]; then \
( cd $(build)/$($1_base_dir) ; patch -p1 ) \
< patches/$1.patch \
Expand Down
5 changes: 1 addition & 4 deletions config/coreboot-x230.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@ CONFIG_CBFS_SIZE=0x700000
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_BOARD_LENOVO_X230=y
CONFIG_DRIVERS_PS2_KEYBOARD=y
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
CONFIG_UART_PCI_ADDR=0
CONFIG_NO_GFX_INIT=y
# CONFIG_CONSOLE_SERIAL is not set
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
10 changes: 5 additions & 5 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://review.coreboot.org/coreboot.git
coreboot_version := 4.11
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_hash := 97fd859b4c39a25534fe33c30eb86e54a233952e08a024c55858d11598a8ad87

# Coreboot builds are specialized on a per-target basis.
# The builds are done in a per-target subdirectory
Expand Down Expand Up @@ -110,7 +110,7 @@ coreboot-blobs_version := $(coreboot_version)
coreboot-blobs_tar := coreboot-blobs-$(coreboot-blobs_version).tar.xz
coreboot-blobs_dir := coreboot-$(coreboot-blobs_version)/3rdparty/blobs
coreboot-blobs_url := https://www.coreboot.org/releases/$(coreboot-blobs_tar)
coreboot-blobs_hash := 18aa509ae3af005a05d7b1e0b0246dc640249c14fc828f5144b6fd20bb10e295
coreboot-blobs_hash := aa7855c5bd385b3360dadc043ea6bc93f564e6e4840d9b3ee5b9e696bbd055db

## there is nothing to build for the blobs, this should be
## made easier to make happen
Expand Down
Loading

0 comments on commit 37d2293

Please sign in to comment.