From 62cc895c3c293011c256bb8c45cc4c07797cbf36 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 7 Oct 2023 00:57:55 +0100 Subject: 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 --- .gitignore | 2 +- build | 2 + config/blobs/sources | 122 -------- config/coreboot/d510mo/target.cfg | 2 +- config/coreboot/d510mo_16mb/target.cfg | 2 +- .../e6430_12mb/config/libgfxinit_corebootfb | 2 +- .../coreboot/e6430_12mb/config/libgfxinit_txtmode | 2 +- config/coreboot/g43t-am3/target.cfg | 2 +- config/coreboot/g43t-am3_16mb/target.cfg | 2 +- config/coreboot/ga-g41m-es2l/target.cfg | 2 +- config/coreboot/gru_bob/target.cfg | 2 +- config/coreboot/gru_kevin/target.cfg | 2 +- .../hp2170p_16mb/config/libgfxinit_corebootfb | 2 +- .../hp2170p_16mb/config/libgfxinit_txtmode | 2 +- .../hp2560p_8mb/config/libgfxinit_corebootfb | 2 +- .../coreboot/hp2560p_8mb/config/libgfxinit_txtmode | 2 +- .../hp2570p_16mb/config/libgfxinit_corebootfb | 2 +- .../hp2570p_16mb/config/libgfxinit_txtmode | 2 +- .../hp8200sff_4mb/config/libgfxinit_corebootfb | 2 +- .../hp8200sff_4mb/config/libgfxinit_txtmode | 2 +- .../hp8200sff_8mb/config/libgfxinit_corebootfb | 2 +- .../hp8200sff_8mb/config/libgfxinit_txtmode | 2 +- .../hp8300usdt_16mb/config/libgfxinit_corebootfb | 2 +- .../hp8300usdt_16mb/config/libgfxinit_txtmode | 2 +- .../hp8470pintel_16mb/config/libgfxinit_corebootfb | 2 +- .../hp8470pintel_16mb/config/libgfxinit_txtmode | 2 +- .../hp9470m_16mb/config/libgfxinit_corebootfb | 2 +- .../hp9470m_16mb/config/libgfxinit_txtmode | 2 +- config/coreboot/kcma-d8-rdimm_16mb/target.cfg | 2 +- config/coreboot/kcma-d8-rdimm_2mb/target.cfg | 2 +- config/coreboot/kcma-d8-udimm_16mb/target.cfg | 2 +- config/coreboot/kcma-d8-udimm_2mb/target.cfg | 2 +- config/coreboot/kfsn4-dre_1mb/target.cfg | 2 +- config/coreboot/kfsn4-dre_2mb/target.cfg | 2 +- config/coreboot/kgpe-d16-rdimm_16mb/target.cfg | 2 +- config/coreboot/kgpe-d16-rdimm_2mb/target.cfg | 2 +- config/coreboot/kgpe-d16-udimm_16mb/target.cfg | 2 +- config/coreboot/kgpe-d16-udimm_2mb/target.cfg | 2 +- config/coreboot/macbook11/target.cfg | 2 +- config/coreboot/macbook11_16mb/target.cfg | 2 +- config/coreboot/macbook21/target.cfg | 2 +- config/coreboot/macbook21_16mb/target.cfg | 2 +- config/coreboot/qemu_arm64_12mb/target.cfg | 2 +- config/coreboot/qemu_x86_12mb/target.cfg | 2 +- config/coreboot/r400_16mb/target.cfg | 2 +- config/coreboot/r400_4mb/target.cfg | 2 +- config/coreboot/r400_8mb/target.cfg | 2 +- config/coreboot/r500_4mb/target.cfg | 2 +- .../coreboot/t1650_12mb/config/libgfxinit_txtmode | 4 +- config/coreboot/t400_16mb/target.cfg | 2 +- config/coreboot/t400_4mb/target.cfg | 2 +- config/coreboot/t400_8mb/target.cfg | 2 +- .../coreboot/t420_8mb/config/libgfxinit_corebootfb | 2 +- .../t420s_8mb/config/libgfxinit_corebootfb | 2 +- .../coreboot/t420s_8mb/config/libgfxinit_txtmode | 2 +- .../t430_12mb/config/libgfxinit_corebootfb | 2 +- .../coreboot/t430_12mb/config/libgfxinit_txtmode | 2 +- .../t440plibremrc_12mb/config/libgfxinit_txtmode | 2 +- .../t440pmrc_12mb/config/libgfxinit_corebootfb | 2 +- .../t440pmrc_12mb/config/libgfxinit_txtmode | 2 +- config/coreboot/t500_16mb/target.cfg | 2 +- config/coreboot/t500_4mb/target.cfg | 2 +- config/coreboot/t500_8mb/target.cfg | 2 +- .../coreboot/t520_8mb/config/libgfxinit_corebootfb | 2 +- config/coreboot/t520_8mb/config/libgfxinit_txtmode | 2 +- .../t530_12mb/config/libgfxinit_corebootfb | 2 +- .../coreboot/t530_12mb/config/libgfxinit_txtmode | 2 +- config/coreboot/t60_16mb_intelgpu/target.cfg | 2 +- config/coreboot/t60_intelgpu/target.cfg | 2 +- config/coreboot/w500_16mb/target.cfg | 2 +- config/coreboot/w500_4mb/target.cfg | 2 +- config/coreboot/w500_8mb/target.cfg | 2 +- .../w530_12mb/config/libgfxinit_corebootfb | 2 +- .../coreboot/w530_12mb/config/libgfxinit_txtmode | 2 +- .../coreboot/w541_12mb/config/libgfxinit_txtmode | 2 +- .../w541mrc_12mb/config/libgfxinit_corebootfb | 2 +- .../w541mrc_12mb/config/libgfxinit_txtmode | 2 +- config/coreboot/x200_16mb/target.cfg | 2 +- config/coreboot/x200_4mb/target.cfg | 2 +- config/coreboot/x200_8mb/target.cfg | 2 +- .../coreboot/x220_8mb/config/libgfxinit_corebootfb | 2 +- config/coreboot/x220_8mb/config/libgfxinit_txtmode | 2 +- .../x230_12mb/config/libgfxinit_corebootfb | 2 +- .../coreboot/x230_12mb/config/libgfxinit_txtmode | 2 +- .../x230_16mb/config/libgfxinit_corebootfb | 2 +- .../coreboot/x230_16mb/config/libgfxinit_txtmode | 2 +- .../x230edp_12mb/config/libgfxinit_corebootfb | 2 +- .../x230edp_12mb/config/libgfxinit_txtmode | 2 +- .../x230t_12mb/config/libgfxinit_corebootfb | 2 +- .../coreboot/x230t_12mb/config/libgfxinit_txtmode | 2 +- .../x230t_16mb/config/libgfxinit_corebootfb | 2 +- .../coreboot/x230t_16mb/config/libgfxinit_txtmode | 2 +- config/coreboot/x301_16mb/target.cfg | 2 +- config/coreboot/x301_4mb/target.cfg | 2 +- config/coreboot/x301_8mb/target.cfg | 2 +- config/coreboot/x60/target.cfg | 2 +- config/coreboot/x60_16mb/target.cfg | 2 +- config/vendor/sources | 122 ++++++++ include/blobutil.sh | 103 ------- include/vendor.sh | 103 +++++++ script/build/fw/coreboot | 8 +- script/update/blobs/download | 170 ----------- script/update/blobs/inject | 314 -------------------- script/update/project/build | 2 +- script/update/release/roms | 8 +- script/update/vendor/download | 170 +++++++++++ script/update/vendor/inject | 316 +++++++++++++++++++++ 107 files changed, 818 insertions(+), 814 deletions(-) delete mode 100644 config/blobs/sources create mode 100644 config/vendor/sources delete mode 100755 include/blobutil.sh create mode 100755 include/vendor.sh delete mode 100755 script/update/blobs/download delete mode 100755 script/update/blobs/inject create mode 100755 script/update/vendor/download create mode 100755 script/update/vendor/inject diff --git a/.gitignore b/.gitignore index 5b43df68..f3066aab 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ /push /version /versiondate -/blob/ +/vendor/ *me.bin *sch5545ec.bin /mrc/ diff --git a/build b/build index 0311fb5e..e3ba1b9c 100755 --- a/build +++ b/build @@ -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/blobs/sources b/config/blobs/sources deleted file mode 100644 index 31d9937e..00000000 --- a/config/blobs/sources +++ /dev/null @@ -1,122 +0,0 @@ -# This file holds the download sources for various intel blobs -# board shortnames are listed and enclosed by '{}' followed by an opening -# and closing '{}' for all blobs available for the board. -# The board shortname must be the name of the board minus the trailing rom size. -# If you want to make additions, try to add a backup url for download links and -# list hashes as sha1 sums. - -# NOTE: this file now defines checksums as sha512 (of the sha-2 family), -# where previously we used 160-bit SHA-1 algorithm; SHA-1 is not secure, -# having demonstrated collisions, so we have switched to using sha512sum - -{x230 x230t x230i x230edp t430 t530 w530}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe -} - -{x220 x220t t420 t520 t420s}{ - DL_hash 81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3 - DL_url https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe - DL_url_bkup https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe -} - -# NOTE: google's manifest for archives containing mrc.bin, used here: -# https://web.archive.org/web/20210211071412/https://dl.google.com/dl/edgedl/chromeos/recovery/recovery.conf -{t440pmrc w541mrc t440plibremrc w541}{ - DL_hash f3d79aec805c8b0094a4081be76b3a22d329c479ad18210449b7acc3236ccfc4a2103eaa7c5b79a4872bfd699eede047efd46dfb06dc8f47e3216fc254612998 - DL_url https://download.lenovo.com/pccbbs/mobiles/glrg22ww.exe - DL_url_bkup https://web.archive.org/web/20211120031520/https://download.lenovo.com/pccbbs/mobiles/glrg22ww.exe - MRC_url https://dl.google.com/dl/edgedl/chromeos/recovery/chromeos_12239.92.0_peppy_recovery_stable-channel_mp-v3.bin.zip - MRC_url_bkup https://web.archive.org/web/20200516070928/https://dl.google.com/dl/edgedl/chromeos/recovery/chromeos_12239.92.0_peppy_recovery_stable-channel_mp-v3.bin.zip - MRC_hash 340a1cd41136a3ba0de9d306db0e65f51640a2efe63aee9934f326b276adc1af0a2df80c0731c5a749161ec32546909eedfa8ba95801faeb5dcfe1aa4e0840c7 - MRC_board peppy -} - -{hp8200sff}{ - DL_hash 8fcb691bf84dc1feefc3c84f7cc59eadaabb200477bb3ecba1b050f23f133b0a8c2539015a523f676544c2dff64599bcba7e844e8c31757b90d70bb4485b5664 - DL_url https://ftp.ext.hp.com/pub/softpaq/sp96001-96500/sp96026.exe - DL_url_bkup https://web.archive.org/web/20220708171920/https://ftp.ext.hp.com/pub/softpaq/sp96001-96500/sp96026.exe -} - -{hp8300usdt}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe -} - -{hp2560p}{ - DL_hash 81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3 - DL_url https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe - DL_url_bkup https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe - - EC_hash a602cc7627c569bc423a5857cf506fbc3bcd68cb6b43a7c1b99d12a569b4107c412748cf49605ef4d5b930eb14b6815c4d1b1dc20145fe9d707e445fc201cea2 - EC_url https://ftp.hp.com/pub/softpaq/sp85501-86000/sp85526.exe - EC_url_bkup https://web.archive.org/web/20230416125725/https://ftp.hp.com/pub/softpaq/sp85501-86000/sp85526.exe -} - -{hp2570p}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - - EC_hash 61ed284bdf938c5f36ad3267263fb3963a6608339425bc41aaef3ab0cd98f07c998d816b0233735ca35dc6cb771257da3f09a40d5cfc96bb6388b4366348275e - EC_url https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96085.exe - EC_url_bkup https://web.archive.org/web/20230610174558/https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96085.exe -} - -{hp9470m}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - - EC_hash 563422bf5420da18b89439f28a38ea28a175f0ad3588f0f5ea39b08dfdd14c8d513cbf11c2125ec3869fc3b7222c7dc3d111415185ea9b73f41410b1b57f13bd - EC_url https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96090.exe - EC_url_bkup http://web.archive.org/web/20220504072602/https://ftp.ext.hp.com/pub/softpaq/sp96001-96500/sp96090.exe -} - -{hp2170p}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - - EC_hash 940e533b6a276c13a6e46a93795ca84b19877b05e82c0c1795b7fea9cbea63c28e606ef994352fc77c4fdfb2e0c31c5edeefa98b989e1990364dfc6417b25460 - EC_url https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96088.exe - EC_url_bkup https://web.archive.org/web/20230909164345/https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96088.exe -} - -{t1650}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - - SCH5545EC_DL_url https://dl.dell.com/FOLDER05065992M/1/T1650A28.exe - SCH5545EC_DL_url_bkup https://web.archive.org/web/20230811151654/https://dl.dell.com/FOLDER05065992M/1/T1650A28.exe - SCH5545EC_DL_hash 18261d0f7f27e9de3b0b5a25019b9a934ef1a61cd3f0140e34f38553695e91e671e227a8fa962774edceab5c7804d13ed9fe1c518c5643c7c8f15632f903a6c4 -} - -{hp8470pintel}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - - EC_hash b95c9cf909ed537fb448e2be69eddcb57459efbaf0a979a73cd2bce90a7014b110f4dbbeecfd596c072636396b8f20c229c59ffe34e45500ce9edb000c6ccaf9 - EC_url https://ftp.hp.com/pub/softpaq/sp77501-78000/sp77818.exe - EC_url_bkup https://web.archive.org/web/20230909173821/https://ftp.hp.com/pub/softpaq/sp77501-78000/sp77818.exe -} - -# nvidia vga option rom for dgpu models of Dell Latitude E6400 -# for downloading the nvidia rom to pciroms/pci10de,06eb.rom -{e6400}{ - E6400_VGA_DL_hash 6217d5fce2291d15bb0649fd2faaeb78e4c48962b07a2bea6af60466bfdc5f233af0d077c2c6e71dd96047bdbb1f612324cef0a5e728ba9a9ec5c69a4022cd8d - E6400_VGA_DL_url https://dl.dell.com/FOLDER01530530M/1/E6400A34.exe - E6400_VGA_DL_url_bkup https://web.archive.org/web/20230506014903/https://dl.dell.com/FOLDER01530530M/1/E6400A34.exe - E6400_VGA_offset 274451 - E6400_VGA_romname mod_21.bin -} - -{e6430}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe -} 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/vendor/sources b/config/vendor/sources new file mode 100644 index 00000000..31d9937e --- /dev/null +++ b/config/vendor/sources @@ -0,0 +1,122 @@ +# This file holds the download sources for various intel blobs +# board shortnames are listed and enclosed by '{}' followed by an opening +# and closing '{}' for all blobs available for the board. +# The board shortname must be the name of the board minus the trailing rom size. +# If you want to make additions, try to add a backup url for download links and +# list hashes as sha1 sums. + +# NOTE: this file now defines checksums as sha512 (of the sha-2 family), +# where previously we used 160-bit SHA-1 algorithm; SHA-1 is not secure, +# having demonstrated collisions, so we have switched to using sha512sum + +{x230 x230t x230i x230edp t430 t530 w530}{ + DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c + DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe +} + +{x220 x220t t420 t520 t420s}{ + DL_hash 81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3 + DL_url https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe + DL_url_bkup https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe +} + +# NOTE: google's manifest for archives containing mrc.bin, used here: +# https://web.archive.org/web/20210211071412/https://dl.google.com/dl/edgedl/chromeos/recovery/recovery.conf +{t440pmrc w541mrc t440plibremrc w541}{ + DL_hash f3d79aec805c8b0094a4081be76b3a22d329c479ad18210449b7acc3236ccfc4a2103eaa7c5b79a4872bfd699eede047efd46dfb06dc8f47e3216fc254612998 + DL_url https://download.lenovo.com/pccbbs/mobiles/glrg22ww.exe + DL_url_bkup https://web.archive.org/web/20211120031520/https://download.lenovo.com/pccbbs/mobiles/glrg22ww.exe + MRC_url https://dl.google.com/dl/edgedl/chromeos/recovery/chromeos_12239.92.0_peppy_recovery_stable-channel_mp-v3.bin.zip + MRC_url_bkup https://web.archive.org/web/20200516070928/https://dl.google.com/dl/edgedl/chromeos/recovery/chromeos_12239.92.0_peppy_recovery_stable-channel_mp-v3.bin.zip + MRC_hash 340a1cd41136a3ba0de9d306db0e65f51640a2efe63aee9934f326b276adc1af0a2df80c0731c5a749161ec32546909eedfa8ba95801faeb5dcfe1aa4e0840c7 + MRC_board peppy +} + +{hp8200sff}{ + DL_hash 8fcb691bf84dc1feefc3c84f7cc59eadaabb200477bb3ecba1b050f23f133b0a8c2539015a523f676544c2dff64599bcba7e844e8c31757b90d70bb4485b5664 + DL_url https://ftp.ext.hp.com/pub/softpaq/sp96001-96500/sp96026.exe + DL_url_bkup https://web.archive.org/web/20220708171920/https://ftp.ext.hp.com/pub/softpaq/sp96001-96500/sp96026.exe +} + +{hp8300usdt}{ + DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c + DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe +} + +{hp2560p}{ + DL_hash 81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3 + DL_url https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe + DL_url_bkup https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe + + EC_hash a602cc7627c569bc423a5857cf506fbc3bcd68cb6b43a7c1b99d12a569b4107c412748cf49605ef4d5b930eb14b6815c4d1b1dc20145fe9d707e445fc201cea2 + EC_url https://ftp.hp.com/pub/softpaq/sp85501-86000/sp85526.exe + EC_url_bkup https://web.archive.org/web/20230416125725/https://ftp.hp.com/pub/softpaq/sp85501-86000/sp85526.exe +} + +{hp2570p}{ + DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c + DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + + EC_hash 61ed284bdf938c5f36ad3267263fb3963a6608339425bc41aaef3ab0cd98f07c998d816b0233735ca35dc6cb771257da3f09a40d5cfc96bb6388b4366348275e + EC_url https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96085.exe + EC_url_bkup https://web.archive.org/web/20230610174558/https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96085.exe +} + +{hp9470m}{ + DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c + DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + + EC_hash 563422bf5420da18b89439f28a38ea28a175f0ad3588f0f5ea39b08dfdd14c8d513cbf11c2125ec3869fc3b7222c7dc3d111415185ea9b73f41410b1b57f13bd + EC_url https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96090.exe + EC_url_bkup http://web.archive.org/web/20220504072602/https://ftp.ext.hp.com/pub/softpaq/sp96001-96500/sp96090.exe +} + +{hp2170p}{ + DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c + DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + + EC_hash 940e533b6a276c13a6e46a93795ca84b19877b05e82c0c1795b7fea9cbea63c28e606ef994352fc77c4fdfb2e0c31c5edeefa98b989e1990364dfc6417b25460 + EC_url https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96088.exe + EC_url_bkup https://web.archive.org/web/20230909164345/https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96088.exe +} + +{t1650}{ + DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c + DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + + SCH5545EC_DL_url https://dl.dell.com/FOLDER05065992M/1/T1650A28.exe + SCH5545EC_DL_url_bkup https://web.archive.org/web/20230811151654/https://dl.dell.com/FOLDER05065992M/1/T1650A28.exe + SCH5545EC_DL_hash 18261d0f7f27e9de3b0b5a25019b9a934ef1a61cd3f0140e34f38553695e91e671e227a8fa962774edceab5c7804d13ed9fe1c518c5643c7c8f15632f903a6c4 +} + +{hp8470pintel}{ + DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c + DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + + EC_hash b95c9cf909ed537fb448e2be69eddcb57459efbaf0a979a73cd2bce90a7014b110f4dbbeecfd596c072636396b8f20c229c59ffe34e45500ce9edb000c6ccaf9 + EC_url https://ftp.hp.com/pub/softpaq/sp77501-78000/sp77818.exe + EC_url_bkup https://web.archive.org/web/20230909173821/https://ftp.hp.com/pub/softpaq/sp77501-78000/sp77818.exe +} + +# nvidia vga option rom for dgpu models of Dell Latitude E6400 +# for downloading the nvidia rom to pciroms/pci10de,06eb.rom +{e6400}{ + E6400_VGA_DL_hash 6217d5fce2291d15bb0649fd2faaeb78e4c48962b07a2bea6af60466bfdc5f233af0d077c2c6e71dd96047bdbb1f612324cef0a5e728ba9a9ec5c69a4022cd8d + E6400_VGA_DL_url https://dl.dell.com/FOLDER01530530M/1/E6400A34.exe + E6400_VGA_DL_url_bkup https://web.archive.org/web/20230506014903/https://dl.dell.com/FOLDER01530530M/1/E6400A34.exe + E6400_VGA_offset 274451 + E6400_VGA_romname mod_21.bin +} + +{e6430}{ + DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c + DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe + DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe +} diff --git a/include/blobutil.sh b/include/blobutil.sh deleted file mode 100755 index 08ad3217..00000000 --- a/include/blobutil.sh +++ /dev/null @@ -1,103 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-only -# SPDX-FileCopyrightText: 2023 Leah Rowe - -_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" - -_7ztest="a" -blobdir="blob" -appdir="${blobdir}/app" -cbdir="src/coreboot/default" -cbcfgsdir="config/coreboot" -ifdtool="cbutils/default/ifdtool" -cbfstool="cbutils/default/cbfstool" -nvmutil="util/nvmutil/nvm" -pciromsdir="pciroms" - -mecleaner="${PWD}/src/me_cleaner/me_cleaner.py" -me7updateparser="${PWD}/util/me7_update_parser/me7_update_parser.py" -e6400_unpack="${PWD}/src/bios_extract/dell_inspiron_1100_unpacker.py" -kbc1126_ec_dump="${PWD}/${cbdir}/util/kbc1126/kbc1126_ec_dump" -pfs_extract="${PWD}/src/biosutilities/Dell_PFS_Extract.py" -uefiextract="${PWD}/src/uefitool/uefiextract" - -eval "$(setvars "" EC_url EC_url_bkup EC_hash DL_hash DL_url DL_url_bkup _dest \ - E6400_VGA_DL_hash E6400_VGA_DL_url E6400_VGA_DL_url_bkup E6400_VGA_offset \ - E6400_VGA_romname SCH5545EC_DL_url SCH5545EC_DL_url_bkup SCH5545EC_DL_hash \ - MRC_url MRC_url_bkup MRC_hash MRC_board archive rom board modifygbe _dl \ - new_mac release releasearchive _b boarddir)" - -eval "$(setvars "" CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ - CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE CONFIG_KBC1126_FW1 \ - CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2 CONFIG_KBC1126_FW2_OFFSET \ - CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_GBE_BIN_PATH \ - CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_SMSC_SCH5545_EC_FW_FILE \ - CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE)" - -check_defconfig() -{ - for x in "${1}"/config/*; do - [ -f "${x}" ] && return 0 - done - return 1 -} - -fetch() -{ - dl_type="${1}" - dl="${2}" - dl_bkup="${3}" - dlsum="${4}" - [ "${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}" - - x_ mkdir -p "${_dl%/*}" - - dl_fail="y" - vendor_checksum "${dlsum}" "${_dl}" && dl_fail="n" - for url in "${dl}" "${dl_bkup}"; do - [ "${dl_fail}" = "n" ] && break - [ -z "${url}" ] && continue - x_ rm -f "${_dl}" - curl --location --retry 3 -A "${_ua}" "${url}" -o "${_dl}" || \ - wget --tries 3 -U "${_ua}" "${url}" -O "${_dl}" || \ - continue - vendor_checksum "${dlsum}" "${_dl}" && dl_fail="n" - done - [ "${dl_fail}" = "y" ] && \ - err "fetch ${dlsum}: matched file unavailable" - - x_ rm -Rf "${_dl}_extracted" - mkdirs "${_dest}" "extract_${dl_type}" || return 0 - eval "extract_${dl_type}" - - [ -f "${_dest}" ] && return 0 - err "extract_${dl_type} (fetch): missing file: '${_dest}'" -} - -vendor_checksum() -{ - [ "$(sha512sum ${2} | awk '{print $1}')" != "${1}" ] || return 0 - printf "Bad checksum for file: %s\n" "${2}" 1>&2 - rm -f "${2}" || : - return 1 -} - -mkdirs() -{ - [ -f "${1}" ] && \ - printf "mkdirs ${1} ${2}: already downloaded\n" 1>&2 && return 1 - x_ mkdir -p "${1%/*}" - x_ rm -Rf "${appdir}" - x_ mkdir -p "${appdir}/" - extract_archive "${_dl}" "${appdir}" || \ - [ "${2}" = "extract_e6400vga" ] || err "mkdirs ${1} ${2}: !extract" -} - -extract_archive() -{ - innoextract "${1}" -d "${2}" || python "${pfs_extract}" "${1}" -e || \ - 7z x "${1}" -o"${2}" || unar "${1}" -o "${2}" || \ - unzip "${1}" -d "${2}" || return 1 -} diff --git a/include/vendor.sh b/include/vendor.sh new file mode 100755 index 00000000..d6cb3cf8 --- /dev/null +++ b/include/vendor.sh @@ -0,0 +1,103 @@ +# SPDX-License-Identifier: GPL-3.0-only +# SPDX-FileCopyrightText: 2023 Leah Rowe + +_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" + +_7ztest="a" +vendir="vendor" +appdir="${vendir}/app" +cbdir="src/coreboot/default" +cbcfgsdir="config/coreboot" +ifdtool="cbutils/default/ifdtool" +cbfstool="cbutils/default/cbfstool" +nvmutil="util/nvmutil/nvm" +pciromsdir="pciroms" + +mecleaner="${PWD}/src/me_cleaner/me_cleaner.py" +me7updateparser="${PWD}/util/me7_update_parser/me7_update_parser.py" +e6400_unpack="${PWD}/src/bios_extract/dell_inspiron_1100_unpacker.py" +kbc1126_ec_dump="${PWD}/${cbdir}/util/kbc1126/kbc1126_ec_dump" +pfs_extract="${PWD}/src/biosutilities/Dell_PFS_Extract.py" +uefiextract="${PWD}/src/uefitool/uefiextract" + +eval "$(setvars "" EC_url EC_url_bkup EC_hash DL_hash DL_url DL_url_bkup _dest \ + E6400_VGA_DL_hash E6400_VGA_DL_url E6400_VGA_DL_url_bkup E6400_VGA_offset \ + E6400_VGA_romname SCH5545EC_DL_url SCH5545EC_DL_url_bkup SCH5545EC_DL_hash \ + MRC_url MRC_url_bkup MRC_hash MRC_board archive rom board modifygbe _dl \ + new_mac release releasearchive _b boarddir)" + +eval "$(setvars "" CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ + CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE CONFIG_KBC1126_FW1 \ + CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2 CONFIG_KBC1126_FW2_OFFSET \ + CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_GBE_BIN_PATH \ + CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_SMSC_SCH5545_EC_FW_FILE \ + CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE)" + +check_defconfig() +{ + for x in "${1}"/config/*; do + [ -f "${x}" ] && return 0 + done + return 1 +} + +fetch() +{ + dl_type="${1}" + dl="${2}" + dl_bkup="${3}" + dlsum="${4}" + [ "${5# }" = "${5}" ] || err "fetch: space not allowed in _dest: '${5}'" + [ "${5#/}" = "${5}" ] || err "fetch: absolute path not allowed: '${5}'" + _dest="${5##*../}" + _dl="${vendir}/cache/${dlsum}" + + x_ mkdir -p "${_dl%/*}" + + dl_fail="y" + vendor_checksum "${dlsum}" "${_dl}" && dl_fail="n" + for url in "${dl}" "${dl_bkup}"; do + [ "${dl_fail}" = "n" ] && break + [ -z "${url}" ] && continue + x_ rm -f "${_dl}" + curl --location --retry 3 -A "${_ua}" "${url}" -o "${_dl}" || \ + wget --tries 3 -U "${_ua}" "${url}" -O "${_dl}" || \ + continue + vendor_checksum "${dlsum}" "${_dl}" && dl_fail="n" + done + [ "${dl_fail}" = "y" ] && \ + err "fetch ${dlsum}: matched file unavailable" + + x_ rm -Rf "${_dl}_extracted" + mkdirs "${_dest}" "extract_${dl_type}" || return 0 + eval "extract_${dl_type}" + + [ -f "${_dest}" ] && return 0 + err "extract_${dl_type} (fetch): missing file: '${_dest}'" +} + +vendor_checksum() +{ + [ "$(sha512sum ${2} | awk '{print $1}')" != "${1}" ] || return 0 + printf "Bad checksum for file: %s\n" "${2}" 1>&2 + rm -f "${2}" || : + return 1 +} + +mkdirs() +{ + [ -f "${1}" ] && \ + printf "mkdirs ${1} ${2}: already downloaded\n" 1>&2 && return 1 + x_ mkdir -p "${1%/*}" + x_ rm -Rf "${appdir}" + x_ mkdir -p "${appdir}/" + extract_archive "${_dl}" "${appdir}" || \ + [ "${2}" = "extract_e6400vga" ] || err "mkdirs ${1} ${2}: !extract" +} + +extract_archive() +{ + innoextract "${1}" -d "${2}" || python "${pfs_extract}" "${1}" -e || \ + 7z x "${1}" -o"${2}" || unar "${1}" -o "${2}" || \ + unzip "${1}" -d "${2}" || return 1 +} 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/blobs/download b/script/update/blobs/download deleted file mode 100755 index a1000423..00000000 --- a/script/update/blobs/download +++ /dev/null @@ -1,170 +0,0 @@ -#!/usr/bin/env sh -# SPDX-License-Identifier: GPL-3.0-only -# SPDX-FileCopyrightText: 2022 Caleb La Grange -# SPDX-FileCopyrightText: 2022 Ferass El Hafidi -# SPDX-FileCopyrightText: 2023 Leah Rowe - -. "include/err.sh" -. "include/blobutil.sh" -. "include/mrc.sh" -. "include/option.sh" - -export PATH="${PATH}:/sbin" - -main() -{ - [ $# -gt 0 ] || err "No argument given" - board="${1}" - boarddir="${cbcfgsdir}/${board}" - _b="${board%%_*mb}" # shorthand (avoid duplicating config per rom size) - - check_defconfig "${boarddir}" || exit 0 - detect_firmware && exit 0 - scan_config "${_b}" "config/blobs" "err" - - build_dependencies - download_blobs -} - -detect_firmware() -{ - set -- "${boarddir}/config/"* - . "${1}" 2>/dev/null - - for c in CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_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 -} - -build_dependencies() -{ - [ -d ${cbdir} ] || \ - x_ ./update project trees coreboot ${cbdir##*/} - for d in uefitool biosutilities bios_extract me_cleaner; do - [ -d "src/${d}" ] && continue - x_ ./update project repo "${d}" - done - [ -f "${uefiextract}" ] || \ - x_ ./update project build -b uefitool - [ -f "${kbc1126_ec_dump}" ] || \ - x_ make -C "${cbdir}/util/kbc1126" - x_ ./build coreboot utils default -} - -download_blobs() -{ - [ -z "${CONFIG_HAVE_ME_BIN}" ] || \ - fetch "intel_me" "${DL_url}" "${DL_url_bkup}" "${DL_hash}" \ - "${CONFIG_ME_BIN_PATH}" - [ -z "${CONFIG_INCLUDE_SMSC_SCH5545_EC_FW}" ] || \ - fetch "sch5545ec" "${SCH5545EC_DL_url}" \ - "${SCH5545EC_DL_url_bkup}" "${SCH5545EC_DL_hash}" \ - "${CONFIG_SMSC_SCH5545_EC_FW_FILE}" - [ -z "${CONFIG_KBC1126_FIRMWARE}" ] || \ - fetch "kbc1126ec" "${EC_url}" "${EC_url_bkup}" "${EC_hash}" \ - "${CONFIG_KBC1126_FW1}" - [ -z "${CONFIG_VGA_BIOS_FILE}" ] || \ - fetch "e6400vga" "${E6400_VGA_DL_url}" \ - "${E6400_VGA_DL_url_bkup}" "${E6400_VGA_DL_hash}" \ - "${CONFIG_VGA_BIOS_FILE}" - [ -z "${CONFIG_HAVE_MRC}" ] && return 0 - fetch "mrc" "${MRC_url}" "${MRC_url_bkup}" "${MRC_hash}" \ - "${CONFIG_MRC_FILE}" -} - -extract_intel_me() -{ - _me="${PWD}/${_dest}" # must always be an absolute path - cdir="${PWD}/${appdir}" # must always be an absolute path - [ $# -gt 0 ] && _me="${1}" - [ $# -gt 0 ] && cdir="${2}" - [ -f "${_me}" ] && return 0 - - sdir="$(mktemp -d)" - mkdir -p "${sdir}" || err "extract_intel_me: !mkdir -p \"${sdir}\"" - ( - cd "${cdir}" || err "extract_intel_me: !cd \"${cdir}\"" - for i in *; do - [ -f "${_me}" ] && break - [ -L "${i}" ] && continue - if [ -f "${i}" ]; then - "${mecleaner}" -r -t -O "${sdir}/vendorfile" \ - -M "${_me}" "${i}" && break - "${mecleaner}" -r -t -O "${_me}" "${i}" && break - "${me7updateparser}" -O "${_me}" "${i}" && break - _7ztest="${_7ztest}a" - extract_archive "${i}" "${_7ztest}" || continue - extract_intel_me "${_me}" "${cdir}/${_7ztest}" - elif [ -d "$i" ]; then - extract_intel_me "${_me}" "${cdir}/${i}" - else - continue - fi - cdir="${1}" - cd "${cdir}" - done - ) - rm -Rf "${sdir}" || err "extract_intel_me: !rm -Rf ${sdir}" -} - -extract_kbc1126ec() -{ - ( - x_ cd "${appdir}/" - mv Rompaq/68*.BIN ec.bin || : - if [ ! -f ec.bin ]; then - unar -D ROM.CAB Rom.bin || unar -D Rom.CAB Rom.bin || \ - x_ unar -D 68*.CAB Rom.bin - x_ mv Rom.bin ec.bin - fi - [ -f ec.bin ] || err "extract_kbc1126_ec ${board}: can't extract" - "${kbc1126_ec_dump}" ec.bin || \ - err "extract_kbc1126_ec ${board}: can't extract ecfw1/2.bin" - ) - ec_ex="y" - for i in 1 2; do - [ -f "${appdir}/ec.bin.fw${i}" ] || ec_ex="n" - done - [ "${ec_ex}" = "y" ] || \ - err "extract_kbc1126_ec ${board}: didn't extract ecfw1/2.bin" - x_ cp "${appdir}/"ec.bin.fw* "${_dest%/*}/" -} - -extract_e6400vga() -{ - [ "${E6400_VGA_offset}" = "" ] && \ - err "extract_e6400vga: E6400 VGA offset not defined" - [ "${E6400_VGA_romname}" = "" ] && \ - err "extract_e6400vga: E6400 VGA ROM name not defined" - tail -c +${E6400_VGA_offset} "${_dl}" | \ - gunzip >"${appdir}/bios.bin" || : - ( - x_ cd "${appdir}" - [ -f "bios.bin" ] || err "extract_e6400vga: can't extract bios.bin" - "${e6400_unpack}" bios.bin || printf "TODO: fix dell extract util\n" - [ -f "${E6400_VGA_romname}" ] || \ - err "extract_e6400vga: can't extract vga rom from bios.bin" - ) - x_ cp "${appdir}/${E6400_VGA_romname}" "${_dest}" -} - -extract_sch5545ec() -{ - # full system ROM (UEFI), to extract with UEFIExtract: - _bios="${_dl}_extracted/Firmware" - _bios="${_bios}/1 ${dlsum} -- 1 System BIOS vA.28.bin" - # this is the SCH5545 firmware, inside of the extracted UEFI ROM: - _sch5545ec_fw="${_bios}.dump/4 7A9354D9-0468-444A-81CE-0BF617D890DF" - _sch5545ec_fw="${_sch5545ec_fw}/54 D386BEB8-4B54-4E69-94F5-06091F67E0D3" - _sch5545ec_fw="${_sch5545ec_fw}/0 Raw section/body.bin" # <-- this! - - # this makes the file defined by _sch5545ec_fw available to copy - "${uefiextract}" "${_bios}" || \ - err "extract_sch5545ec: cannot extract from uefi image" - cp "${_sch5545ec_fw}" "${_dest}" || \ - err "extract_sch5545ec: cannot copy sch5545ec firmware file" -} - -main $@ diff --git a/script/update/blobs/inject b/script/update/blobs/inject deleted file mode 100755 index d778fe78..00000000 --- a/script/update/blobs/inject +++ /dev/null @@ -1,314 +0,0 @@ -#!/usr/bin/env sh -# SPDX-License-Identifier: GPL-3.0-only -# SPDX-FileCopyrightText: 2022 Caleb La Grange -# SPDX-FileCopyrightText: 2022 Ferass El Hafidi -# SPDX-FileCopyrightText: 2023 Leah Rowe - -. "include/err.sh" -. "include/blobutil.sh" -. "include/option.sh" - -release_archive="n" - -main() -{ - [ $# -lt 1 ] && err "No options specified." - [ "${1}" = "listboards" ] && \ - listitems config/coreboot && exit 0 - - archive="${1}" - - while getopts r:b:m: option - do - case "${option}" in - r) rom=${OPTARG} ;; - b) board=${OPTARG} ;; - m) modifygbe=true - new_mac=${OPTARG} ;; - esac - done - - check_board - build_dependencies - inject_blobs - - printf "Friendly reminder (this is *not* an error message):\n" - printf "Please always ensure that the files were inserted correctly.\n" -} - -check_board() -{ - if ! check_release "${archive}" ; then - [ -f "${rom}" ] || \ - err "check_board: \"${rom}\" is not a valid path" - [ -z ${rom+x} ] && \ - err "check_board: no rom specified" - [ ! -z ${board+x} ] || \ - board=$(detect_board "${rom}") - else - release=true - releasearchive="${archive}" - board=$(detect_board "${archive}") - fi - - boarddir="${cbcfgsdir}/${board}" - [ -d "${boarddir}" ] && return 0 - err "check_board: board ${board} not found" -} - -check_release() -{ - [ -f "${archive}" ] || return 1 - [ "${archive##*.}" = "xz" ] || return 1 - printf "%s\n" "Release archive ${archive} detected" -} - -# This function tries to determine the board from the filename of the rom. -# It will only succeed if the filename is not changed from the build/download -detect_board() -{ - path="${1}" - filename=$(basename ${path}) - case ${filename} in - grub_*) - board=$(echo "${filename}" | cut -d '_' -f2-3) ;; - seabios_withgrub_*) - board=$(echo "${filename}" | cut -d '_' -f3-4) ;; - *.tar.xz) - _stripped_prefix=${filename#*_} - board="${_stripped_prefix%.tar.xz}" ;; - *) - err "detect_board: could not detect board type" - esac - [ -d "${boarddir}/" ] || \ - err "detect_board: dir, ${boarddir}, doesn't exist" - printf "%s\n" "${board}" -} - -build_dependencies() -{ - [ -d "${cbdir}" ] || x_ ./update project trees coreboot default - x_ ./build coreboot utils default - x_ ./update blobs download ${board} -} - -inject_blobs() -{ - release_archive="n" - [ "${release}" != "true" ] && x_ patch_rom "${rom}" && return 0 - printf "patching release file\n" - release_archive="y" - patch_release_roms -} - -patch_release_roms() -{ - _tmpdir="tmp/romdir" - x_ rm -Rf "${_tmpdir}" - x_ mkdir -p "${_tmpdir}" - x_ tar -xf "${releasearchive}" -C "${_tmpdir}" - - for x in "${_tmpdir}"/bin/*/*.rom ; do - printf "patching rom: %s\n" "$x" - x_ patch_rom "${x}" - done - for x in "${_tmpdir}"/bin/*/*_nomicrocode.rom ; do - [ -f "${x}" ] || continue - [ -f "${x%_nomicrocode.rom}.rom" ] || continue - - x_ cp "${x%_nomicrocode.rom}.rom" "${x}" - x_ "${cbfstool}" "${x}" remove -n cpu_microcode_blob.bin - done - - ( - x_ cd "${_tmpdir}/bin/"* - - # NOTE: For compatibility with older rom releases, defer to sha1 - sha512sum --status -c blobhashes || \ - sha1sum --status -c blobhashes || \ - err "patch_release_roms: ROMs did not match expected hashes" - ) - - if [ "${modifygbe}" = "true" ]; then - for x in "${_tmpdir}"/bin/*/*.rom ; do - modify_gbe "${x}" - done - fi - - [ -d bin/release ] || x_ mkdir -p bin/release - x_ mv "${_tmpdir}"/bin/* bin/release/ - - printf "Success! Your ROMs are in bin/release\n" - - x_ rm -Rf "${_tmpdir}" -} - -patch_rom() -{ - rom="${1}" - - # we don't process no-microcode roms; these are - # 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) - # (unless nomicrocode is the only config provided) - [ "${rom}" != "${rom%_nomicrocode.rom}.rom" ] && \ - [ -f "${rom%_nomicrocode.rom}.rom" ] && \ - [ "${release_archive}" = "y" ] && return 0 - - x_ check_defconfig "${boarddir}" - - set -- "${boarddir}/config/"* - . "${1}" 2>/dev/null - - [ "$CONFIG_HAVE_MRC" = "y" ] && \ - inject_blob_intel_mrc "${rom}" - [ "${CONFIG_HAVE_ME_BIN}" = "y" ] && \ - inject_blob_intel_me "${rom}" - [ "${CONFIG_KBC1126_FIRMWARE}" = "y" ] && \ - inject_blob_hp_kbc1126_ec "${rom}" - [ "${CONFIG_VGA_BIOS_FILE}" != "" ] && \ - [ "${CONFIG_VGA_BIOS_ID}" != "" ] && \ - inject_blob_dell_e6400_vgarom_nvidia "${rom}" - [ "${CONFIG_INCLUDE_SMSC_SCH5545_EC_FW}" = "y" ] && \ - [ "${CONFIG_SMSC_SCH5545_EC_FW_FILE}" != "" ] && \ - inject_blob_smsc_sch5545_ec "${rom}" - [ "${modifygbe}" = "true" ] && ! [ "${release}" = "true" ] && \ - modify_gbe "${rom}" - - printf "ROM image successfully patched: %s\n" "${rom}" -} - -inject_blob_intel_mrc() -{ - rom="${1}" - - printf "adding mrc\n" - - # mrc.bin must be inserted at a specific offset - - # in cbfstool, -b values above 0x80000000 are interpreted as - # top-aligned x86 memory locations. this is converted into an - # absolute offset within the flash, and inserted accordingly - # at that offset into the ROM image file - - # coreboot's own build system hardcodes the mrc.bin offset - # because there is only one correct location in memory, but - # it would be useful for us if it could be easily scanned - # from Kconfig, with the option to change it where in practise - # it is not changed - - # the hardcoded offset below is based upon reading of the coreboot - # source code, and it is *always* correct for haswell platform. - # TODO: this logic should be tweaked to handle more platforms - - x_ "${cbfstool}" "${rom}" add -f mrc/haswell/mrc.bin -n mrc.bin \ - -t mrc -b 0xfffa0000 -} - -inject_blob_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" - - _me_location=${CONFIG_ME_BIN_PATH##*../} - [ ! -f "${_me_location}" ] && \ - err "inject_blob_intel_me: per CONFIG_ME_BIN_PATH: file missing" - - x_ "${ifdtool}" -i me:"${_me_location}" "${rom}" -O "${rom}" -} - -inject_blob_hp_kbc1126_ec() -{ - rom="${1}" - - _ec1_location="${CONFIG_KBC1126_FW1##*../}" - _ec1_offset="${CONFIG_KBC1126_FW1_OFFSET}" - _ec2_location="${CONFIG_KBC1126_FW2##*../}" - _ec2_offset="${CONFIG_KBC1126_FW2_OFFSET}" - - printf "adding hp kbc1126 ec firmware\n" - - if [ "${_ec1_offset}" = "" ] || [ "${_ec1_offset}" = "" ]; then - err "inject_blob_hp_kbc1126_ec: ${board}: offset not declared" - elif [ "${_ec1_location}" = "" ] || [ "${_ec2_location}" = "" ]; then - err "inject_blob_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" - fi - - x_ "${cbfstool}" "${rom}" add -f "${_ec1_location}" -n ecfw1.bin \ - -b ${_ec1_offset} -t raw - x_ "${cbfstool}" "${rom}" add -f "${_ec2_location}" -n ecfw2.bin \ - -b ${_ec2_offset} -t raw -} - -inject_blob_dell_e6400_vgarom_nvidia() -{ - rom="${1}" - - _vga_location="${CONFIG_VGA_BIOS_FILE##*../}" - _vga_dir="${_vga_location%/*}" - _vga_filename="${_vga_location##*/}" - - printf "adding pci option rom\n" - - [ "${_vga_dir}" = "${pciromsdir}" ] || \ - err "inject_blob_dell_e6400vga: invalid pcirom dir: ${_vga_dir}" - [ -f "${_vga_location}" ] || \ - err "inject_blob_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() -{ - rom="${1}" - _sch5545ec_location="${CONFIG_SMSC_SCH5545_EC_FW_FILE##*../}" - [ -f "${_sch5545ec_location}" ] || \ - err "inject_blob_smsc_sch5545_ec: SCH5545 fw missing" - - x_ "${cbfstool}" "${rom}" add -f "${_sch5545ec_location}" \ - -n sch5545_ecfw.bin -t raw -} - -modify_gbe() -{ - printf "changing mac address in gbe to ${new_mac}\n" - [ -z ${CONFIG_GBE_BIN_PATH} ] && \ - err "modify_gbe: ${board}: CONFIG_GBE_BIN_PATH not set" - - rom="${1}" - _gbe_location=${CONFIG_GBE_BIN_PATH##*../} - [ -f "${_gbe_location}" ] || \ - err "modify_gbe: CONFIG_GBE_BIN_PATH points to missing file" - [ -f "${nvmutil}" ] || \ - x_ make -C util/nvmutil - - _gbe_tmp=$(mktemp -t gbeXXXX.bin) - x_ cp "${_gbe_location}" "${_gbe_tmp}" - x_ "${nvmutil}" "${_gbe_tmp}" setmac "${new_mac}" - x_ "${ifdtool}" -i GbE:"${_gbe_tmp}" "${rom}" -O "${rom}" - - x_ rm -f "${_gbe_tmp}" -} - -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 - - 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 - EOF -} - -main $@ 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/vendor/download b/script/update/vendor/download new file mode 100755 index 00000000..21b0f7ed --- /dev/null +++ b/script/update/vendor/download @@ -0,0 +1,170 @@ +#!/usr/bin/env sh +# SPDX-License-Identifier: GPL-3.0-only +# SPDX-FileCopyrightText: 2022 Caleb La Grange +# SPDX-FileCopyrightText: 2022 Ferass El Hafidi +# SPDX-FileCopyrightText: 2023 Leah Rowe + +. "include/err.sh" +. "include/vendor.sh" +. "include/mrc.sh" +. "include/option.sh" + +export PATH="${PATH}:/sbin" + +main() +{ + [ $# -gt 0 ] || err "No argument given" + board="${1}" + boarddir="${cbcfgsdir}/${board}" + _b="${board%%_*mb}" # shorthand (avoid duplicating config per rom size) + + check_defconfig "${boarddir}" || exit 0 + detect_firmware && exit 0 + scan_config "${_b}" "config/vendor" "err" + + build_dependencies + download_vendorfiles +} + +detect_firmware() +{ + set -- "${boarddir}/config/"* + . "${1}" 2>/dev/null + + for c in CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \ + CONFIG_VGA_BIOS_FILE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW; do + eval "[ -z \"\${${c}}\" ] || return 1" + done + printf "Vendor files not needed for: %s\n" "${board}" 1>&2 +} + +build_dependencies() +{ + [ -d ${cbdir} ] || \ + x_ ./update project trees coreboot ${cbdir##*/} + for d in uefitool biosutilities bios_extract me_cleaner; do + [ -d "src/${d}" ] && continue + x_ ./update project repo "${d}" + done + [ -f "${uefiextract}" ] || \ + x_ ./update project build -b uefitool + [ -f "${kbc1126_ec_dump}" ] || \ + x_ make -C "${cbdir}/util/kbc1126" + x_ ./build coreboot utils default +} + +download_vendorfiles() +{ + [ -z "${CONFIG_HAVE_ME_BIN}" ] || \ + fetch "intel_me" "${DL_url}" "${DL_url_bkup}" "${DL_hash}" \ + "${CONFIG_ME_BIN_PATH}" + [ -z "${CONFIG_INCLUDE_SMSC_SCH5545_EC_FW}" ] || \ + fetch "sch5545ec" "${SCH5545EC_DL_url}" \ + "${SCH5545EC_DL_url_bkup}" "${SCH5545EC_DL_hash}" \ + "${CONFIG_SMSC_SCH5545_EC_FW_FILE}" + [ -z "${CONFIG_KBC1126_FIRMWARE}" ] || \ + fetch "kbc1126ec" "${EC_url}" "${EC_url_bkup}" "${EC_hash}" \ + "${CONFIG_KBC1126_FW1}" + [ -z "${CONFIG_VGA_BIOS_FILE}" ] || \ + fetch "e6400vga" "${E6400_VGA_DL_url}" \ + "${E6400_VGA_DL_url_bkup}" "${E6400_VGA_DL_hash}" \ + "${CONFIG_VGA_BIOS_FILE}" + [ -z "${CONFIG_HAVE_MRC}" ] && return 0 + fetch "mrc" "${MRC_url}" "${MRC_url_bkup}" "${MRC_hash}" \ + "${CONFIG_MRC_FILE}" +} + +extract_intel_me() +{ + _me="${PWD}/${_dest}" # must always be an absolute path + cdir="${PWD}/${appdir}" # must always be an absolute path + [ $# -gt 0 ] && _me="${1}" + [ $# -gt 0 ] && cdir="${2}" + [ -f "${_me}" ] && return 0 + + sdir="$(mktemp -d)" + mkdir -p "${sdir}" || err "extract_intel_me: !mkdir -p \"${sdir}\"" + ( + cd "${cdir}" || err "extract_intel_me: !cd \"${cdir}\"" + for i in *; do + [ -f "${_me}" ] && break + [ -L "${i}" ] && continue + if [ -f "${i}" ]; then + "${mecleaner}" -r -t -O "${sdir}/vendorfile" \ + -M "${_me}" "${i}" && break + "${mecleaner}" -r -t -O "${_me}" "${i}" && break + "${me7updateparser}" -O "${_me}" "${i}" && break + _7ztest="${_7ztest}a" + extract_archive "${i}" "${_7ztest}" || continue + extract_intel_me "${_me}" "${cdir}/${_7ztest}" + elif [ -d "$i" ]; then + extract_intel_me "${_me}" "${cdir}/${i}" + else + continue + fi + cdir="${1}" + cd "${cdir}" + done + ) + rm -Rf "${sdir}" || err "extract_intel_me: !rm -Rf ${sdir}" +} + +extract_kbc1126ec() +{ + ( + x_ cd "${appdir}/" + mv Rompaq/68*.BIN ec.bin || : + if [ ! -f ec.bin ]; then + unar -D ROM.CAB Rom.bin || unar -D Rom.CAB Rom.bin || \ + x_ unar -D 68*.CAB Rom.bin + x_ mv Rom.bin ec.bin + fi + [ -f ec.bin ] || err "extract_kbc1126_ec ${board}: can't extract" + "${kbc1126_ec_dump}" ec.bin || \ + err "extract_kbc1126_ec ${board}: can't extract ecfw1/2.bin" + ) + ec_ex="y" + for i in 1 2; do + [ -f "${appdir}/ec.bin.fw${i}" ] || ec_ex="n" + done + [ "${ec_ex}" = "y" ] || \ + err "extract_kbc1126_ec ${board}: didn't extract ecfw1/2.bin" + x_ cp "${appdir}/"ec.bin.fw* "${_dest%/*}/" +} + +extract_e6400vga() +{ + [ "${E6400_VGA_offset}" = "" ] && \ + err "extract_e6400vga: E6400 VGA offset not defined" + [ "${E6400_VGA_romname}" = "" ] && \ + err "extract_e6400vga: E6400 VGA ROM name not defined" + tail -c +${E6400_VGA_offset} "${_dl}" | \ + gunzip >"${appdir}/bios.bin" || : + ( + x_ cd "${appdir}" + [ -f "bios.bin" ] || err "extract_e6400vga: can't extract bios.bin" + "${e6400_unpack}" bios.bin || printf "TODO: fix dell extract util\n" + [ -f "${E6400_VGA_romname}" ] || \ + err "extract_e6400vga: can't extract vga rom from bios.bin" + ) + x_ cp "${appdir}/${E6400_VGA_romname}" "${_dest}" +} + +extract_sch5545ec() +{ + # full system ROM (UEFI), to extract with UEFIExtract: + _bios="${_dl}_extracted/Firmware" + _bios="${_bios}/1 ${dlsum} -- 1 System BIOS vA.28.bin" + # this is the SCH5545 firmware, inside of the extracted UEFI ROM: + _sch5545ec_fw="${_bios}.dump/4 7A9354D9-0468-444A-81CE-0BF617D890DF" + _sch5545ec_fw="${_sch5545ec_fw}/54 D386BEB8-4B54-4E69-94F5-06091F67E0D3" + _sch5545ec_fw="${_sch5545ec_fw}/0 Raw section/body.bin" # <-- this! + + # this makes the file defined by _sch5545ec_fw available to copy + "${uefiextract}" "${_bios}" || \ + err "extract_sch5545ec: cannot extract from uefi image" + cp "${_sch5545ec_fw}" "${_dest}" || \ + err "extract_sch5545ec: cannot copy sch5545ec firmware file" +} + +main $@ diff --git a/script/update/vendor/inject b/script/update/vendor/inject new file mode 100755 index 00000000..eac4da37 --- /dev/null +++ b/script/update/vendor/inject @@ -0,0 +1,316 @@ +#!/usr/bin/env sh +# SPDX-License-Identifier: GPL-3.0-only +# SPDX-FileCopyrightText: 2022 Caleb La Grange +# SPDX-FileCopyrightText: 2022 Ferass El Hafidi +# SPDX-FileCopyrightText: 2023 Leah Rowe + +. "include/err.sh" +. "include/vendor.sh" +. "include/option.sh" + +release_archive="n" + +main() +{ + [ $# -lt 1 ] && err "No options specified." + [ "${1}" = "listboards" ] && \ + listitems config/coreboot && exit 0 + + archive="${1}" + + while getopts r:b:m: option + do + case "${option}" in + r) rom=${OPTARG} ;; + b) board=${OPTARG} ;; + m) modifygbe=true + new_mac=${OPTARG} ;; + esac + done + + check_board + build_dependencies + inject_vendorfiles + + printf "Friendly reminder (this is *not* an error message):\n" + printf "Please always ensure that the files were inserted correctly.\n" +} + +check_board() +{ + if ! check_release "${archive}" ; then + [ -f "${rom}" ] || \ + err "check_board: \"${rom}\" is not a valid path" + [ -z ${rom+x} ] && \ + err "check_board: no rom specified" + [ ! -z ${board+x} ] || \ + board=$(detect_board "${rom}") + else + release=true + releasearchive="${archive}" + board=$(detect_board "${archive}") + fi + + boarddir="${cbcfgsdir}/${board}" + [ -d "${boarddir}" ] && return 0 + err "check_board: board ${board} not found" +} + +check_release() +{ + [ -f "${archive}" ] || return 1 + [ "${archive##*.}" = "xz" ] || return 1 + printf "%s\n" "Release archive ${archive} detected" +} + +# This function tries to determine the board from the filename of the rom. +# It will only succeed if the filename is not changed from the build/download +detect_board() +{ + path="${1}" + filename=$(basename ${path}) + case ${filename} in + grub_*) + board=$(echo "${filename}" | cut -d '_' -f2-3) ;; + seabios_withgrub_*) + board=$(echo "${filename}" | cut -d '_' -f3-4) ;; + *.tar.xz) + _stripped_prefix=${filename#*_} + board="${_stripped_prefix%.tar.xz}" ;; + *) + err "detect_board: could not detect board type" + esac + [ -d "${boarddir}/" ] || \ + err "detect_board: dir, ${boarddir}, doesn't exist" + printf "%s\n" "${board}" +} + +build_dependencies() +{ + [ -d "${cbdir}" ] || x_ ./update project trees coreboot default + x_ ./build coreboot utils default + x_ ./update vendor download ${board} +} + +inject_vendorfiles() +{ + release_archive="n" + [ "${release}" != "true" ] && x_ patch_rom "${rom}" && return 0 + printf "patching release file\n" + release_archive="y" + patch_release_roms +} + +patch_release_roms() +{ + _tmpdir="tmp/romdir" + x_ rm -Rf "${_tmpdir}" + x_ mkdir -p "${_tmpdir}" + x_ tar -xf "${releasearchive}" -C "${_tmpdir}" + + for x in "${_tmpdir}"/bin/*/*.rom ; do + printf "patching rom: %s\n" "$x" + x_ patch_rom "${x}" + done + for x in "${_tmpdir}"/bin/*/*_nomicrocode.rom ; do + [ -f "${x}" ] || continue + [ -f "${x%_nomicrocode.rom}.rom" ] || continue + + x_ cp "${x%_nomicrocode.rom}.rom" "${x}" + x_ "${cbfstool}" "${x}" remove -n cpu_microcode_blob.bin + done + + ( + x_ cd "${_tmpdir}/bin/"* + + # NOTE: For compatibility with older rom releases, defer to sha1 + 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" + ) + + if [ "${modifygbe}" = "true" ]; then + for x in "${_tmpdir}"/bin/*/*.rom ; do + modify_gbe "${x}" + done + fi + + [ -d bin/release ] || x_ mkdir -p bin/release + x_ mv "${_tmpdir}"/bin/* bin/release/ + + printf "Success! Your ROMs are in bin/release\n" + + x_ rm -Rf "${_tmpdir}" +} + +patch_rom() +{ + rom="${1}" + + # we don't process no-microcode roms; these are + # 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 vendor files at the wrong offset) + # (unless nomicrocode is the only config provided) + [ "${rom}" != "${rom%_nomicrocode.rom}.rom" ] && \ + [ -f "${rom%_nomicrocode.rom}.rom" ] && \ + [ "${release_archive}" = "y" ] && return 0 + + x_ check_defconfig "${boarddir}" + + set -- "${boarddir}/config/"* + . "${1}" 2>/dev/null + + [ "$CONFIG_HAVE_MRC" = "y" ] && \ + inject_vendorfile_intel_mrc "${rom}" + [ "${CONFIG_HAVE_ME_BIN}" = "y" ] && \ + inject_vendorfile_intel_me "${rom}" + [ "${CONFIG_KBC1126_FIRMWARE}" = "y" ] && \ + inject_vendorfile_hp_kbc1126_ec "${rom}" + [ "${CONFIG_VGA_BIOS_FILE}" != "" ] && \ + [ "${CONFIG_VGA_BIOS_ID}" != "" ] && \ + inject_vendorfile_dell_e6400_vgarom_nvidia "${rom}" + [ "${CONFIG_INCLUDE_SMSC_SCH5545_EC_FW}" = "y" ] && \ + [ "${CONFIG_SMSC_SCH5545_EC_FW_FILE}" != "" ] && \ + inject_vendorfile_smsc_sch5545_ec "${rom}" + [ "${modifygbe}" = "true" ] && ! [ "${release}" = "true" ] && \ + modify_gbe "${rom}" + + printf "ROM image successfully patched: %s\n" "${rom}" +} + +inject_vendorfile_intel_mrc() +{ + rom="${1}" + + printf "adding mrc\n" + + # mrc.bin must be inserted at a specific offset + + # in cbfstool, -b values above 0x80000000 are interpreted as + # top-aligned x86 memory locations. this is converted into an + # absolute offset within the flash, and inserted accordingly + # at that offset into the ROM image file + + # coreboot's own build system hardcodes the mrc.bin offset + # because there is only one correct location in memory, but + # it would be useful for us if it could be easily scanned + # from Kconfig, with the option to change it where in practise + # it is not changed + + # the hardcoded offset below is based upon reading of the coreboot + # source code, and it is *always* correct for haswell platform. + # TODO: this logic should be tweaked to handle more platforms + + x_ "${cbfstool}" "${rom}" add -f mrc/haswell/mrc.bin -n mrc.bin \ + -t mrc -b 0xfffa0000 +} + +inject_vendorfile_intel_me() +{ + printf "adding intel me firmware\n" + + rom="${1}" + [ -z ${CONFIG_ME_BIN_PATH} ] && \ + err "inject_vendorfile_intel_me: CONFIG_ME_BIN_PATH not set" + + _me_location=${CONFIG_ME_BIN_PATH##*../} + [ ! -f "${_me_location}" ] && \ + err "inject_vendorfile_intel_me: per CONFIG_ME_BIN_PATH: file missing" + + x_ "${ifdtool}" -i me:"${_me_location}" "${rom}" -O "${rom}" +} + +inject_vendorfile_hp_kbc1126_ec() +{ + rom="${1}" + + _ec1_location="${CONFIG_KBC1126_FW1##*../}" + _ec1_offset="${CONFIG_KBC1126_FW1_OFFSET}" + _ec2_location="${CONFIG_KBC1126_FW2##*../}" + _ec2_offset="${CONFIG_KBC1126_FW2_OFFSET}" + + printf "adding hp kbc1126 ec firmware\n" + + if [ "${_ec1_offset}" = "" ] || [ "${_ec1_offset}" = "" ]; then + err "inject_vendorfile_hp_kbc1126_ec: ${board}: offset not declared" + elif [ "${_ec1_location}" = "" ] || [ "${_ec2_location}" = "" ]; then + err "inject_vendorfile_hp_kbc1126_ec: ${board}: EC path not declared" + elif [ ! -f "${_ec1_location}" ] || [ ! -f "${_ec2_location}" ]; then + err "inject_vendorfile_hp_kbc1126_ec: ${board}: ecfw not downloaded" + fi + + x_ "${cbfstool}" "${rom}" add -f "${_ec1_location}" -n ecfw1.bin \ + -b ${_ec1_offset} -t raw + x_ "${cbfstool}" "${rom}" add -f "${_ec2_location}" -n ecfw2.bin \ + -b ${_ec2_offset} -t raw +} + +inject_vendorfile_dell_e6400_vgarom_nvidia() +{ + rom="${1}" + + _vga_location="${CONFIG_VGA_BIOS_FILE##*../}" + _vga_dir="${_vga_location%/*}" + _vga_filename="${_vga_location##*/}" + + printf "adding pci option rom\n" + + [ "${_vga_dir}" = "${pciromsdir}" ] || \ + err "inject_vendorfile_dell_e6400vga: invalid pcirom dir: ${_vga_dir}" + [ -f "${_vga_location}" ] || \ + 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_vendorfile_smsc_sch5545_ec() +{ + rom="${1}" + _sch5545ec_location="${CONFIG_SMSC_SCH5545_EC_FW_FILE##*../}" + [ -f "${_sch5545ec_location}" ] || \ + err "inject_vendorfile_smsc_sch5545_ec: SCH5545 fw missing" + + x_ "${cbfstool}" "${rom}" add -f "${_sch5545ec_location}" \ + -n sch5545_ecfw.bin -t raw +} + +modify_gbe() +{ + printf "changing mac address in gbe to ${new_mac}\n" + [ -z ${CONFIG_GBE_BIN_PATH} ] && \ + err "modify_gbe: ${board}: CONFIG_GBE_BIN_PATH not set" + + rom="${1}" + _gbe_location=${CONFIG_GBE_BIN_PATH##*../} + [ -f "${_gbe_location}" ] || \ + err "modify_gbe: CONFIG_GBE_BIN_PATH points to missing file" + [ -f "${nvmutil}" ] || \ + x_ make -C util/nvmutil + + _gbe_tmp=$(mktemp -t gbeXXXX.bin) + x_ cp "${_gbe_location}" "${_gbe_tmp}" + x_ "${nvmutil}" "${_gbe_tmp}" setmac "${new_mac}" + x_ "${ifdtool}" -i GbE:"${_gbe_tmp}" "${rom}" -O "${rom}" + + x_ rm -f "${_gbe_tmp}" +} + +usage() +{ + cat <<- EOF + 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 vendor inject listboards' to get a list of valid boards + EOF +} + +main $@ -- cgit v1.2.1