Skip to content

Commit 2e64d51

Browse files
tlauriontlaurion
authored
Merge pull request #1943 from tlaurion/add_kconfig_to_use_blobs_on_2412_boards_coreboot_configs
Add kconfig to use blobs on 24.12 boards coreboot configs and proper build output to console
2 parents 594abed + eaebd8d commit 2e64d51

21 files changed

+53
-36
lines changed

‎Makefile

+14-7
Original file line numberDiff line numberDiff line change
@@ -400,27 +400,33 @@ define define_module =
400400
# module-specific cleanup action to get rid of it.
401401
$(build)/$($1_base_dir)/.canary: FORCE
402402
if [ ! -e "$$@" ]; then \
403+
echo "INFO: .canary file not found. Cloning repository $($1_repo) into $(build)/$($1_base_dir)"; \
403404
git clone $($1_repo) "$(build)/$($1_base_dir)"; \
405+
echo "INFO: Resetting repository to commit $($1_commit_hash)"; \
404406
git -C "$(build)/$($1_base_dir)" reset --hard $($1_commit_hash); \
407+
echo "INFO: Creating .canary file with repo and commit hash"; \
405408
echo -n '$($1_repo)|$($1_commit_hash)' > "$$@"; \
406409
elif [ "$$$$(cat "$$@")" != '$($1_repo)|$($1_commit_hash)' ]; then \
407-
echo "Switching $1 to $($1_repo) at $($1_commit_hash)" && \
410+
echo "INFO: Canary file differs. Switching $1 to $($1_repo) at $($1_commit_hash)"; \
408411
git -C "$(build)/$($1_base_dir)" reset --hard HEAD^ && \
409-
echo "git fetch $($1_repo) $($1_commit_hash) --recurse-submodules=no" && \
412+
echo "INFO: Fetching commit $($1_commit_hash) from $($1_repo) (without recursing submodules)"; \
410413
git -C "$(build)/$($1_base_dir)" fetch $($1_repo) $($1_commit_hash) --recurse-submodules=no && \
411-
echo "git reset --hard $($1_commit_hash)" && \
412-
git -C "$(build)/$($1_base_dir)" reset --hard $($1_commit_hash) && \
413-
echo "git clean" && \
414+
echo "INFO: Resetting repository to commit $($1_commit_hash)"; \
415+
git -C "$(build)/$($1_base_dir)" reset --hard $($1_commit_hash); \
416+
echo "INFO: Cleaning repository directory (including payloads and util/cbmem)"; \
414417
git -C "$(build)/$($1_base_dir)" clean -df && \
415418
git -C "$(build)/$($1_base_dir)" clean -dffx payloads util/cbmem && \
416-
echo "git submodule sync" && \
419+
echo "INFO: Synchronizing submodules"; \
417420
git -C "$(build)/$($1_base_dir)" submodule sync && \
418-
echo "git submodule update" && \
421+
echo "INFO: Updating submodules (init and checkout)"; \
419422
git -C "$(build)/$($1_base_dir)" submodule update --init --checkout && \
423+
echo "INFO: Updating .canary file with new repo info"; \
420424
echo -n '$($1_repo)|$($1_commit_hash)' > "$$@"; \
421425
fi
422426
if [ ! -e "$(build)/$($1_base_dir)/.patched" ]; then \
427+
echo "INFO: .patched file not found. Beginning patch application for $1"; \
423428
if [ -r patches/$($1_patch_name).patch ]; then \
429+
echo "INFO: Found patch file patches/$($1_patch_name).patch. Applying patch..."; \
424430
( git apply --verbose --reject --binary --directory build/$(CONFIG_TARGET_ARCH)/$($1_base_dir) ) \
425431
< patches/$($1_patch_name).patch \
426432
|| exit 1 ; \
@@ -434,6 +440,7 @@ define define_module =
434440
|| exit 1 ; \
435441
done ; \
436442
fi && \
443+
echo "INFO: Patches applied successfully. Creating .patched file"; \
437444
touch "$(build)/$($1_base_dir)/.patched"; \
438445
fi
439446
else

‎config/coreboot-novacustom-v540tu.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
161161
#
162162
# CONFIG_BOARD_CLEVO_V540TNX is not set
163163
# CONFIG_BOARD_CLEVO_V560TNX is not set
164-
# CONFIG_BOARD_CLEVO_V560TU is not set
165164
CONFIG_BOARD_CLEVO_V540TU=y
165+
# CONFIG_BOARD_CLEVO_V560TU is not set
166166

167167
#
168168
# Tiger Lake U
@@ -721,7 +721,7 @@ CONFIG_DRIVERS_INTEL_PMC=y
721721
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
722722
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
723723
CONFIG_DRIVERS_MC146818=y
724-
CONFIG_USE_PC_CMOS_ALTCENTURY=n
724+
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
725725
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
726726
CONFIG_MEMORY_MAPPED_TPM=y
727727
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000

