diff --git a/Makefile b/Makefile index e5334097..8f089db2 100644 --- a/Makefile +++ b/Makefile @@ -400,27 +400,33 @@ define define_module = # module-specific cleanup action to get rid of it. $(build)/$($1_base_dir)/.canary: FORCE if [ ! -e "$$@" ]; then \ + echo "INFO: .canary file not found. Cloning repository $($1_repo) into $(build)/$($1_base_dir)"; \ git clone $($1_repo) "$(build)/$($1_base_dir)"; \ + echo "INFO: Resetting repository to commit $($1_commit_hash)"; \ git -C "$(build)/$($1_base_dir)" reset --hard $($1_commit_hash); \ + echo "INFO: Creating .canary file with repo and commit hash"; \ echo -n '$($1_repo)|$($1_commit_hash)' > "$$@"; \ elif [ "$$$$(cat "$$@")" != '$($1_repo)|$($1_commit_hash)' ]; then \ - echo "Switching $1 to $($1_repo) at $($1_commit_hash)" && \ + echo "INFO: Canary file differs. Switching $1 to $($1_repo) at $($1_commit_hash)"; \ git -C "$(build)/$($1_base_dir)" reset --hard HEAD^ && \ - echo "git fetch $($1_repo) $($1_commit_hash) --recurse-submodules=no" && \ + echo "INFO: Fetching commit $($1_commit_hash) from $($1_repo) (without recursing submodules)"; \ git -C "$(build)/$($1_base_dir)" fetch $($1_repo) $($1_commit_hash) --recurse-submodules=no && \ - echo "git reset --hard $($1_commit_hash)" && \ - git -C "$(build)/$($1_base_dir)" reset --hard $($1_commit_hash) && \ - echo "git clean" && \ + echo "INFO: Resetting repository to commit $($1_commit_hash)"; \ + git -C "$(build)/$($1_base_dir)" reset --hard $($1_commit_hash); \ + echo "INFO: Cleaning repository directory (including payloads and util/cbmem)"; \ git -C "$(build)/$($1_base_dir)" clean -df && \ git -C "$(build)/$($1_base_dir)" clean -dffx payloads util/cbmem && \ - echo "git submodule sync" && \ + echo "INFO: Synchronizing submodules"; \ git -C "$(build)/$($1_base_dir)" submodule sync && \ - echo "git submodule update" && \ + echo "INFO: Updating submodules (init and checkout)"; \ git -C "$(build)/$($1_base_dir)" submodule update --init --checkout && \ + echo "INFO: Updating .canary file with new repo info"; \ echo -n '$($1_repo)|$($1_commit_hash)' > "$$@"; \ fi if [ ! -e "$(build)/$($1_base_dir)/.patched" ]; then \ + echo "INFO: .patched file not found. Beginning patch application for $1"; \ if [ -r patches/$($1_patch_name).patch ]; then \ + echo "INFO: Found patch file patches/$($1_patch_name).patch. Applying patch..."; \ ( git apply --verbose --reject --binary --directory build/$(CONFIG_TARGET_ARCH)/$($1_base_dir) ) \ < patches/$($1_patch_name).patch \ || exit 1 ; \ @@ -434,6 +440,7 @@ define define_module = || exit 1 ; \ done ; \ fi && \ + echo "INFO: Patches applied successfully. Creating .patched file"; \ touch "$(build)/$($1_base_dir)/.patched"; \ fi else diff --git a/config/coreboot-novacustom-v540tu.config b/config/coreboot-novacustom-v540tu.config index d216f84b..4f947d78 100644 --- a/config/coreboot-novacustom-v540tu.config +++ b/config/coreboot-novacustom-v540tu.config @@ -161,8 +161,8 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 # # CONFIG_BOARD_CLEVO_V540TNX is not set # CONFIG_BOARD_CLEVO_V560TNX is not set -# CONFIG_BOARD_CLEVO_V560TU is not set CONFIG_BOARD_CLEVO_V540TU=y +# CONFIG_BOARD_CLEVO_V560TU is not set # # Tiger Lake U @@ -721,7 +721,7 @@ CONFIG_DRIVERS_INTEL_PMC=y # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set # CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y -CONFIG_USE_PC_CMOS_ALTCENTURY=n +# CONFIG_USE_PC_CMOS_ALTCENTURY is not set CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70 CONFIG_MEMORY_MAPPED_TPM=y CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000 diff --git a/config/coreboot-novacustom-v560tu.config b/config/coreboot-novacustom-v560tu.config index b2e12964..66a6a530 100644 --- a/config/coreboot-novacustom-v560tu.config +++ b/config/coreboot-novacustom-v560tu.config @@ -721,7 +721,7 @@ CONFIG_DRIVERS_INTEL_PMC=y # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set # CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y -CONFIG_USE_PC_CMOS_ALTCENTURY=n +# CONFIG_USE_PC_CMOS_ALTCENTURY is not set CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70 CONFIG_MEMORY_MAPPED_TPM=y CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000 diff --git a/config/coreboot-optiplex-7019_9010-maximized.config b/config/coreboot-optiplex-7019_9010-maximized.config index 73963c3c..e19295b1 100644 --- a/config/coreboot-optiplex-7019_9010-maximized.config +++ b/config/coreboot-optiplex-7019_9010-maximized.config @@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y CONFIG_TIMESTAMPS_ON_CONSOLE=y -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y +# CONFIG_USE_AMD_BLOBS is not set +# CONFIG_USE_QC_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y diff --git a/config/coreboot-optiplex-7019_9010_TXT-maximized.config b/config/coreboot-optiplex-7019_9010_TXT-maximized.config index 1c5023fe..79d2bd4d 100644 --- a/config/coreboot-optiplex-7019_9010_TXT-maximized.config +++ b/config/coreboot-optiplex-7019_9010_TXT-maximized.config @@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y CONFIG_TIMESTAMPS_ON_CONSOLE=y -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y +# CONFIG_USE_AMD_BLOBS is not set +# CONFIG_USE_QC_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y diff --git a/config/coreboot-t420-maximized.config b/config/coreboot-t420-maximized.config index c54c0719..be42a857 100644 --- a/config/coreboot-t420-maximized.config +++ b/config/coreboot-t420-maximized.config @@ -25,7 +25,9 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y +# CONFIG_USE_AMD_BLOBS is not set +# CONFIG_USE_QC_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y @@ -221,7 +223,6 @@ CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="LEN0015" CONFIG_THINKPADEC_HKEY_EISAID="LEN0068" CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" -CONFIG_LENOVO_TBFW_BIN="" CONFIG_D3COLD_SUPPORT=y # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72 diff --git a/config/coreboot-t420.config b/config/coreboot-t420.config index f64676b2..e332fd78 100644 --- a/config/coreboot-t420.config +++ b/config/coreboot-t420.config @@ -25,7 +25,7 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y diff --git a/config/coreboot-t430-legacy-flash.config b/config/coreboot-t430-legacy-flash.config index 14e96a54..13f1e0f8 100644 --- a/config/coreboot-t430-legacy-flash.config +++ b/config/coreboot-t430-legacy-flash.config @@ -24,7 +24,7 @@ CONFIG_COMPRESS_RAMSTAGE_LZMA=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y CONFIG_TIMESTAMPS_ON_CONSOLE=y -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y diff --git a/config/coreboot-t430-legacy.config b/config/coreboot-t430-legacy.config index 47bd1e16..03555f25 100644 --- a/config/coreboot-t430-legacy.config +++ b/config/coreboot-t430-legacy.config @@ -26,7 +26,7 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y CONFIG_TIMESTAMPS_ON_CONSOLE=y -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y diff --git a/config/coreboot-t430-maximized.config b/config/coreboot-t430-maximized.config index 0eb88c11..194bcca4 100644 --- a/config/coreboot-t430-maximized.config +++ b/config/coreboot-t430-maximized.config @@ -25,7 +25,9 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y +# CONFIG_USE_AMD_BLOBS is not set +# CONFIG_USE_QC_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y @@ -221,7 +223,6 @@ CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="LEN0015" CONFIG_THINKPADEC_HKEY_EISAID="LEN0068" CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" -CONFIG_LENOVO_TBFW_BIN="" CONFIG_D3COLD_SUPPORT=y # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72 diff --git a/config/coreboot-t440p.config b/config/coreboot-t440p.config index c9851bbb..e3f91d4c 100644 --- a/config/coreboot-t440p.config +++ b/config/coreboot-t440p.config @@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y +# CONFIG_USE_AMD_BLOBS is not set +# CONFIG_USE_QC_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_ROMSTAGE=y @@ -220,7 +222,6 @@ CONFIG_PS2K_EISAID="LEN0071" CONFIG_PS2M_EISAID="LEN0036" CONFIG_THINKPADEC_HKEY_EISAID="LEN0068" CONFIG_GFX_GMA_PANEL_1_PORT="eDP" -CONFIG_LENOVO_TBFW_BIN="" CONFIG_D3COLD_SUPPORT=y CONFIG_GFX_GMA_PANEL_1_ON_EDP=y # CONFIG_DRIVERS_UART_8250IO is not set diff --git a/config/coreboot-t530-maximized.config b/config/coreboot-t530-maximized.config index 928a6630..b0b9f166 100644 --- a/config/coreboot-t530-maximized.config +++ b/config/coreboot-t530-maximized.config @@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y CONFIG_TIMESTAMPS_ON_CONSOLE=y -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y +# CONFIG_USE_AMD_BLOBS is not set +# CONFIG_USE_QC_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y @@ -221,7 +223,6 @@ CONFIG_PS2M_EISAID="LEN0015" CONFIG_THINKPADEC_HKEY_EISAID="LEN0068" CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" CONFIG_BOARD_LENOVO_BASEBOARD_T530=y -CONFIG_LENOVO_TBFW_BIN="" CONFIG_D3COLD_SUPPORT=y # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72 diff --git a/config/coreboot-w530-maximized.config b/config/coreboot-w530-maximized.config index 31fac888..29926b77 100644 --- a/config/coreboot-w530-maximized.config +++ b/config/coreboot-w530-maximized.config @@ -224,7 +224,6 @@ CONFIG_PS2M_EISAID="LEN0015" CONFIG_THINKPADEC_HKEY_EISAID="LEN0068" CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" CONFIG_BOARD_LENOVO_BASEBOARD_T530=y -CONFIG_LENOVO_TBFW_BIN="" CONFIG_D3COLD_SUPPORT=y # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72 diff --git a/config/coreboot-w541.config b/config/coreboot-w541.config index ea4ea157..d9b307a3 100644 --- a/config/coreboot-w541.config +++ b/config/coreboot-w541.config @@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y +# CONFIG_USE_AMD_BLOBS is not set +# CONFIG_USE_QC_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_ROMSTAGE=y @@ -220,7 +222,6 @@ CONFIG_PS2K_EISAID="LEN0071" CONFIG_PS2M_EISAID="LEN004A" CONFIG_THINKPADEC_HKEY_EISAID="LEN0068" CONFIG_GFX_GMA_PANEL_1_PORT="DP3" -CONFIG_LENOVO_TBFW_BIN="" CONFIG_D3COLD_SUPPORT=y CONFIG_GFX_GMA_PANEL_1_ON_EDP=y # CONFIG_DRIVERS_UART_8250IO is not set diff --git a/config/coreboot-x220-maximized.config b/config/coreboot-x220-maximized.config index b40a8be5..6eaaa9ed 100644 --- a/config/coreboot-x220-maximized.config +++ b/config/coreboot-x220-maximized.config @@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y +# CONFIG_USE_AMD_BLOBS is not set +# CONFIG_USE_QC_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y @@ -221,7 +223,6 @@ CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="LEN0020" CONFIG_THINKPADEC_HKEY_EISAID="IBM0068" CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" -CONFIG_LENOVO_TBFW_BIN="" CONFIG_D3COLD_SUPPORT=y # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72 diff --git a/config/coreboot-x220.config b/config/coreboot-x220.config index c1f5ebba..42852d1c 100644 --- a/config/coreboot-x220.config +++ b/config/coreboot-x220.config @@ -25,7 +25,7 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y diff --git a/config/coreboot-x230-legacy-flash.config b/config/coreboot-x230-legacy-flash.config index 1e288a21..742a62a1 100644 --- a/config/coreboot-x230-legacy-flash.config +++ b/config/coreboot-x230-legacy-flash.config @@ -25,7 +25,7 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y CONFIG_TIMESTAMPS_ON_CONSOLE=y -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y diff --git a/config/coreboot-x230-legacy.config b/config/coreboot-x230-legacy.config index 336170d9..b9bbb185 100644 --- a/config/coreboot-x230-legacy.config +++ b/config/coreboot-x230-legacy.config @@ -25,7 +25,7 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y CONFIG_TIMESTAMPS_ON_CONSOLE=y -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y diff --git a/config/coreboot-x230-maximized-fhd_edp.config b/config/coreboot-x230-maximized-fhd_edp.config index 2b44c336..7c2453e7 100644 --- a/config/coreboot-x230-maximized-fhd_edp.config +++ b/config/coreboot-x230-maximized-fhd_edp.config @@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y CONFIG_TIMESTAMPS_ON_CONSOLE=y -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y +# CONFIG_USE_AMD_BLOBS is not set +# CONFIG_USE_QC_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y @@ -221,7 +223,6 @@ CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="LEN0020" CONFIG_THINKPADEC_HKEY_EISAID="LEN0068" CONFIG_GFX_GMA_PANEL_1_PORT="eDP" -CONFIG_LENOVO_TBFW_BIN="" CONFIG_D3COLD_SUPPORT=y CONFIG_GFX_GMA_PANEL_1_ON_EDP=y # CONFIG_DRIVERS_UART_8250IO is not set diff --git a/config/coreboot-x230-maximized.config b/config/coreboot-x230-maximized.config index 6745203b..ea9f5c9a 100644 --- a/config/coreboot-x230-maximized.config +++ b/config/coreboot-x230-maximized.config @@ -24,7 +24,9 @@ CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y CONFIG_TIMESTAMPS_ON_CONSOLE=y -# CONFIG_USE_BLOBS is not set +CONFIG_USE_BLOBS=y +# CONFIG_USE_AMD_BLOBS is not set +# CONFIG_USE_QC_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_UBSAN is not set CONFIG_HAVE_ASAN_IN_RAMSTAGE=y @@ -221,7 +223,6 @@ CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="LEN0020" CONFIG_THINKPADEC_HKEY_EISAID="LEN0068" CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" -CONFIG_LENOVO_TBFW_BIN="" CONFIG_D3COLD_SUPPORT=y # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72 diff --git a/config/coreboot-z220-cmt.config b/config/coreboot-z220-cmt.config index 22891245..c21ed9e2 100644 --- a/config/coreboot-z220-cmt.config +++ b/config/coreboot-z220-cmt.config @@ -370,7 +370,6 @@ CONFIG_SUPERIO_NUVOTON_NPCD378=y # # Embedded Controllers # -CONFIG_EC_DASHARO_EC_FLASH_SIZE=0x20000 # # Intel Firmware