From 486e33c3e4deae69fa16860ae748cfa1ba81ee6c Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Thu, 16 Mar 2023 17:49:22 +0100 Subject: [PATCH] feat: updated coreboot and sdk version --- Makefile | 13 ++++++------- coreboot-sdk.sh | 5 ----- ...efconfig-d5c31acee4 => free-defconfig-db4b71ff10 | 3 --- 3 files changed, 6 insertions(+), 15 deletions(-) rename free-defconfig-d5c31acee4 => free-defconfig-db4b71ff10 (88%) diff --git a/Makefile b/Makefile index 58e57c0..a93ca20 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,15 @@ -CONFIG=free-defconfig-d5c31acee4 -SDK_VERSION=2022-04-04_9a8d0a03db -BOOTSPLASH=bootsplash.jpg -# BOOTORDER=bootorder -REPO_URL=https://github.com/coreboot/coreboot.git -COMMIT=d5c31acee4 +COMMIT=db4b71ff10 +SDK_VERSION=2022-12-18_3b32af950d +CONFIG=free-defconfig-$(COMMIT) +BOOTSPLASH=bootsplash.jpg + +REPO_URL=https://github.com/coreboot/coreboot.git COREBOOT_CONFIG=coreboot/.config BUILDER=./coreboot-sdk.sh \ --config $(CONFIG) \ --sdk-version $(SDK_VERSION) \ --bootsplash $(BOOTSPLASH) -#--bootorder $(BOOTORDER) .PHONY: clean nuke defconfig checkout flash diff --git a/coreboot-sdk.sh b/coreboot-sdk.sh index 8f73693..b54c408 100755 --- a/coreboot-sdk.sh +++ b/coreboot-sdk.sh @@ -8,9 +8,6 @@ while :; do --sdk-version) SDK_VERSION="$2" shift 2;; - --bootorder) - BOOTORDER="$2" - shift 2;; --bootsplash) BOOTSPLASH="$2" shift 2;; @@ -31,5 +28,3 @@ docker run --rm -it \ -v "$(pwd)/${BOOTSPLASH}:/home/coreboot/cb_build/bootsplash.jpg:ro" \ coreboot/coreboot-sdk:"$SDK_VERSION" \ "$@" - -# -v "$(pwd)/${BOOTORDER}:/home/coreboot/cb_build/bootorder:ro" \ diff --git a/free-defconfig-d5c31acee4 b/free-defconfig-db4b71ff10 similarity index 88% rename from free-defconfig-d5c31acee4 rename to free-defconfig-db4b71ff10 index b0a3145..8e86dee 100644 --- a/free-defconfig-d5c31acee4 +++ b/free-defconfig-db4b71ff10 @@ -4,14 +4,12 @@ CONFIG_NO_POST=y CONFIG_CBFS_SIZE=0x400000 CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=768 CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=1024 -CONFIG_ONBOARD_VGA_IS_PRIMARY=y CONFIG_SEABIOS_PS2_TIMEOUT=5000 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_PCIEXP_HOTPLUG_BUSES=8 CONFIG_PCIEXP_HOTPLUG_MEM=0x800000 CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000 CONFIG_BOARD_LENOVO_X230=y -CONFIG_UART_PCI_ADDR=0x0 # CONFIG_H8_BEEP_ON_DEATH is not set CONFIG_H8_SUPPORT_BT_ON_WIFI=y CONFIG_BOOTBLOCK_NORMAL=y @@ -25,4 +23,3 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y CONFIG_SEABIOS_DEBUG_LEVEL=-1 CONFIG_COREINFO_SECONDARY_PAYLOAD=y CONFIG_NVRAMCUI_SECONDARY_PAYLOAD=y -# CONFIG_SEABIOS_BOOTORDER_FILE="bootorder"