‎config/coreboot-novacustom-v560tu.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ CONFIG_DRIVERS_INTEL_PMC=y
721721
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
722722
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
723723
CONFIG_DRIVERS_MC146818=y
724-
CONFIG_USE_PC_CMOS_ALTCENTURY=n
724+
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
725725
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
726726
CONFIG_MEMORY_MAPPED_TPM=y
727727
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000

‎config/coreboot-optiplex-7019_9010-maximized.config

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y
2424
CONFIG_INCLUDE_CONFIG_FILE=y
2525
CONFIG_COLLECT_TIMESTAMPS=y
2626
CONFIG_TIMESTAMPS_ON_CONSOLE=y
27-
# CONFIG_USE_BLOBS is not set
27+
CONFIG_USE_BLOBS=y
28+
# CONFIG_USE_AMD_BLOBS is not set
29+
# CONFIG_USE_QC_BLOBS is not set
2830
# CONFIG_COVERAGE is not set
2931
# CONFIG_UBSAN is not set
3032
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y

‎config/coreboot-optiplex-7019_9010_TXT-maximized.config

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y
2424
CONFIG_INCLUDE_CONFIG_FILE=y
2525
CONFIG_COLLECT_TIMESTAMPS=y
2626
CONFIG_TIMESTAMPS_ON_CONSOLE=y
27-
# CONFIG_USE_BLOBS is not set
27+
CONFIG_USE_BLOBS=y
28+
# CONFIG_USE_AMD_BLOBS is not set
29+
# CONFIG_USE_QC_BLOBS is not set
2830
# CONFIG_COVERAGE is not set
2931
# CONFIG_UBSAN is not set
3032
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y

‎config/coreboot-t420-maximized.config

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ CONFIG_SEPARATE_ROMSTAGE=y
2525
CONFIG_INCLUDE_CONFIG_FILE=y
2626
CONFIG_COLLECT_TIMESTAMPS=y
2727
# CONFIG_TIMESTAMPS_ON_CONSOLE is not set
28-
# CONFIG_USE_BLOBS is not set
28+
CONFIG_USE_BLOBS=y
29+
# CONFIG_USE_AMD_BLOBS is not set
30+
# CONFIG_USE_QC_BLOBS is not set
2931
# CONFIG_COVERAGE is not set
3032
# CONFIG_UBSAN is not set
3133
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
@@ -221,7 +223,6 @@ CONFIG_PS2K_EISAID="PNP0303"
221223
CONFIG_PS2M_EISAID="LEN0015"
222224
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
223225
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
224-
CONFIG_LENOVO_TBFW_BIN=""
225226
CONFIG_D3COLD_SUPPORT=y
226227
# CONFIG_DRIVERS_UART_8250IO is not set
227228
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72

‎config/coreboot-t420.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CONFIG_SEPARATE_ROMSTAGE=y
2525
CONFIG_INCLUDE_CONFIG_FILE=y
2626
CONFIG_COLLECT_TIMESTAMPS=y
2727
# CONFIG_TIMESTAMPS_ON_CONSOLE is not set
28-
# CONFIG_USE_BLOBS is not set
28+
CONFIG_USE_BLOBS=y
2929
# CONFIG_COVERAGE is not set
3030
# CONFIG_UBSAN is not set
3131
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y

‎config/coreboot-t430-legacy-flash.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CONFIG_COMPRESS_RAMSTAGE_LZMA=y
2424
CONFIG_INCLUDE_CONFIG_FILE=y
2525
CONFIG_COLLECT_TIMESTAMPS=y
2626
CONFIG_TIMESTAMPS_ON_CONSOLE=y
27-
# CONFIG_USE_BLOBS is not set
27+
CONFIG_USE_BLOBS=y
2828
# CONFIG_COVERAGE is not set
2929
# CONFIG_UBSAN is not set
3030
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y

‎config/coreboot-t430-legacy.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ CONFIG_SEPARATE_ROMSTAGE=y
2626
CONFIG_INCLUDE_CONFIG_FILE=y
2727
CONFIG_COLLECT_TIMESTAMPS=y
2828
CONFIG_TIMESTAMPS_ON_CONSOLE=y
29-
# CONFIG_USE_BLOBS is not set
29+
CONFIG_USE_BLOBS=y
3030
# CONFIG_COVERAGE is not set
3131
# CONFIG_UBSAN is not set
3232
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y

