Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
modules/coreboot: readd dasharo fork's unreleased patch folder tempor…
…arily to show Pr0 missing in fork and not applying cleanly Repro: 1- edit build/x86/coreboot-dasahro/.canary, modify git hash string by one char 2- try to apply pr0 patch from patches/coreboot-dasharo-unreleased (missing under Dasahro's fork) user@localhost:~/heads$ ./docker_repro.sh make BOARD=novacustom-v560tu Using CircleCI Docker image: tlaurion/heads-dev-env:v0.2.4 ---- Usage reminder: The minimal command is 'make BOARD=XYZ', where additional options, including 'V=1' or 'CPUS=N' are optional. For more advanced QEMU testing options, refer to targets/qemu.md and boards/qemu-*/*.config. Type exit within docker image to get back to host if launched interactively! ---- --->Launching container with access to host's USB buses (some USB devices were connected to host)... ---------------------------------------------------------------------- !!!!!! BUILD SYSTEM INFO !!!!!! System CPUS: 12 System Available Memory: 16911 GB System Load Average: 0.19 ---------------------------------------------------------------------- Used **CPUS**: 12 Used **LOADAVG**: 18 Used **AVAILABLE_MEM_GB**: 16910 GB ---------------------------------------------------------------------- **MAKE_JOBS**: -j12 --load-average=18 Variables available for override (use 'make VAR_NAME=value'): **CPUS** (default: number of processors, e.g., 'make CPUS=4') **LOADAVG** (default: 1.5 times CPUS, e.g., 'make LOADAVG=54') **AVAILABLE_MEM_GB** (default: memory available on the system in GB, e.g., 'make AVAILABLE_MEM_GB=4') **MEM_PER_JOB_GB** (default: 1GB per job, e.g., 'make MEM_PER_JOB_GB=2') ---------------------------------------------------------------------- !!!!!! Build starts !!!!!! Makefile:270: warning: overriding recipe for target 'all' Makefile:251: warning: ignoring old recipe for target 'all' if [ ! -e "/home/user/heads/build/x86/coreboot-dasharo/.canary" ]; then git clone https://github.com/dasharo/coreboot "/home/user/heads/build/x86/coreboot-dasharo"; git -C "/home/user/heads/build/x86/coreboot-dasharo" reset --hard db1d9cd59d0d7d5b708bbdf8670780914061410c; echo -n 'https://github.com/dasharo/coreboot|db1d9cd59d0d7d5b708bbdf8670780914061410c' > "/home/user/heads/build/x86/coreboot-dasharo/.canary"; elif [ "$(cat "/home/user/heads/build/x86/coreboot-dasharo/.canary")" != 'https://github.com/dasharo/coreboot|db1d9cd59d0d7d5b708bbdf8670780914061410c' ]; then echo "Switching coreboot-dasharo to https://github.com/dasharo/coreboot at db1d9cd59d0d7d5b708bbdf8670780914061410c" && git -C "/home/user/heads/build/x86/coreboot-dasharo" reset --hard HEAD^ && echo "git fetch https://github.com/dasharo/coreboot db1d9cd59d0d7d5b708bbdf8670780914061410c --recurse-submodules=no" && git -C "/home/user/heads/build/x86/coreboot-dasharo" fetch https://github.com/dasharo/coreboot db1d9cd59d0d7d5b708bbdf8670780914061410c --recurse-submodules=no && echo "git reset --hard db1d9cd59d0d7d5b708bbdf8670780914061410c" && git -C "/home/user/heads/build/x86/coreboot-dasharo" reset --hard db1d9cd59d0d7d5b708bbdf8670780914061410c && echo "git clean" && git -C "/home/user/heads/build/x86/coreboot-dasharo" clean -df && git -C "/home/user/heads/build/x86/coreboot-dasharo" clean -dffx payloads util/cbmem && echo "git submodule sync" && git -C "/home/user/heads/build/x86/coreboot-dasharo" submodule sync && echo "git submodule update" && git -C "/home/user/heads/build/x86/coreboot-dasharo" submodule update --init --checkout && echo -n 'https://github.com/dasharo/coreboot|db1d9cd59d0d7d5b708bbdf8670780914061410c' > "/home/user/heads/build/x86/coreboot-dasharo/.canary"; fi if [ ! -e "/home/user/heads/build/x86/coreboot-dasharo/.patched" ]; then if [ -r patches/coreboot-dasharo-unreleased.patch ]; then ( git apply --verbose --reject --binary --directory build/x86/coreboot-dasharo ) < patches/coreboot-dasharo-unreleased.patch || exit 1 ; fi && if [ -d patches/coreboot-dasharo-unreleased ] && [ -r patches/coreboot-dasharo-unreleased ] ; then for patch in patches/coreboot-dasharo-unreleased/*.patch ; do echo "Applying patch file : $patch " ; ( git apply --verbose --reject --binary --directory build/x86/coreboot-dasharo ) < $patch || exit 1 ; done ; fi && touch "/home/user/heads/build/x86/coreboot-dasharo/.patched"; fi Applying patch file : patches/coreboot-dasharo-unreleased/0002-pr0_chipset_locking-post_skylake.patch <stdin>:149: trailing whitespace. Checking patch build/x86/coreboot-dasharo/src/soc/intel/alderlake/finalize.c... error: while searching for: printk(BIOS_DEBUG, "Finalizing chipset.\n"); pch_finalize(); apm_control(APM_CNT_FINALIZE); tbt_finalize(); if (CONFIG(USE_FSP_NOTIFY_PHASE_READY_TO_BOOT) && CONFIG(USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE)) error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/alderlake/finalize.c:84 Checking patch build/x86/coreboot-dasharo/src/soc/intel/cannonlake/finalize.c... error: while searching for: printk(BIOS_DEBUG, "Finalizing chipset.\n"); pch_finalize(); apm_control(APM_CNT_FINALIZE); if (CONFIG(DISABLE_HECI1_AT_PRE_BOOT) && CONFIG(SOC_INTEL_COMMON_BLOCK_HECI1_DISABLE_USING_PMC_IPC)) heci1_disable(); error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/cannonlake/finalize.c:87 Checking patch build/x86/coreboot-dasharo/src/soc/intel/common/block/lpc/Makefile.inc... error: build/x86/coreboot-dasharo/src/soc/intel/common/block/lpc/Makefile.inc: No such file or directory Checking patch build/x86/coreboot-dasharo/src/soc/intel/common/block/smm/smihandler.c... error: while searching for: error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/common/block/smm/smihandler.c:15 error: while searching for: } finalize_done = 1; if (CONFIG(SPI_FLASH_SMM)) /* Re-init SPI driver to handle locked BAR */ fast_spi_init(); error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/common/block/smm/smihandler.c:343 Checking patch build/x86/coreboot-dasharo/src/soc/intel/common/pch/include/intelpch/lockdown.h... error: while searching for: */ void soc_lockdown_config(int chipset_lockdown); error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/common/pch/include/intelpch/lockdown.h:22 Checking patch build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/Kconfig... error: while searching for: config SOC_INTEL_COMMON_PCH_LOCKDOWN bool default n help This option allows to have chipset lockdown for DMI, FAST_SPI and soc_lockdown_config() to implement any additional lockdown as PMC, LPC for supported PCH. error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/Kconfig:1 Checking patch build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/Makefile.inc... error: build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/Makefile.inc: No such file or directory Checking patch build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/lockdown.c... error: while searching for: /* Set FAST_SPI opcode menu */ fast_spi_set_opcode_menu(); /* Discrete Lock Flash PR registers */ fast_spi_pr_dlock(); /* Check if SPI transaction is pending */ fast_spi_cycle_in_progress(); /* Clear any outstanding status bits like AEL, FCERR, FDONE, SAF etc. */ fast_spi_clear_outstanding_status(); /* Lock FAST_SPIBAR */ fast_spi_lock_bar(); /* Set Vendor Component Lock (VCL) */ fast_spi_vscc0_lock(); /* Set BIOS Interface Lock, BIOS Lock */ if (chipset_lockdown == CHIPSET_LOCKDOWN_COREBOOT) { /* BIOS Interface Lock */ error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/lockdown.c:61 error: while searching for: } } static void lpc_lockdown_config(int chipset_lockdown) { /* Set BIOS Interface Lock, BIOS Lock */ if (chipset_lockdown == CHIPSET_LOCKDOWN_COREBOOT) { /* BIOS Interface Lock */ lpc_set_bios_interface_lock_down(); /* Only allow writes in SMM */ if (CONFIG(BOOTMEDIA_SMM_BWP) && is_smm_bwp_permitted()) { lpc_set_eiss(); lpc_enable_wp(); } /* BIOS Lock */ lpc_set_lock_enable(); } } static void sa_lockdown_config(int chipset_lockdown) { if (!CONFIG(SOC_INTEL_COMMON_BLOCK_SA)) error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/lockdown.c:95 Checking patch build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/lockdown_lpc.c... error: build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/lockdown_lpc.c: already exists in working directory Checking patch build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/lockdown_spi.c... error: build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/lockdown_spi.c: already exists in working directory Checking patch build/x86/coreboot-dasharo/src/soc/intel/denverton_ns/lpc.c... error: while searching for: static void finalize_chipset(void *unused) { apm_control(APM_CNT_FINALIZE); } BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, finalize_chipset, NULL); error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/denverton_ns/lpc.c:536 Checking patch build/x86/coreboot-dasharo/src/soc/intel/elkhartlake/finalize.c... error: while searching for: printk(BIOS_DEBUG, "Finalizing chipset.\n"); pch_finalize(); apm_control(APM_CNT_FINALIZE); if (CONFIG(USE_FSP_NOTIFY_PHASE_READY_TO_BOOT) && CONFIG(USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE)) heci_finalize(); error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/elkhartlake/finalize.c:43 Checking patch build/x86/coreboot-dasharo/src/soc/intel/jasperlake/finalize.c... error: while searching for: printk(BIOS_DEBUG, "Finalizing chipset.\n"); pch_finalize(); apm_control(APM_CNT_FINALIZE); /* Indicate finalize step with post code */ post_code(POSTCODE_OS_BOOT); error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/jasperlake/finalize.c:75 Checking patch build/x86/coreboot-dasharo/src/soc/intel/meteorlake/finalize.c... error: while searching for: printk(BIOS_DEBUG, "Finalizing chipset.\n"); pch_finalize(); apm_control(APM_CNT_FINALIZE); tbt_finalize(); sa_finalize(); if (CONFIG(USE_FSP_NOTIFY_PHASE_READY_TO_BOOT) && error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/meteorlake/finalize.c:75 Checking patch build/x86/coreboot-dasharo/src/soc/intel/skylake/finalize.c... error: while searching for: pch_finalize_script(dev); soc_lockdown(dev); apm_control(APM_CNT_FINALIZE); /* Indicate finalize step with post code */ post_code(POSTCODE_OS_BOOT); error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/skylake/finalize.c:106 Checking patch build/x86/coreboot-dasharo/src/soc/intel/tigerlake/finalize.c... error: while searching for: printk(BIOS_DEBUG, "Finalizing chipset.\n"); pch_finalize(); apm_control(APM_CNT_FINALIZE); tbt_finalize(); if (CONFIG(DISABLE_HECI1_AT_PRE_BOOT)) heci1_disable(); error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/tigerlake/finalize.c:55 Checking patch build/x86/coreboot-dasharo/src/soc/intel/xeon_sp/finalize.c... error: while searching for: if (!CONFIG(USE_PM_ACPI_TIMER)) setbits8(pmc_mmio_regs() + PCH_PWRM_ACPI_TMR_CTL, ACPI_TIM_DIS); apm_control(APM_CNT_FINALIZE); lock_pam0123(); if (CONFIG_MAX_SOCKET > 1) { error: patch failed: build/x86/coreboot-dasharo/src/soc/intel/xeon_sp/finalize.c:59 Applying patch build/x86/coreboot-dasharo/src/soc/intel/alderlake/finalize.c with 1 reject... Rejected hunk #1. Applying patch build/x86/coreboot-dasharo/src/soc/intel/cannonlake/finalize.c with 1 reject... Rejected hunk #1. Applying patch build/x86/coreboot-dasharo/src/soc/intel/common/block/smm/smihandler.c with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applying patch build/x86/coreboot-dasharo/src/soc/intel/common/pch/include/intelpch/lockdown.h with 1 reject... Rejected hunk #1. Applying patch build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/Kconfig with 1 reject... Rejected hunk #1. Applying patch build/x86/coreboot-dasharo/src/soc/intel/common/pch/lockdown/lockdown.c with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applying patch build/x86/coreboot-dasharo/src/soc/intel/denverton_ns/lpc.c with 1 reject... Rejected hunk #1. Applying patch build/x86/coreboot-dasharo/src/soc/intel/elkhartlake/finalize.c with 1 reject... Rejected hunk #1. Applying patch build/x86/coreboot-dasharo/src/soc/intel/jasperlake/finalize.c with 1 reject... Rejected hunk #1. Applying patch build/x86/coreboot-dasharo/src/soc/intel/meteorlake/finalize.c with 1 reject... Rejected hunk #1. Applying patch build/x86/coreboot-dasharo/src/soc/intel/skylake/finalize.c with 1 reject... Rejected hunk #1. Applying patch build/x86/coreboot-dasharo/src/soc/intel/tigerlake/finalize.c with 1 reject... Rejected hunk #1. Applying patch build/x86/coreboot-dasharo/src/soc/intel/xeon_sp/finalize.c with 1 reject... Rejected hunk #1. make: *** [Makefile:570: /home/user/heads/build/x86/coreboot-dasharo/.canary] Error 1 Signed-off-by: Thierry Laurion <insurgo@riseup.net>
- Loading branch information
