diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-10-07 00:57:55 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-10-07 01:23:11 +0100 |
| commit | 62cc895c3c293011c256bb8c45cc4c07797cbf36 (patch) | |
| tree | 59dbe281b5d6b8dd7c7ad848e715836744332989 | |
| parent | 3c7e37b15d84cbdac6777c5cdb9f050af1c8b16b (diff) | |
rename blob/ to vendor/
in the future, we may start downloading files that aren't
blobs, such as mxm port configs (on mainboards that use
MXM graphics)
this directory will contain all of those files
generally change the language used, across lbmk, to make
use of "vendorfile" instead of "blob"
Signed-off-by: Leah Rowe <leah@libreboot.org>
103 files changed, 144 insertions, 140 deletions
@@ -22,7 +22,7 @@ /push /version /versiondate -/blob/ +/vendor/ *me.bin *sch5545ec.bin /mrc/ @@ -79,6 +79,8 @@ execute_command() lbmkcmd="${buildpath}/${mode}/${option}" [ "${lbmkcmd}" = "./script/build/boot/roms" ] && \ printf "NOTE: ./build boot roms now: ./build fw coreboot\n" 1>&2 + [ "${lbmkcmd%/*}" = "./script/update/blobs" ] && \ + printf "NOTE: ./update blobs is now: ./update vendor\n" 1>&2 [ -f "${lbmkcmd}" ] || fail "Invalid command. Run: ${linkpath} help" "${lbmkcmd}" $@ || fail "execute_command: ${lbmkcmd} ${@}" } diff --git a/config/coreboot/d510mo/target.cfg b/config/coreboot/d510mo/target.cfg index 22b0d28d..b127411a 100644 --- a/config/coreboot/d510mo/target.cfg +++ b/config/coreboot/d510mo/target.cfg @@ -6,4 +6,4 @@ payload_grub_withseabios="n" payload_seabios="y" payload_memtest="y" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/d510mo_16mb/target.cfg b/config/coreboot/d510mo_16mb/target.cfg index 838b2a05..1bfff85a 100644 --- a/config/coreboot/d510mo_16mb/target.cfg +++ b/config/coreboot/d510mo_16mb/target.cfg @@ -5,4 +5,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb b/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb index 4931eab1..cfdda68d 100644 --- a/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb @@ -149,7 +149,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/e6430/ifd" -CONFIG_ME_BIN_PATH="../../../blob/e6430/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/e6430/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/e6430/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/e6430_12mb/config/libgfxinit_txtmode b/config/coreboot/e6430_12mb/config/libgfxinit_txtmode index 2caa489a..4f2e1f2c 100644 --- a/config/coreboot/e6430_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/e6430_12mb/config/libgfxinit_txtmode @@ -147,7 +147,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/e6430/ifd" -CONFIG_ME_BIN_PATH="../../../blob/e6430/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/e6430/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/e6430/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/g43t-am3/target.cfg b/config/coreboot/g43t-am3/target.cfg index facdd5b5..ac38a6c7 100644 --- a/config/coreboot/g43t-am3/target.cfg +++ b/config/coreboot/g43t-am3/target.cfg @@ -4,5 +4,5 @@ arch="x86_64" payload_seabios="y" payload_memtest="y" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_timeout=10 diff --git a/config/coreboot/g43t-am3_16mb/target.cfg b/config/coreboot/g43t-am3_16mb/target.cfg index facdd5b5..ac38a6c7 100644 --- a/config/coreboot/g43t-am3_16mb/target.cfg +++ b/config/coreboot/g43t-am3_16mb/target.cfg @@ -4,5 +4,5 @@ arch="x86_64" payload_seabios="y" payload_memtest="y" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_timeout=10 diff --git a/config/coreboot/ga-g41m-es2l/target.cfg b/config/coreboot/ga-g41m-es2l/target.cfg index 2bdf0e76..047fced1 100644 --- a/config/coreboot/ga-g41m-es2l/target.cfg +++ b/config/coreboot/ga-g41m-es2l/target.cfg @@ -5,5 +5,5 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ata" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_timeout=10 diff --git a/config/coreboot/gru_bob/target.cfg b/config/coreboot/gru_bob/target.cfg index 9448362c..94e71d96 100644 --- a/config/coreboot/gru_bob/target.cfg +++ b/config/coreboot/gru_bob/target.cfg @@ -2,5 +2,5 @@ tree="cros" romtype="normal" arch="AArch64" payload_uboot="y" -blobs_required="n" +vendorfiles="n" microcode_required="n" diff --git a/config/coreboot/gru_kevin/target.cfg b/config/coreboot/gru_kevin/target.cfg index 9448362c..94e71d96 100644 --- a/config/coreboot/gru_kevin/target.cfg +++ b/config/coreboot/gru_kevin/target.cfg @@ -2,5 +2,5 @@ tree="cros" romtype="normal" arch="AArch64" payload_uboot="y" -blobs_required="n" +vendorfiles="n" microcode_required="n" diff --git a/config/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb index 9cf4da7a..a57c8fbf 100644 --- a/config/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb +++ b/config/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb @@ -150,7 +150,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp2170p_16mb/config/libgfxinit_txtmode b/config/coreboot/hp2170p_16mb/config/libgfxinit_txtmode index a02fa04d..3da84154 100644 --- a/config/coreboot/hp2170p_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/hp2170p_16mb/config/libgfxinit_txtmode @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb b/config/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb index dd08fc97..277baa3f 100644 --- a/config/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb +++ b/config/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_sandybridge/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp_sandybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp_sandybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_sandybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp2560p_8mb/config/libgfxinit_txtmode b/config/coreboot/hp2560p_8mb/config/libgfxinit_txtmode index 3b78b1ee..9320724b 100644 --- a/config/coreboot/hp2560p_8mb/config/libgfxinit_txtmode +++ b/config/coreboot/hp2560p_8mb/config/libgfxinit_txtmode @@ -146,7 +146,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_sandybridge/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp_sandybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp_sandybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_sandybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb index e2f2e4da..f73d7ee7 100644 --- a/config/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb +++ b/config/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb @@ -147,7 +147,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp2570p_16mb/config/libgfxinit_txtmode b/config/coreboot/hp2570p_16mb/config/libgfxinit_txtmode index 38abb85d..9004f50b 100644 --- a/config/coreboot/hp2570p_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/hp2570p_16mb/config/libgfxinit_txtmode @@ -145,7 +145,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb b/config/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb index fb8f8b61..6081e1fa 100644 --- a/config/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb +++ b/config/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8200sff/ifd_4mb" -CONFIG_ME_BIN_PATH="../../../blob/hp8200sff/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp8200sff/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode b/config/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode index c68199c2..8a0406de 100644 --- a/config/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode +++ b/config/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode @@ -146,7 +146,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8200sff/ifd_4mb" -CONFIG_ME_BIN_PATH="../../../blob/hp8200sff/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp8200sff/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb b/config/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb index 765acac8..f6a32f91 100644 --- a/config/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb +++ b/config/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8200sff/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp8200sff/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp8200sff/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode b/config/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode index 5810d993..21e358f0 100644 --- a/config/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode +++ b/config/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode @@ -146,7 +146,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8200sff/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp8200sff/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp8200sff/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb index 139fca7e..60828a93 100644 --- a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb +++ b/config/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8300usdt/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp8300usdt/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp8300usdt/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8300usdt/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode b/config/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode index d1f1fabf..c4176f85 100644 --- a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode @@ -146,7 +146,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8300usdt/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp8300usdt/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp8300usdt/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8300usdt/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb index 120f3fcd..bfc44b72 100644 --- a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb +++ b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb @@ -149,7 +149,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode index cb497353..eff518cc 100644 --- a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode @@ -147,7 +147,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb index 04a52b9c..54659bca 100644 --- a/config/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb +++ b/config/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/hp9470m_16mb/config/libgfxinit_txtmode b/config/coreboot/hp9470m_16mb/config/libgfxinit_txtmode index f8c77b39..568f9e11 100644 --- a/config/coreboot/hp9470m_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/hp9470m_16mb/config/libgfxinit_txtmode @@ -146,7 +146,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd" -CONFIG_ME_BIN_PATH="../../../blob/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg index 0cbae6f0..2c3c1ce1 100644 --- a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg +++ b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" crossgcc_ada="n" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg index 0cbae6f0..2c3c1ce1 100644 --- a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg +++ b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" crossgcc_ada="n" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/kcma-d8-udimm_16mb/target.cfg b/config/coreboot/kcma-d8-udimm_16mb/target.cfg index 3600d6cb..2102dc36 100644 --- a/config/coreboot/kcma-d8-udimm_16mb/target.cfg +++ b/config/coreboot/kcma-d8-udimm_16mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" crossgcc_ada="n" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/kcma-d8-udimm_2mb/target.cfg b/config/coreboot/kcma-d8-udimm_2mb/target.cfg index 3600d6cb..2102dc36 100644 --- a/config/coreboot/kcma-d8-udimm_2mb/target.cfg +++ b/config/coreboot/kcma-d8-udimm_2mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" crossgcc_ada="n" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/kfsn4-dre_1mb/target.cfg b/config/coreboot/kfsn4-dre_1mb/target.cfg index 4f009b44..d00c45d5 100644 --- a/config/coreboot/kfsn4-dre_1mb/target.cfg +++ b/config/coreboot/kfsn4-dre_1mb/target.cfg @@ -5,5 +5,5 @@ payload_seabios="y" payload_memtest="y" crossgcc_ada="n" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_timeout=10 diff --git a/config/coreboot/kfsn4-dre_2mb/target.cfg b/config/coreboot/kfsn4-dre_2mb/target.cfg index b13f2309..5b912388 100644 --- a/config/coreboot/kfsn4-dre_2mb/target.cfg +++ b/config/coreboot/kfsn4-dre_2mb/target.cfg @@ -6,5 +6,5 @@ payload_seabios_withgrub="y" payload_memtest="y" crossgcc_ada="n" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_timeout=10 diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg index 8e768bba..11a1b4e6 100644 --- a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg +++ b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg @@ -6,5 +6,5 @@ payload_seabios_withgrub="y" payload_memtest="y" crossgcc_ada="n" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_timeout=10 diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg index 8e768bba..11a1b4e6 100644 --- a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg +++ b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg @@ -6,5 +6,5 @@ payload_seabios_withgrub="y" payload_memtest="y" crossgcc_ada="n" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_timeout=10 diff --git a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg index c17e207a..d370e627 100644 --- a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg +++ b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg @@ -6,5 +6,5 @@ payload_seabios_withgrub="y" payload_memtest="y" crossgcc_ada="n" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_timeout=10 diff --git a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg index c17e207a..d370e627 100644 --- a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg +++ b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg @@ -6,5 +6,5 @@ payload_seabios_withgrub="y" payload_memtest="y" crossgcc_ada="n" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_timeout=10 diff --git a/config/coreboot/macbook11/target.cfg b/config/coreboot/macbook11/target.cfg index 80a956c7..1bbaa8fc 100644 --- a/config/coreboot/macbook11/target.cfg +++ b/config/coreboot/macbook11/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/macbook11_16mb/target.cfg b/config/coreboot/macbook11_16mb/target.cfg index 80a956c7..1bbaa8fc 100644 --- a/config/coreboot/macbook11_16mb/target.cfg +++ b/config/coreboot/macbook11_16mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/macbook21/target.cfg b/config/coreboot/macbook21/target.cfg index e52b3fd4..135e894b 100644 --- a/config/coreboot/macbook21/target.cfg +++ b/config/coreboot/macbook21/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/macbook21_16mb/target.cfg b/config/coreboot/macbook21_16mb/target.cfg index e52b3fd4..135e894b 100644 --- a/config/coreboot/macbook21_16mb/target.cfg +++ b/config/coreboot/macbook21_16mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/qemu_arm64_12mb/target.cfg b/config/coreboot/qemu_arm64_12mb/target.cfg index a3b1d3e1..928029cb 100644 --- a/config/coreboot/qemu_arm64_12mb/target.cfg +++ b/config/coreboot/qemu_arm64_12mb/target.cfg @@ -2,5 +2,5 @@ tree="default" romtype="normal" arch="AArch64" payload_uboot="y" -blobs_required="n" +vendorfiles="n" microcode_required="n" diff --git a/config/coreboot/qemu_x86_12mb/target.cfg b/config/coreboot/qemu_x86_12mb/target.cfg index 0b51061a..d46f30b7 100644 --- a/config/coreboot/qemu_x86_12mb/target.cfg +++ b/config/coreboot/qemu_x86_12mb/target.cfg @@ -6,5 +6,5 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="both" -blobs_required="n" +vendorfiles="n" microcode_required="n" diff --git a/config/coreboot/r400_16mb/target.cfg b/config/coreboot/r400_16mb/target.cfg index f95efcb6..4dc11195 100644 --- a/config/coreboot/r400_16mb/target.cfg +++ b/config/coreboot/r400_16mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/r400_4mb/target.cfg b/config/coreboot/r400_4mb/target.cfg index 4423dd1d..b3b1d1f5 100644 --- a/config/coreboot/r400_4mb/target.cfg +++ b/config/coreboot/r400_4mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/r400_8mb/target.cfg b/config/coreboot/r400_8mb/target.cfg index 74dda0fd..ffd4bc58 100644 --- a/config/coreboot/r400_8mb/target.cfg +++ b/config/coreboot/r400_8mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/r500_4mb/target.cfg b/config/coreboot/r500_4mb/target.cfg index 26b5beb4..5d911f79 100644 --- a/config/coreboot/r500_4mb/target.cfg +++ b/config/coreboot/r500_4mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/t1650_12mb/config/libgfxinit_txtmode b/config/coreboot/t1650_12mb/config/libgfxinit_txtmode index e913b26b..c8cae1a3 100644 --- a/config/coreboot/t1650_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/t1650_12mb/config/libgfxinit_txtmode @@ -140,7 +140,7 @@ CONFIG_TPM_PIRQ=0x0 CONFIG_BOARD_DELL_PRECISION_T1650=y CONFIG_BOARD_DELL_SNB_IVB_WORKSTATIONS=y CONFIG_INCLUDE_SMSC_SCH5545_EC_FW=y -CONFIG_SMSC_SCH5545_EC_FW_FILE="../../../blob/t1650/sch5545ec.bin" +CONFIG_SMSC_SCH5545_EC_FW_FILE="../../../vendor/t1650/sch5545ec.bin" CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000 CONFIG_ECAM_MMCONF_BUS_NUMBER=64 CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld" @@ -155,7 +155,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/t1650/12_ifd" -CONFIG_ME_BIN_PATH="../../../blob/t1650/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/t1650/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/t1650/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/t400_16mb/target.cfg b/config/coreboot/t400_16mb/target.cfg index f95efcb6..4dc11195 100644 --- a/config/coreboot/t400_16mb/target.cfg +++ b/config/coreboot/t400_16mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/t400_4mb/target.cfg b/config/coreboot/t400_4mb/target.cfg index 4423dd1d..b3b1d1f5 100644 --- a/config/coreboot/t400_4mb/target.cfg +++ b/config/coreboot/t400_4mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/t400_8mb/target.cfg b/config/coreboot/t400_8mb/target.cfg index 74dda0fd..ffd4bc58 100644 --- a/config/coreboot/t400_8mb/target.cfg +++ b/config/coreboot/t400_8mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/t420_8mb/config/libgfxinit_corebootfb b/config/coreboot/t420_8mb/config/libgfxinit_corebootfb index 9e815077..a5b1eab4 100644 --- a/config/coreboot/t420_8mb/config/libgfxinit_corebootfb +++ b/config/coreboot/t420_8mb/config/libgfxinit_corebootfb @@ -150,7 +150,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/t420s_8mb/config/libgfxinit_corebootfb b/config/coreboot/t420s_8mb/config/libgfxinit_corebootfb index 263d15d5..da9726a4 100644 --- a/config/coreboot/t420s_8mb/config/libgfxinit_corebootfb +++ b/config/coreboot/t420s_8mb/config/libgfxinit_corebootfb @@ -150,7 +150,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/t420s_8mb/config/libgfxinit_txtmode b/config/coreboot/t420s_8mb/config/libgfxinit_txtmode index 7b26eb03..5db98be3 100644 --- a/config/coreboot/t420s_8mb/config/libgfxinit_txtmode +++ b/config/coreboot/t420s_8mb/config/libgfxinit_txtmode @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/t430_12mb/config/libgfxinit_corebootfb b/config/coreboot/t430_12mb/config/libgfxinit_corebootfb index 9c21ed44..b4cebd3b 100644 --- a/config/coreboot/t430_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/t430_12mb/config/libgfxinit_corebootfb @@ -149,7 +149,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/t430_12mb/config/libgfxinit_txtmode b/config/coreboot/t430_12mb/config/libgfxinit_txtmode index a384fce0..a2c00df6 100644 --- a/config/coreboot/t430_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/t430_12mb/config/libgfxinit_txtmode @@ -147,7 +147,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode b/config/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode index 00d84b05..4085f2ef 100644 --- a/config/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode @@ -143,7 +143,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd" -CONFIG_ME_BIN_PATH="../../../blob/t440p/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/t440p/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 # CONFIG_ENABLE_DDR_2X_REFRESH is not set diff --git a/config/coreboot/t440pmrc_12mb/config/libgfxinit_corebootfb b/config/coreboot/t440pmrc_12mb/config/libgfxinit_corebootfb index 97e275ac..d36315ac 100644 --- a/config/coreboot/t440pmrc_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/t440pmrc_12mb/config/libgfxinit_corebootfb @@ -146,7 +146,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd" -CONFIG_ME_BIN_PATH="../../../blob/t440p/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/t440p/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 # CONFIG_ENABLE_DDR_2X_REFRESH is not set diff --git a/config/coreboot/t440pmrc_12mb/config/libgfxinit_txtmode b/config/coreboot/t440pmrc_12mb/config/libgfxinit_txtmode index 58551dcd..4dc76d2a 100644 --- a/config/coreboot/t440pmrc_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/t440pmrc_12mb/config/libgfxinit_txtmode @@ -144,7 +144,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd" -CONFIG_ME_BIN_PATH="../../../blob/t440p/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/t440p/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 # CONFIG_ENABLE_DDR_2X_REFRESH is not set diff --git a/config/coreboot/t500_16mb/target.cfg b/config/coreboot/t500_16mb/target.cfg index f95efcb6..4dc11195 100644 --- a/config/coreboot/t500_16mb/target.cfg +++ b/config/coreboot/t500_16mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/t500_4mb/target.cfg b/config/coreboot/t500_4mb/target.cfg index 4423dd1d..b3b1d1f5 100644 --- a/config/coreboot/t500_4mb/target.cfg +++ b/config/coreboot/t500_4mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/t500_8mb/target.cfg b/config/coreboot/t500_8mb/target.cfg index 74dda0fd..ffd4bc58 100644 --- a/config/coreboot/t500_8mb/target.cfg +++ b/config/coreboot/t500_8mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/t520_8mb/config/libgfxinit_corebootfb b/config/coreboot/t520_8mb/config/libgfxinit_corebootfb index 161b5ecb..34cd6a35 100644 --- a/config/coreboot/t520_8mb/config/libgfxinit_corebootfb +++ b/config/coreboot/t520_8mb/config/libgfxinit_corebootfb @@ -150,7 +150,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/t520_8mb/config/libgfxinit_txtmode b/config/coreboot/t520_8mb/config/libgfxinit_txtmode index fd131da0..b3212e1c 100644 --- a/config/coreboot/t520_8mb/config/libgfxinit_txtmode +++ b/config/coreboot/t520_8mb/config/libgfxinit_txtmode @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/t530_12mb/config/libgfxinit_corebootfb b/config/coreboot/t530_12mb/config/libgfxinit_corebootfb index 5dad087b..07a406e8 100644 --- a/config/coreboot/t530_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/t530_12mb/config/libgfxinit_corebootfb @@ -149,7 +149,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/t530_12mb/config/libgfxinit_txtmode b/config/coreboot/t530_12mb/config/libgfxinit_txtmode index 2862cc7e..2a9ecd9e 100644 --- a/config/coreboot/t530_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/t530_12mb/config/libgfxinit_txtmode @@ -147,7 +147,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg index 8a159ad6..91fc7462 100644 --- a/config/coreboot/t60_16mb_intelgpu/target.cfg +++ b/config/coreboot/t60_16mb_intelgpu/target.cfg @@ -7,5 +7,5 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_background="background1024x768.png" diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg index 8a159ad6..91fc7462 100644 --- a/config/coreboot/t60_intelgpu/target.cfg +++ b/config/coreboot/t60_intelgpu/target.cfg @@ -7,5 +7,5 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_background="background1024x768.png" diff --git a/config/coreboot/w500_16mb/target.cfg b/config/coreboot/w500_16mb/target.cfg index f95efcb6..4dc11195 100644 --- a/config/coreboot/w500_16mb/target.cfg +++ b/config/coreboot/w500_16mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/w500_4mb/target.cfg b/config/coreboot/w500_4mb/target.cfg index 4423dd1d..b3b1d1f5 100644 --- a/config/coreboot/w500_4mb/target.cfg +++ b/config/coreboot/w500_4mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/w500_8mb/target.cfg b/config/coreboot/w500_8mb/target.cfg index 74dda0fd..ffd4bc58 100644 --- a/config/coreboot/w500_8mb/target.cfg +++ b/config/coreboot/w500_8mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/w530_12mb/config/libgfxinit_corebootfb b/config/coreboot/w530_12mb/config/libgfxinit_corebootfb index b8ea14ff..aba24f93 100644 --- a/config/coreboot/w530_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/w530_12mb/config/libgfxinit_corebootfb @@ -149,7 +149,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/w530_12mb/config/libgfxinit_txtmode b/config/coreboot/w530_12mb/config/libgfxinit_txtmode index e271af1d..8b397f34 100644 --- a/config/coreboot/w530_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/w530_12mb/config/libgfxinit_txtmode @@ -147,7 +147,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/w541_12mb/config/libgfxinit_txtmode b/config/coreboot/w541_12mb/config/libgfxinit_txtmode index ed0933c1..1f641d69 100644 --- a/config/coreboot/w541_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/w541_12mb/config/libgfxinit_txtmode @@ -143,7 +143,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd" -CONFIG_ME_BIN_PATH="../../../blob/t440p/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/t440p/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 # CONFIG_ENABLE_DDR_2X_REFRESH is not set diff --git a/config/coreboot/w541mrc_12mb/config/libgfxinit_corebootfb b/config/coreboot/w541mrc_12mb/config/libgfxinit_corebootfb index 128630b2..5831dfaa 100644 --- a/config/coreboot/w541mrc_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/w541mrc_12mb/config/libgfxinit_corebootfb @@ -146,7 +146,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd" -CONFIG_ME_BIN_PATH="../../../blob/t440p/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/t440p/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 # CONFIG_ENABLE_DDR_2X_REFRESH is not set diff --git a/config/coreboot/w541mrc_12mb/config/libgfxinit_txtmode b/config/coreboot/w541mrc_12mb/config/libgfxinit_txtmode index f53f8aab..c08d31cd 100644 --- a/config/coreboot/w541mrc_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/w541mrc_12mb/config/libgfxinit_txtmode @@ -144,7 +144,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd" -CONFIG_ME_BIN_PATH="../../../blob/t440p/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/t440p/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 # CONFIG_ENABLE_DDR_2X_REFRESH is not set diff --git a/config/coreboot/x200_16mb/target.cfg b/config/coreboot/x200_16mb/target.cfg index f95efcb6..4dc11195 100644 --- a/config/coreboot/x200_16mb/target.cfg +++ b/config/coreboot/x200_16mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/x200_4mb/target.cfg b/config/coreboot/x200_4mb/target.cfg index 4423dd1d..b3b1d1f5 100644 --- a/config/coreboot/x200_4mb/target.cfg +++ b/config/coreboot/x200_4mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/x200_8mb/target.cfg b/config/coreboot/x200_8mb/target.cfg index 74dda0fd..ffd4bc58 100644 --- a/config/coreboot/x200_8mb/target.cfg +++ b/config/coreboot/x200_8mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/x220_8mb/config/libgfxinit_corebootfb b/config/coreboot/x220_8mb/config/libgfxinit_corebootfb index 7f35472b..cb3532c6 100644 --- a/config/coreboot/x220_8mb/config/libgfxinit_corebootfb +++ b/config/coreboot/x220_8mb/config/libgfxinit_corebootfb @@ -151,7 +151,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/x220_8mb/config/libgfxinit_txtmode b/config/coreboot/x220_8mb/config/libgfxinit_txtmode index 1851816f..d0c0dff2 100644 --- a/config/coreboot/x220_8mb/config/libgfxinit_txtmode +++ b/config/coreboot/x220_8mb/config/libgfxinit_txtmode @@ -149,7 +149,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/x230_12mb/config/libgfxinit_corebootfb b/config/coreboot/x230_12mb/config/libgfxinit_corebootfb index f3942c27..37324b4a 100644 --- a/config/coreboot/x230_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/x230_12mb/config/libgfxinit_corebootfb @@ -150,7 +150,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/x230_12mb/config/libgfxinit_txtmode b/config/coreboot/x230_12mb/config/libgfxinit_txtmode index bf7101fb..ab52ad9b 100644 --- a/config/coreboot/x230_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/x230_12mb/config/libgfxinit_txtmode @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/x230_16mb/config/libgfxinit_corebootfb b/config/coreboot/x230_16mb/config/libgfxinit_corebootfb index 4cc7570f..5ec4f06c 100644 --- a/config/coreboot/x230_16mb/config/libgfxinit_corebootfb +++ b/config/coreboot/x230_16mb/config/libgfxinit_corebootfb @@ -150,7 +150,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/16_ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/x230_16mb/config/libgfxinit_txtmode b/config/coreboot/x230_16mb/config/libgfxinit_txtmode index 7c7aeb75..810e9e4d 100644 --- a/config/coreboot/x230_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/x230_16mb/config/libgfxinit_txtmode @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/16_ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/x230edp_12mb/config/libgfxinit_corebootfb b/config/coreboot/x230edp_12mb/config/libgfxinit_corebootfb index 7555c372..fed08b89 100644 --- a/config/coreboot/x230edp_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/x230edp_12mb/config/libgfxinit_corebootfb @@ -150,7 +150,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/x230edp_12mb/config/libgfxinit_txtmode b/config/coreboot/x230edp_12mb/config/libgfxinit_txtmode index f22941fb..d36fa845 100644 --- a/config/coreboot/x230edp_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/x230edp_12mb/config/libgfxinit_txtmode @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/x230t_12mb/config/libgfxinit_corebootfb b/config/coreboot/x230t_12mb/config/libgfxinit_corebootfb index 9f23183c..02fce758 100644 --- a/config/coreboot/x230t_12mb/config/libgfxinit_corebootfb +++ b/config/coreboot/x230t_12mb/config/libgfxinit_corebootfb @@ -150,7 +150,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/x230t_12mb/config/libgfxinit_txtmode b/config/coreboot/x230t_12mb/config/libgfxinit_txtmode index 8dd44a84..30c34ca6 100644 --- a/config/coreboot/x230t_12mb/config/libgfxinit_txtmode +++ b/config/coreboot/x230t_12mb/config/libgfxinit_txtmode @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/x230t_16mb/config/libgfxinit_corebootfb b/config/coreboot/x230t_16mb/config/libgfxinit_corebootfb index 55240937..5f1d0af7 100644 --- a/config/coreboot/x230t_16mb/config/libgfxinit_corebootfb +++ b/config/coreboot/x230t_16mb/config/libgfxinit_corebootfb @@ -150,7 +150,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/16_ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/x230t_16mb/config/libgfxinit_txtmode b/config/coreboot/x230t_16mb/config/libgfxinit_txtmode index ea048b68..7725fd5d 100644 --- a/config/coreboot/x230t_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/x230t_16mb/config/libgfxinit_txtmode @@ -148,7 +148,7 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/16_ifd" -CONFIG_ME_BIN_PATH="../../../blob/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendor/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_CARDBUS_PLUGIN_SUPPORT=y diff --git a/config/coreboot/x301_16mb/target.cfg b/config/coreboot/x301_16mb/target.cfg index f95efcb6..4dc11195 100644 --- a/config/coreboot/x301_16mb/target.cfg +++ b/config/coreboot/x301_16mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/x301_4mb/target.cfg b/config/coreboot/x301_4mb/target.cfg index 4423dd1d..b3b1d1f5 100644 --- a/config/coreboot/x301_4mb/target.cfg +++ b/config/coreboot/x301_4mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/x301_8mb/target.cfg b/config/coreboot/x301_8mb/target.cfg index 74dda0fd..ffd4bc58 100644 --- a/config/coreboot/x301_8mb/target.cfg +++ b/config/coreboot/x301_8mb/target.cfg @@ -7,4 +7,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg index 8a159ad6..91fc7462 100644 --- a/config/coreboot/x60/target.cfg +++ b/config/coreboot/x60/target.cfg @@ -7,5 +7,5 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_background="background1024x768.png" diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg index 8a159ad6..91fc7462 100644 --- a/config/coreboot/x60_16mb/target.cfg +++ b/config/coreboot/x60_16mb/target.cfg @@ -7,5 +7,5 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" -blobs_required="n" +vendorfiles="n" grub_background="background1024x768.png" diff --git a/config/blobs/sources b/config/vendor/sources index 31d9937e..31d9937e 100644 --- a/config/blobs/sources +++ b/config/vendor/sources diff --git a/include/blobutil.sh b/include/vendor.sh index 08ad3217..d6cb3cf8 100755 --- a/include/blobutil.sh +++ b/include/vendor.sh @@ -4,8 +4,8 @@ _ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" _7ztest="a" -blobdir="blob" -appdir="${blobdir}/app" +vendir="vendor" +appdir="${vendir}/app" cbdir="src/coreboot/default" cbcfgsdir="config/coreboot" ifdtool="cbutils/default/ifdtool" @@ -50,7 +50,7 @@ fetch() [ "${5# }" = "${5}" ] || err "fetch: space not allowed in _dest: '${5}'" [ "${5#/}" = "${5}" ] || err "fetch: absolute path not allowed: '${5}'" _dest="${5##*../}" - _dl="${blobdir}/cache/${dlsum}" + _dl="${vendir}/cache/${dlsum}" x_ mkdir -p "${_dl%/*}" diff --git a/script/build/fw/coreboot b/script/build/fw/coreboot index d7f67ad5..1f5bd7f1 100755 --- a/script/build/fw/coreboot +++ b/script/build/fw/coreboot @@ -25,7 +25,7 @@ kmapdir="config/grub/keymap" pv="payload_grub payload_grub_withseabios payload_seabios payload_memtest" pv="${pv} payload_seabios_withgrub payload_uboot memtest_bin" v="romdir cbdir cbfstool cbrom initmode displaymode cbcfg targetdir tree arch" -v="${v} grub_timeout ubdir blobs_required board grub_scan_disk uboot_config" +v="${v} grub_timeout ubdir vendorfiles board grub_scan_disk uboot_config" eval "$(setvars "n" ${pv})" eval "$(setvars "" ${v})" eval "$(setvars "" boards _displaymode _payload _keyboard all targets)" @@ -108,8 +108,8 @@ check_target() payload_uboot="n" [ "${payload_uboot}" = "y" ] && [ -z ${uboot_config} ] && \ uboot_config="default" - [ "${blobs_required}" != "n" ] && [ "${blobs_required}" != "y" ] && \ - blobs_required="y" + [ "${vendorfiles}" != "n" ] && [ "${vendorfiles}" != "y" ] && \ + vendorfiles="y" # Override all payload directives with cmdline args [ -z ${_payload} ] && return 0 @@ -384,7 +384,7 @@ moverom() { printf "Creating target image: %s\n" "${newrom}" [ -d "${newrom%/*}" ] || x_ mkdir -p "${newrom%/*}/" - [ "${blobs_required}" = "n" ] && newrom="${newrom%.rom}_noblobs.rom" + [ "${vendorfiles}" = "n" ] && newrom="${newrom%.rom}_noblobs.rom" x_ cp "${rompath}" "${newrom}" } diff --git a/script/update/project/build b/script/update/project/build index 69c11105..81343754 100755 --- a/script/update/project/build +++ b/script/update/project/build @@ -91,7 +91,7 @@ handle_targets() printf "Running 'make %s' for project '%s, target '%s''\n" \ "${mode}" "${project}" "${target}" [ "${project}" != "coreboot" ] || [ ! -z ${mode} ] || \ - x_ ./update blobs download ${target} + x_ ./update vendor download ${target} x_ handle_defconfig done diff --git a/script/update/release/roms b/script/update/release/roms index e4d5db4f..60622315 100755 --- a/script/update/release/roms +++ b/script/update/release/roms @@ -120,12 +120,12 @@ strip_archive() done fi - # Hash the rom before removing blobs - x_ rm -f "${romdir}/blobhashes" - x_ touch "${romdir}/blobhashes" + # Hash the rom before removing vendor files + x_ rm -f "${romdir}/vendorhashes" + x_ touch "${romdir}/vendorhashes" ( x_ cd "${romdir}" - x_ sha512sum *.rom >> blobhashes + x_ sha512sum *.rom >> vendorhashes ) for romfile in "${romdir}"/*.rom; do [ -f "${romfile}" ] || continue diff --git a/script/update/blobs/download b/script/update/vendor/download index a1000423..21b0f7ed 100755 --- a/script/update/blobs/download +++ b/script/update/vendor/download @@ -5,7 +5,7 @@ # SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org> . "include/err.sh" -. "include/blobutil.sh" +. "include/vendor.sh" . "include/mrc.sh" . "include/option.sh" @@ -20,10 +20,10 @@ main() check_defconfig "${boarddir}" || exit 0 detect_firmware && exit 0 - scan_config "${_b}" "config/blobs" "err" + scan_config "${_b}" "config/vendor" "err" build_dependencies - download_blobs + download_vendorfiles } detect_firmware() @@ -35,7 +35,7 @@ detect_firmware() CONFIG_VGA_BIOS_FILE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW; do eval "[ -z \"\${${c}}\" ] || return 1" done - printf "Blobs not needed for: %s\n" "${board}" 1>&2 + printf "Vendor files not needed for: %s\n" "${board}" 1>&2 } build_dependencies() @@ -53,7 +53,7 @@ build_dependencies() x_ ./build coreboot utils default } -download_blobs() +download_vendorfiles() { [ -z "${CONFIG_HAVE_ME_BIN}" ] || \ fetch "intel_me" "${DL_url}" "${DL_url_bkup}" "${DL_hash}" \ diff --git a/script/update/blobs/inject b/script/update/vendor/inject index d778fe78..eac4da37 100755 --- a/script/update/blobs/inject +++ b/script/update/vendor/inject @@ -5,7 +5,7 @@ # SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org> . "include/err.sh" -. "include/blobutil.sh" +. "include/vendor.sh" . "include/option.sh" release_archive="n" @@ -30,7 +30,7 @@ main() check_board build_dependencies - inject_blobs + inject_vendorfiles printf "Friendly reminder (this is *not* an error message):\n" printf "Please always ensure that the files were inserted correctly.\n" @@ -89,10 +89,10 @@ build_dependencies() { [ -d "${cbdir}" ] || x_ ./update project trees coreboot default x_ ./build coreboot utils default - x_ ./update blobs download ${board} + x_ ./update vendor download ${board} } -inject_blobs() +inject_vendorfiles() { release_archive="n" [ "${release}" != "true" ] && x_ patch_rom "${rom}" && return 0 @@ -124,7 +124,9 @@ patch_release_roms() x_ cd "${_tmpdir}/bin/"* # NOTE: For compatibility with older rom releases, defer to sha1 - sha512sum --status -c blobhashes || \ + sha512sum --status -c vendorhashes || \ + sha1sum --status -c vendorhashes || \ + sha512sum --status -c blobhashes || \ sha1sum --status -c blobhashes || \ err "patch_release_roms: ROMs did not match expected hashes" ) @@ -151,7 +153,7 @@ patch_rom() # instead re-created at the end, after re-inserting # on roms with microcode, by copying and then removing, # so that the hashes will match (otherwise, cbfstool - # may sometimes insert certain blobs at the wrong offset) + # may sometimes insert certain vendor files at the wrong offset) # (unless nomicrocode is the only config provided) [ "${rom}" != "${rom%_nomicrocode.rom}.rom" ] && \ [ -f "${rom%_nomicrocode.rom}.rom" ] && \ @@ -163,24 +165,24 @@ patch_rom() . "${1}" 2>/dev/null [ "$CONFIG_HAVE_MRC" = "y" ] && \ - inject_blob_intel_mrc "${rom}" + inject_vendorfile_intel_mrc "${rom}" [ "${CONFIG_HAVE_ME_BIN}" = "y" ] && \ - inject_blob_intel_me "${rom}" + inject_vendorfile_intel_me "${rom}" [ "${CONFIG_KBC1126_FIRMWARE}" = "y" ] && \ - inject_blob_hp_kbc1126_ec "${rom}" + inject_vendorfile_hp_kbc1126_ec "${rom}" [ "${CONFIG_VGA_BIOS_FILE}" != "" ] && \ [ "${CONFIG_VGA_BIOS_ID}" != "" ] && \ - inject_blob_dell_e6400_vgarom_nvidia "${rom}" + inject_vendorfile_dell_e6400_vgarom_nvidia "${rom}" [ "${CONFIG_INCLUDE_SMSC_SCH5545_EC_FW}" = "y" ] && \ [ "${CONFIG_SMSC_SCH5545_EC_FW_FILE}" != "" ] && \ - inject_blob_smsc_sch5545_ec "${rom}" + inject_vendorfile_smsc_sch5545_ec "${rom}" [ "${modifygbe}" = "true" ] && ! [ "${release}" = "true" ] && \ modify_gbe "${rom}" printf "ROM image successfully patched: %s\n" "${rom}" } -inject_blob_intel_mrc() +inject_vendorfile_intel_mrc() { rom="${1}" @@ -207,22 +209,22 @@ inject_blob_intel_mrc() -t mrc -b 0xfffa0000 } -inject_blob_intel_me() +inject_vendorfile_intel_me() { printf "adding intel me firmware\n" rom="${1}" [ -z ${CONFIG_ME_BIN_PATH} ] && \ - err "inject_blob_intel_me: CONFIG_ME_BIN_PATH not set" + err "inject_vendorfile_intel_me: CONFIG_ME_BIN_PATH not set" _me_location=${CONFIG_ME_BIN_PATH##*../} [ ! -f "${_me_location}" ] && \ - err "inject_blob_intel_me: per CONFIG_ME_BIN_PATH: file missing" + err "inject_vendorfile_intel_me: per CONFIG_ME_BIN_PATH: file missing" x_ "${ifdtool}" -i me:"${_me_location}" "${rom}" -O "${rom}" } -inject_blob_hp_kbc1126_ec() +inject_vendorfile_hp_kbc1126_ec() { rom="${1}" @@ -234,11 +236,11 @@ inject_blob_hp_kbc1126_ec() printf "adding hp kbc1126 ec firmware\n" if [ "${_ec1_offset}" = "" ] || [ "${_ec1_offset}" = "" ]; then - err "inject_blob_hp_kbc1126_ec: ${board}: offset not declared" + err "inject_vendorfile_hp_kbc1126_ec: ${board}: offset not declared" elif [ "${_ec1_location}" = "" ] || [ "${_ec2_location}" = "" ]; then - err "inject_blob_hp_kbc1126_ec: ${board}: EC path not declared" + err "inject_vendorfile_hp_kbc1126_ec: ${board}: EC path not declared" elif [ ! -f "${_ec1_location}" ] || [ ! -f "${_ec2_location}" ]; then - err "inject_blob_hp_kbc1126_ec: ${board}: ecfw not downloaded" + err "inject_vendorfile_hp_kbc1126_ec: ${board}: ecfw not downloaded" fi x_ "${cbfstool}" "${rom}" add -f "${_ec1_location}" -n ecfw1.bin \ @@ -247,7 +249,7 @@ inject_blob_hp_kbc1126_ec() -b ${_ec2_offset} -t raw } -inject_blob_dell_e6400_vgarom_nvidia() +inject_vendorfile_dell_e6400_vgarom_nvidia() { rom="${1}" @@ -258,20 +260,20 @@ inject_blob_dell_e6400_vgarom_nvidia() printf "adding pci option rom\n" [ "${_vga_dir}" = "${pciromsdir}" ] || \ - err "inject_blob_dell_e6400vga: invalid pcirom dir: ${_vga_dir}" + err "inject_vendorfile_dell_e6400vga: invalid pcirom dir: ${_vga_dir}" [ -f "${_vga_location}" ] || \ - err "inject_blob_dell_e6400vga: ${_vga_location} doesn't exist" + err "inject_vendorfile_dell_e6400vga: ${_vga_location} doesn't exist" x_ "${cbfstool}" "${rom}" add -f "${_vga_location}" \ -n "pci${CONFIG_VGA_BIOS_ID}.rom" -t optionrom } -inject_blob_smsc_sch5545_ec() +inject_vendorfile_smsc_sch5545_ec() { rom="${1}" _sch5545ec_location="${CONFIG_SMSC_SCH5545_EC_FW_FILE##*../}" [ -f "${_sch5545ec_location}" ] || \ - err "inject_blob_smsc_sch5545_ec: SCH5545 fw missing" + err "inject_vendorfile_smsc_sch5545_ec: SCH5545 fw missing" x_ "${cbfstool}" "${rom}" add -f "${_sch5545ec_location}" \ -n sch5545_ecfw.bin -t raw @@ -301,13 +303,13 @@ modify_gbe() usage() { cat <<- EOF - USAGE: ./update blobs inject -r [rom path] -b [boardname] -m [macaddress] - Example: ./update blobs inject -r x230_12mb.rom -b x230_12mb + USAGE: ./update vendor inject -r [rom path] -b [boardname] -m [macaddress] + Example: ./update vendor inject -r x230_12mb.rom -b x230_12mb Adding a macadress to the gbe is optional. If the [-m] parameter is left blank, the gbe will not be touched. - Type './update blobs inject listboards' to get a list of valid boards + Type './update vendor inject listboards' to get a list of valid boards EOF } |