‎config/coreboot-t430-maximized.config

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ CONFIG_SEPARATE_ROMSTAGE=y
2525
CONFIG_INCLUDE_CONFIG_FILE=y
2626
CONFIG_COLLECT_TIMESTAMPS=y
2727
# CONFIG_TIMESTAMPS_ON_CONSOLE is not set
28-
# CONFIG_USE_BLOBS is not set
28+
CONFIG_USE_BLOBS=y
29+
# CONFIG_USE_AMD_BLOBS is not set
30+
# CONFIG_USE_QC_BLOBS is not set
2931
# CONFIG_COVERAGE is not set
3032
# CONFIG_UBSAN is not set
3133
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
@@ -221,7 +223,6 @@ CONFIG_PS2K_EISAID="PNP0303"
221223
CONFIG_PS2M_EISAID="LEN0015"
222224
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
223225
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
224-
CONFIG_LENOVO_TBFW_BIN=""
225226
CONFIG_D3COLD_SUPPORT=y
226227
# CONFIG_DRIVERS_UART_8250IO is not set
227228
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72

‎config/coreboot-t440p.config

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y
2424
CONFIG_INCLUDE_CONFIG_FILE=y
2525
CONFIG_COLLECT_TIMESTAMPS=y
2626
# CONFIG_TIMESTAMPS_ON_CONSOLE is not set
27-
# CONFIG_USE_BLOBS is not set
27+
CONFIG_USE_BLOBS=y
28+
# CONFIG_USE_AMD_BLOBS is not set
29+
# CONFIG_USE_QC_BLOBS is not set
2830
# CONFIG_COVERAGE is not set
2931
# CONFIG_UBSAN is not set
3032
CONFIG_HAVE_ASAN_IN_ROMSTAGE=y
@@ -220,7 +222,6 @@ CONFIG_PS2K_EISAID="LEN0071"
220222
CONFIG_PS2M_EISAID="LEN0036"
221223
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
222224
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
223-
CONFIG_LENOVO_TBFW_BIN=""
224225
CONFIG_D3COLD_SUPPORT=y
225226
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
226227
# CONFIG_DRIVERS_UART_8250IO is not set

‎config/coreboot-t530-maximized.config

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y
2424
CONFIG_INCLUDE_CONFIG_FILE=y
2525
CONFIG_COLLECT_TIMESTAMPS=y
2626
CONFIG_TIMESTAMPS_ON_CONSOLE=y
27-
# CONFIG_USE_BLOBS is not set
27+
CONFIG_USE_BLOBS=y
28+
# CONFIG_USE_AMD_BLOBS is not set
29+
# CONFIG_USE_QC_BLOBS is not set
2830
# CONFIG_COVERAGE is not set
2931
# CONFIG_UBSAN is not set
3032
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
@@ -221,7 +223,6 @@ CONFIG_PS2M_EISAID="LEN0015"
221223
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
222224
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
223225
CONFIG_BOARD_LENOVO_BASEBOARD_T530=y
224-
CONFIG_LENOVO_TBFW_BIN=""
225226
CONFIG_D3COLD_SUPPORT=y
226227
# CONFIG_DRIVERS_UART_8250IO is not set
227228
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72

‎config/coreboot-w530-maximized.config

-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ CONFIG_PS2M_EISAID="LEN0015"
224224
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
225225
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
226226
CONFIG_BOARD_LENOVO_BASEBOARD_T530=y
227-
CONFIG_LENOVO_TBFW_BIN=""
228227
CONFIG_D3COLD_SUPPORT=y
229228
# CONFIG_DRIVERS_UART_8250IO is not set
230229
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72

‎config/coreboot-w541.config

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y
2424
CONFIG_INCLUDE_CONFIG_FILE=y
2525
CONFIG_COLLECT_TIMESTAMPS=y
2626
# CONFIG_TIMESTAMPS_ON_CONSOLE is not set
27-
# CONFIG_USE_BLOBS is not set
27+
CONFIG_USE_BLOBS=y
28+
# CONFIG_USE_AMD_BLOBS is not set
29+
# CONFIG_USE_QC_BLOBS is not set
2830
# CONFIG_COVERAGE is not set
2931
# CONFIG_UBSAN is not set
3032
CONFIG_HAVE_ASAN_IN_ROMSTAGE=y
@@ -220,7 +222,6 @@ CONFIG_PS2K_EISAID="LEN0071"
220222
CONFIG_PS2M_EISAID="LEN004A"
221223
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
222224
CONFIG_GFX_GMA_PANEL_1_PORT="DP3"
223-
CONFIG_LENOVO_TBFW_BIN=""
224225
CONFIG_D3COLD_SUPPORT=y
225226
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
226227
# CONFIG_DRIVERS_UART_8250IO is not set

