From 31332120b66fbbc5da7e069f6b2d646bd55a9b7a Mon Sep 17 00:00:00 2001 From: Martin Kepplinger Date: Tue, 22 Oct 2019 08:17:16 +0200 Subject: [PATCH] x230: update coreboot to recent state --- common/download_coreboot.sh | 6 ------ x230/NEWS | 1 + ...free-defconfig-555419f356 => free-defconfig-4357a820764} | 3 ++- ...e-defconfig-555419f356 => nonfree-defconfig-4357a820764} | 4 ++-- 4 files changed, 5 insertions(+), 9 deletions(-) rename x230/{free-defconfig-555419f356 => free-defconfig-4357a820764} (94%) rename x230/{nonfree-defconfig-555419f356 => nonfree-defconfig-4357a820764} (100%) diff --git a/common/download_coreboot.sh b/common/download_coreboot.sh index 48c649b..7e06c45 100755 --- a/common/download_coreboot.sh +++ b/common/download_coreboot.sh @@ -27,12 +27,6 @@ function gitUpdate() { cd "$DOCKER_COREBOOT_DIR/3rdparty/blobs/" || exit git fetch --all --tags --prune fi - - # update the blobs repo to include the microcode update we need - cd "$DOCKER_COREBOOT_DIR/3rdparty/blobs/" || exit - git pull https://review.coreboot.org/blobs refs/changes/66/32166/1 - cd "$DOCKER_COREBOOT_DIR" || exit - git pull https://review.coreboot.org/coreboot refs/changes/97/33197/2 } ################################################################################ diff --git a/x230/NEWS b/x230/NEWS index 1a03cfd..37a73be 100644 --- a/x230/NEWS +++ b/x230/NEWS @@ -3,6 +3,7 @@ skulls-x230 0.1.7 - unreleased --------------------------------------- This release includes the following changes: * update coreboot-sdk to version d70f5fae1c +* based on coreboot commit 4357a82076 skulls-x230 0.1.6 - released 2019-06-07 --------------------------------------- diff --git a/x230/free-defconfig-555419f356 b/x230/free-defconfig-4357a820764 similarity index 94% rename from x230/free-defconfig-555419f356 rename to x230/free-defconfig-4357a820764 index 186bc1f..6ae0f8d 100644 --- a/x230/free-defconfig-555419f356 +++ b/x230/free-defconfig-4357a820764 @@ -1,11 +1,12 @@ CONFIG_USE_OPTION_TABLE=y +CONFIG_USE_BLOBS=y CONFIG_VENDOR_LENOVO=y CONFIG_CBFS_SIZE=0x400000 CONFIG_BOARD_LENOVO_X230=y +CONFIG_NO_POST=y # CONFIG_H8_BEEP_ON_DEATH is not set CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y -CONFIG_NO_POST=y CONFIG_COREINFO_SECONDARY_PAYLOAD=y CONFIG_MEMTEST_SECONDARY_PAYLOAD=y CONFIG_NVRAMCUI_SECONDARY_PAYLOAD=y diff --git a/x230/nonfree-defconfig-555419f356 b/x230/nonfree-defconfig-4357a820764 similarity index 100% rename from x230/nonfree-defconfig-555419f356 rename to x230/nonfree-defconfig-4357a820764 index 46ad800..5efa6e5 100644 --- a/x230/nonfree-defconfig-555419f356 +++ b/x230/nonfree-defconfig-4357a820764 @@ -5,15 +5,15 @@ CONFIG_VENDOR_LENOVO=y CONFIG_CBFS_SIZE=0x400000 CONFIG_VGA_BIOS=y CONFIG_BOARD_LENOVO_X230=y +CONFIG_NO_POST=y # CONFIG_S3_VGA_ROM_RUN is not set # CONFIG_H8_BEEP_ON_DEATH is not set CONFIG_VGA_ROM_RUN=y CONFIG_PCI_OPTION_ROM_RUN_YABEL=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y -CONFIG_BOOTSPLASH=y CONFIG_VBE_LINEAR_FRAMEBUFFER=y +CONFIG_BOOTSPLASH=y CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y -CONFIG_NO_POST=y CONFIG_COREINFO_SECONDARY_PAYLOAD=y CONFIG_MEMTEST_SECONDARY_PAYLOAD=y CONFIG_NVRAMCUI_SECONDARY_PAYLOAD=y