‎config/coreboot-x220-maximized.config

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y
2424
CONFIG_INCLUDE_CONFIG_FILE=y
2525
CONFIG_COLLECT_TIMESTAMPS=y
2626
# CONFIG_TIMESTAMPS_ON_CONSOLE is not set
27-
# CONFIG_USE_BLOBS is not set
27+
CONFIG_USE_BLOBS=y
28+
# CONFIG_USE_AMD_BLOBS is not set
29+
# CONFIG_USE_QC_BLOBS is not set
2830
# CONFIG_COVERAGE is not set
2931
# CONFIG_UBSAN is not set
3032
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
@@ -221,7 +223,6 @@ CONFIG_PS2K_EISAID="PNP0303"
221223
CONFIG_PS2M_EISAID="LEN0020"
222224
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
223225
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
224-
CONFIG_LENOVO_TBFW_BIN=""
225226
CONFIG_D3COLD_SUPPORT=y
226227
# CONFIG_DRIVERS_UART_8250IO is not set
227228
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72

‎config/coreboot-x220.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CONFIG_SEPARATE_ROMSTAGE=y
2525
CONFIG_INCLUDE_CONFIG_FILE=y
2626
CONFIG_COLLECT_TIMESTAMPS=y
2727
# CONFIG_TIMESTAMPS_ON_CONSOLE is not set
28-
# CONFIG_USE_BLOBS is not set
28+
CONFIG_USE_BLOBS=y
2929
# CONFIG_COVERAGE is not set
3030
# CONFIG_UBSAN is not set
3131
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y

‎config/coreboot-x230-legacy-flash.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CONFIG_SEPARATE_ROMSTAGE=y
2525
CONFIG_INCLUDE_CONFIG_FILE=y
2626
CONFIG_COLLECT_TIMESTAMPS=y
2727
CONFIG_TIMESTAMPS_ON_CONSOLE=y
28-
# CONFIG_USE_BLOBS is not set
28+
CONFIG_USE_BLOBS=y
2929
# CONFIG_COVERAGE is not set
3030
# CONFIG_UBSAN is not set
3131
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y

‎config/coreboot-x230-legacy.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CONFIG_SEPARATE_ROMSTAGE=y
2525
CONFIG_INCLUDE_CONFIG_FILE=y
2626
CONFIG_COLLECT_TIMESTAMPS=y
2727
CONFIG_TIMESTAMPS_ON_CONSOLE=y
28-
# CONFIG_USE_BLOBS is not set
28+
CONFIG_USE_BLOBS=y
2929
# CONFIG_COVERAGE is not set
3030
# CONFIG_UBSAN is not set
3131
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y

‎config/coreboot-x230-maximized-fhd_edp.config

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y
2424
CONFIG_INCLUDE_CONFIG_FILE=y
2525
CONFIG_COLLECT_TIMESTAMPS=y
2626
CONFIG_TIMESTAMPS_ON_CONSOLE=y
27-
# CONFIG_USE_BLOBS is not set
27+
CONFIG_USE_BLOBS=y
28+
# CONFIG_USE_AMD_BLOBS is not set
29+
# CONFIG_USE_QC_BLOBS is not set
2830
# CONFIG_COVERAGE is not set
2931
# CONFIG_UBSAN is not set
3032
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
@@ -221,7 +223,6 @@ CONFIG_PS2K_EISAID="PNP0303"
221223
CONFIG_PS2M_EISAID="LEN0020"
222224
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
223225
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
224-
CONFIG_LENOVO_TBFW_BIN=""
225226
CONFIG_D3COLD_SUPPORT=y
226227
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
227228
# CONFIG_DRIVERS_UART_8250IO is not set

‎config/coreboot-x230-maximized.config

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y
2424
CONFIG_INCLUDE_CONFIG_FILE=y
2525
CONFIG_COLLECT_TIMESTAMPS=y
2626
CONFIG_TIMESTAMPS_ON_CONSOLE=y
27-
# CONFIG_USE_BLOBS is not set
27+
CONFIG_USE_BLOBS=y
28+
# CONFIG_USE_AMD_BLOBS is not set
29+
# CONFIG_USE_QC_BLOBS is not set
2830
# CONFIG_COVERAGE is not set
2931
# CONFIG_UBSAN is not set
3032
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
@@ -221,7 +223,6 @@ CONFIG_PS2K_EISAID="PNP0303"
221223
CONFIG_PS2M_EISAID="LEN0020"
222224
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
223225
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
224-
CONFIG_LENOVO_TBFW_BIN=""
225226
CONFIG_D3COLD_SUPPORT=y
226227
# CONFIG_DRIVERS_UART_8250IO is not set
227228
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72

‎config/coreboot-z220-cmt.config

-1
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,6 @@ CONFIG_SUPERIO_NUVOTON_NPCD378=y
370370
#
371371
# Embedded Controllers
372372
#
373-
CONFIG_EC_DASHARO_EC_FLASH_SIZE=0x20000
374373

375374
#
376375
# Intel Firmware

0 commit comments

Comments
 (0)