diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-10-20 00:17:30 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-10-20 01:00:38 +0100 |
| commit | 8d9aeef3de28bcb908e33b804517bdeacce7be38 (patch) | |
| tree | da6c27fa43780232300898052005617ea155aba2 | |
| parent | 0b98c9b00c6b99940555cff25f7c6858745a560c (diff) | |
lbmk: use 2-level directory structure in script/
as opposed to the current 3-level structure.
recent build system simplifications have enabled
this change, thus:
./build fw coreboot -> ./build roms
./build fw grub -> ./build grub
./build fw serprog -> ./build serprog
./update project release -> ./update release
./update project trees -> ./update trees
./update vendor download -> ./vendor download
./update vendor inject -> ./vendor inject
alper criticised that the commands were too long,
so i made them shorter!
Signed-off-by: Leah Rowe <leah@libreboot.org>
60 files changed, 106 insertions, 121 deletions
@@ -22,7 +22,7 @@ /push /version /versiondate -/vendor/ +/vendorfiles/ *me.bin *sch5545ec.bin /mrc/ @@ -11,7 +11,7 @@ set -u -e . "include/err.sh" . "include/option.sh" -eval "$(setvars "" mode option aur_notice tmpdir)" +eval "$(setvars "" option aur_notice tmpdir)" tmpdir_was_set="y" set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n" @@ -39,8 +39,10 @@ buildpath="./script/${linkname}" main() { xx_ id -u 1>/dev/null 2>/dev/null - initialise_command $@ - shift 2 + [ $# -lt 1 ] && fail "Too few arguments. Try: ${0} help" + [ "${1}" = "dependencies" ] && xx_ install_packages $@ && lbmk_exit 0 + + initialise_command $@ && shift 1 check_git check_project "fail" @@ -51,22 +53,13 @@ main() initialise_command() { - [ $# -lt 1 ] && fail "Too few arguments. Try: ${0} help" - - mode="${1}" - [ "${mode}" != "dependencies" ] || xx_ install_packages $@ [ "$(id -u)" != "0" ] || fail "this command as root is not permitted" - [ "${mode}" = "help" ] && usage ${0} && lbmk_exit 0 - if [ "${mode}" = "list" ]; then - items "${buildpath}" - lbmk_exit 0 - elif [ $# -lt 2 ]; then - usage ${0} - lbmk_exit 1 - fi - - option="${2}" + case "${1}" in + help) usage ${0} && lbmk_exit 0 ;; + list) items "${buildpath}" && lbmk_exit 0 ;; + esac + option="${1}" } install_packages() @@ -83,16 +76,13 @@ install_packages() . "config/dependencies/${2}" xx_ ${pkg_add} ${pkglist} - [ "${aur_notice}" = "" ] || \ - printf "You must install AUR packages: %s\n" "${aur_notice}" 1>&2 - - lbmk_exit 0 + [ -z "${aur_notice}" ] && return 0 + printf "You must install AUR packages: %s\n" "${aur_notice}" 1>&2 } execute_command() { - [ "$option" = "list" ] && xx_ items "$buildpath/$mode" && lbmk_exit 0 - lbmkcmd="${buildpath}/${mode}/${option}" + lbmkcmd="${buildpath}/${option}" [ -f "${lbmkcmd}" ] || fail "Invalid command. Run: ${linkpath} help" "${lbmkcmd}" $@ || fail "execute_command: ${lbmkcmd} ${@}" } @@ -101,17 +91,11 @@ usage() { progname=${0} cat <<- EOF - USAGE: ${progname} <MODE> <OPTION> + USAGE: ${progname} <OPTION> - possible values for 'mode': + possible values for 'OPTION': $(items "${buildpath}") - For each of the above modes, you may also do: - ${progname} <MODE> list - - Example: ./build fw list, which would yield: - $(./build fw list) - Refer to ${projectname} documentation for more info. EOF } diff --git a/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb b/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb index 782a0e5a..7dfbf434 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="../../../vendor/e6430/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/e6430/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/e6430/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/e6430_12mb/config/libgfxinit_txtmode b/config/coreboot/e6430_12mb/config/libgfxinit_txtmode index 48fbf066..f0876eb6 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="../../../vendor/e6430/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/e6430/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/e6430/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb index 1fed9e24..2cf092d6 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="../../../vendor/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp2170p_16mb/config/libgfxinit_txtmode b/config/coreboot/hp2170p_16mb/config/libgfxinit_txtmode index dede8a37..7e04e304 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="../../../vendor/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb b/config/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb index 2d605ab2..ffda7458 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="../../../vendor/hp_sandybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_sandybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_sandybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp2560p_8mb/config/libgfxinit_txtmode b/config/coreboot/hp2560p_8mb/config/libgfxinit_txtmode index 357ea9a3..ba3d739d 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="../../../vendor/hp_sandybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_sandybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_sandybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb index 5d7d75ef..5afb9946 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="../../../vendor/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp2570p_16mb/config/libgfxinit_txtmode b/config/coreboot/hp2570p_16mb/config/libgfxinit_txtmode index c46b3071..a83488c4 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="../../../vendor/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb b/config/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb index fb4c2640..224316e3 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="../../../vendor/hp8200sff/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8200sff/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode b/config/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode index 1783cfda..d36aa54f 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="../../../vendor/hp8200sff/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8200sff/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb b/config/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb index 1db0fbc7..f31c3c16 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="../../../vendor/hp8200sff/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8200sff/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode b/config/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode index 28b26b54..5d815947 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="../../../vendor/hp8200sff/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8200sff/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb index 177d9146..7ea0be8c 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="../../../vendor/hp8300usdt/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8300usdt/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8300usdt/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode b/config/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode index 70f3eae2..e29f73b4 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="../../../vendor/hp8300usdt/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8300usdt/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8300usdt/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb index e86906b0..4bc7a882 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="../../../vendor/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode index 02506405..1fd59782 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="../../../vendor/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb index d93aeafa..467ac562 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="../../../vendor/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/hp9470m_16mb/config/libgfxinit_txtmode b/config/coreboot/hp9470m_16mb/config/libgfxinit_txtmode index 3739b808..acc9bad3 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="../../../vendor/hp_ivybridge/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/t1650_12mb/config/libgfxinit_txtmode b/config/coreboot/t1650_12mb/config/libgfxinit_txtmode index ceffee30..3bee04cd 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="../../../vendor/t1650/sch5545ec.bin" +CONFIG_SMSC_SCH5545_EC_FW_FILE="../../../vendorfiles/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="../../../vendor/t1650/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/t1650/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/t1650/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/t420_8mb/config/libgfxinit_corebootfb b/config/coreboot/t420_8mb/config/libgfxinit_corebootfb index f97552f6..61d34cf8 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="../../../vendor/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/t420s_8mb/config/libgfxinit_corebootfb b/config/coreboot/t420s_8mb/config/libgfxinit_corebootfb index 8645f71b..e47f4353 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="../../../vendor/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/t420s_8mb/config/libgfxinit_txtmode b/config/coreboot/t420s_8mb/config/libgfxinit_txtmode index 2f2fdc02..83e51edb 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="../../../vendor/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/t430_12mb/config/libgfxinit_corebootfb b/config/coreboot/t430_12mb/config/libgfxinit_corebootfb index 36e33581..33fe8cd0 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/t430_12mb/config/libgfxinit_txtmode b/config/coreboot/t430_12mb/config/libgfxinit_txtmode index d11ba9c2..444781f2 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode b/config/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode index 4085f2ef..746662e0 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="../../../vendor/t440p/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/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 2d0b3c21..7c0a7503 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="../../../vendor/t440p/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/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 99592ec2..69d58c7b 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="../../../vendor/t440p/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/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/t520_8mb/config/libgfxinit_corebootfb b/config/coreboot/t520_8mb/config/libgfxinit_corebootfb index 0c7a481d..b4a1c204 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="../../../vendor/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/t520_8mb/config/libgfxinit_txtmode b/config/coreboot/t520_8mb/config/libgfxinit_txtmode index 4730f280..485bfc1b 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="../../../vendor/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/t530_12mb/config/libgfxinit_corebootfb b/config/coreboot/t530_12mb/config/libgfxinit_corebootfb index 280c96a3..0cba59f5 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/t530_12mb/config/libgfxinit_txtmode b/config/coreboot/t530_12mb/config/libgfxinit_txtmode index 353a8058..8fd61ca7 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/w530_12mb/config/libgfxinit_corebootfb b/config/coreboot/w530_12mb/config/libgfxinit_corebootfb index 8dda5c36..79233fd6 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/w530_12mb/config/libgfxinit_txtmode b/config/coreboot/w530_12mb/config/libgfxinit_txtmode index a1c9afa2..4a43108b 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/w541_12mb/config/libgfxinit_txtmode b/config/coreboot/w541_12mb/config/libgfxinit_txtmode index 1f641d69..8a5f9e45 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="../../../vendor/t440p/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/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 751fcf08..619f31ed 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="../../../vendor/t440p/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/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 df59be53..124a9103 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="../../../vendor/t440p/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/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/x220_8mb/config/libgfxinit_corebootfb b/config/coreboot/x220_8mb/config/libgfxinit_corebootfb index add08e69..b5589592 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="../../../vendor/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/x220_8mb/config/libgfxinit_txtmode b/config/coreboot/x220_8mb/config/libgfxinit_txtmode index 5c2ba3b3..a5059dea 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="../../../vendor/xx20/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/x230_12mb/config/libgfxinit_corebootfb b/config/coreboot/x230_12mb/config/libgfxinit_corebootfb index 6195c39c..9f05d7df 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/x230_12mb/config/libgfxinit_txtmode b/config/coreboot/x230_12mb/config/libgfxinit_txtmode index ec93d34d..62f356ad 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/x230_16mb/config/libgfxinit_corebootfb b/config/coreboot/x230_16mb/config/libgfxinit_corebootfb index 882e4f98..27cc051d 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/x230_16mb/config/libgfxinit_txtmode b/config/coreboot/x230_16mb/config/libgfxinit_txtmode index 1b17900c..2f6039d0 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/x230edp_12mb/config/libgfxinit_corebootfb b/config/coreboot/x230edp_12mb/config/libgfxinit_corebootfb index de15061c..9f7a5258 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/x230edp_12mb/config/libgfxinit_txtmode b/config/coreboot/x230edp_12mb/config/libgfxinit_txtmode index 3e7a8bfc..394ed4f9 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/x230t_12mb/config/libgfxinit_corebootfb b/config/coreboot/x230t_12mb/config/libgfxinit_corebootfb index 782796da..d312bce2 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/x230t_12mb/config/libgfxinit_txtmode b/config/coreboot/x230t_12mb/config/libgfxinit_txtmode index 03c6d16f..d0ddb7ce 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/x230t_16mb/config/libgfxinit_corebootfb b/config/coreboot/x230t_16mb/config/libgfxinit_corebootfb index b09e6414..14dbec10 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/config/coreboot/x230t_16mb/config/libgfxinit_txtmode b/config/coreboot/x230t_16mb/config/libgfxinit_txtmode index c0b19f34..d3e16674 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="../../../vendor/xx30/me.bin" +CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 CONFIG_VBT_DATA_SIZE_KB=8 diff --git a/include/git.sh b/include/git.sh index 9e6c60db..1c458f08 100755 --- a/include/git.sh +++ b/include/git.sh @@ -75,7 +75,7 @@ fetch_project_repo() clone_project [ "${depend}" = "" ] || for d in ${depend} ; do - x_ ./update project trees -f ${d} + x_ ./update trees -f ${d} done x_ rm -Rf "${tmp_git_dir}" } diff --git a/include/option.sh b/include/option.sh index 73a567bb..dd41e88c 100755 --- a/include/option.sh +++ b/include/option.sh @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com> # SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org> -vendir="vendor" +vendir="vendorfiles" appdir="${vendir}/app" cbdir="src/coreboot/default" cbcfgsdir="config/coreboot" @@ -62,7 +62,7 @@ check_defconfig() handle_coreboot_utils() { for util in cbfstool ifdtool; do - x_ ./update project trees ${_f} "src/coreboot/${1}/util/${util}" + x_ ./update trees ${_f} "src/coreboot/${1}/util/${util}" [ -z "${mode}" ] && [ ! -f "cbutils/${1}/${util}" ] && \ x_ mkdir -p "cbutils/${1}" && \ x_ cp "src/coreboot/${1}/util/${util}/${util}" \ diff --git a/script/build/fw/grub b/script/build/grub index 66286732..ba0845d3 100755 --- a/script/build/fw/grub +++ b/script/build/grub @@ -23,7 +23,7 @@ main() handle_dependencies() { - [ -d "src/grub" ] || x_ ./update project trees -f grub + [ -d "src/grub" ] || x_ ./update trees -f grub [ -f "src/grub/grub-mkstandalone" ] || build_grub_utils x_ mkdir -p "${elfdir}" x_ rm -f "${elfdir}/"* diff --git a/script/build/fw/coreboot b/script/build/roms index 8853f749..2f7b93da 100755 --- a/script/build/fw/coreboot +++ b/script/build/roms @@ -128,13 +128,13 @@ prepare_target() cbrom="${cbdir}/build/coreboot.rom" [ -f "${cbfstool}" ] || \ - x_ ./update project trees -b coreboot utils ${tree} + x_ ./update trees -b coreboot utils ${tree} build_dependency_seabios memtest_bin="memtest86plus/build64/memtest.bin" [ "${payload_memtest}" != "y" ] || [ -f "src/${memtest_bin}" ] || \ - x_ ./update project trees -b memtest86plus + x_ ./update trees -b memtest86plus x_ rm -f "${romdir}/"* @@ -151,7 +151,7 @@ build_dependency_seabios() [ -f elf/seabios/default/vgarom/bios.bin.elf ] && \ [ -f elf/seabios/default/normal/bios.bin.elf ] && return 0 - x_ ./update project trees -b seabios + x_ ./update trees -b seabios } build_dependency_grub() @@ -171,14 +171,14 @@ build_dependency_grub() rebuild_grub="y" && break done [ "${rebuild_grub}" = "y" ] || return 0 - x_ ./build fw grub + x_ ./build grub } build_dependency_uboot() { [ "${payload_uboot}" = "y" ] || return 0 - x_ ./update project trees -b u-boot ${board} + x_ ./update trees -b u-boot ${board} ubdir="elf/u-boot/${board}/${uboot_config}" ubootelf="${ubdir}/u-boot.elf" [ ! -f "${ubootelf}" ] && [ -f "${ubdir}/u-boot" ] && \ @@ -215,7 +215,7 @@ build_roms() "${cbcfg}" "${board}" "${displaymode}" "${initmode}" \ 1>&2 && return 0 - x_ ./update project trees -b coreboot ${board} + x_ ./update trees -b coreboot ${board} _cbrom="elf/coreboot_nopayload_DO_NOT_FLASH/${board}/${initmode}_${displaymode}" [ "${initmode}" = "normal" ] && \ @@ -391,9 +391,9 @@ moverom() { usage() { cat <<- EOF - USAGE: ./build fw coreboot targetname - To build *all* boards, do this: ./build fw coreboot all - To list *all* boards, do this: ./build fw coreboot list + USAGE: ./build roms targetname + To build *all* boards, do this: ./build roms all + To list *all* boards, do this: ./build roms list Optional Flags: -d: displaymode @@ -402,9 +402,9 @@ usage() Example commands: - ./build fw coreboot x60 - ./build fw coreboot x200_8mb x60 - ./build fw coreboot x60 -p grub -d corebootfb -k usqwerty + ./build roms x60 + ./build roms x200_8mb x60 + ./build roms x60 -p grub -d corebootfb -k usqwerty possible values for 'target': $(items "config/coreboot") diff --git a/script/build/fw/serprog b/script/build/serprog index eb0e5ede..43251acd 100755 --- a/script/build/fw/serprog +++ b/script/build/serprog @@ -22,12 +22,12 @@ main() platform="rp2040" boards_dir=${pico_sdk_dir}/src/boards/include/boards [ -d "${pico_src_dir}/" ] || \ - x_ ./update project trees -f "rpi-pico-serprog" + x_ ./update trees -f "rpi-pico-serprog" elif [ "${1}" = "stm32" ]; then platform="stm32" boards_dir=${stm32_src_dir}/boards [ -d "${stm32_src_dir}/" ] || \ - x_ ./update project trees -f "stm32-vserprog" + x_ ./update trees -f "stm32-vserprog" else err "${usage}" fi diff --git a/script/update/project/release b/script/update/release index e7973537..c60f36e5 100755 --- a/script/update/project/release +++ b/script/update/release @@ -87,7 +87,7 @@ build_release() fetch_trees() { for x in ${_f}; do - ./update project trees -f "${x}" || err "${_xm}: fetch ${x}" + ./update trees -f "${x}" || err "${_xm}: fetch ${x}" done for x in config/*/build.list; do [ -f "${x}" ] || continue @@ -101,9 +101,9 @@ fetch_trees() mkrom_images() { - ./build fw coreboot all || err "${_xm}: roms-all" - ./build fw serprog rp2040 || err "${_xm}: rp2040" - ./build fw serprog stm32 || err "${_xm}: stm32" + ./build roms all || err "${_xm}: roms-all" + ./build serprog rp2040 || err "${_xm}: rp2040" + ./build serprog stm32 || err "${_xm}: stm32" for rombuild in bin/*; do [ -d "${rombuild}" ] || continue @@ -161,7 +161,7 @@ nukerom() fi # Hash the images before removing vendor files - # which ./update vendor inject uses for verification + # which "./vendor inject" uses for verification x_ rm -f "${romdir}/vendorhashes" x_ touch "${romdir}/vendorhashes" ( @@ -171,7 +171,7 @@ nukerom() for romfile in "${romdir}"/*.rom; do [ -f "${romfile}" ] || continue - x_ ./update vendor inject -r "${romfile}" -b ${target} -n nuke + x_ ./vendor inject -r "${romfile}" -b ${target} -n nuke done } diff --git a/script/update/project/trees b/script/update/trees index 7ba9a38b..926159cf 100755 --- a/script/update/project/trees +++ b/script/update/trees @@ -49,7 +49,7 @@ main() build_projects() { - [ $# -gt 0 ] && x_ ./update project trees ${_f} ${@} + [ $# -gt 0 ] && x_ ./update trees ${_f} ${@} if [ "${mode}" = "fetch" ]; then fetch_project_repo @@ -57,7 +57,7 @@ build_projects() fi codedir="src/${project}" - [ -d "${codedir}" ] || x_ ./update project trees -f "${project}" + [ -d "${codedir}" ] || x_ ./update trees -f "${project}" if [ "${project}" = "uefitool" ]; then ( @@ -103,7 +103,7 @@ handle_targets() printf "Running 'make %s' for project '%s, target '%s''\n" \ "${mode}" "${project}" "${target}" [ "${project}" != "coreboot" ] || [ ! -z ${mode} ] || \ - x_ ./update vendor download ${target} + x_ ./vendor download ${target} x_ handle_defconfig done @@ -165,7 +165,7 @@ handle_src_tree() "${codedir}" 1>&2 return 1 fi - x_ ./update project trees -f "${project}" "${target}" + x_ ./update trees -f "${project}" "${target}" elif [ "${mode}" = "distclean" ] || \ [ "${mode}" = "crossgcc-clean" ]; then [ -f "${tmpclean}/${tree}" ] && return 1 @@ -180,7 +180,7 @@ handle_src_tree() err "handle_src_tree ${project}/${target}: crossgcc" cbfstool="cbutils/${tree}/cbfstool" [ -f "${cbfstool}" ] && return 0 - x_ ./update project trees -b coreboot utils "${tree}" + x_ ./update trees -b coreboot utils "${tree}" } # set up cross-compiler (coreboot crossgcc) for u-boot and coreboot @@ -199,7 +199,7 @@ check_cross_compiler() # only true if not building coreboot: ctarget="${cbdir#src/coreboot/}" [ -d "${cbdir}" ] || \ - x_ ./update project trees -f coreboot ${ctarget} + x_ ./update trees -f coreboot ${ctarget} if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then [ -d "${cbdir}/util/crossgcc/xgcc/i386-elf/" ] || \ diff --git a/script/update/vendor/download b/script/vendor/download index b5618c3b..e8c7e5a4 100755 --- a/script/update/vendor/download +++ b/script/vendor/download @@ -54,17 +54,17 @@ detect_firmware() build_dependencies() { [ -d ${cbdir} ] || \ - x_ ./update project trees -f coreboot ${cbdir##*/} + x_ ./update trees -f coreboot ${cbdir##*/} for d in uefitool biosutilities bios_extract; do [ -d "src/${d}" ] && continue - x_ ./update project trees -f "${d}" + x_ ./update trees -f "${d}" done [ -f "${uefiextract}" ] || \ - x_ ./update project trees -b uefitool + x_ ./update trees -b uefitool [ -f "${kbc1126_ec_dump}" ] || \ x_ make -C "${cbdir}/util/kbc1126" [ -f "${cbfstool}" ] && [ -f "${ifdtool}" ] && return 0 - x_ ./update project trees -b coreboot utils default + x_ ./update trees -b coreboot utils default } download_vendorfiles() diff --git a/script/update/vendor/inject b/script/vendor/inject index d156be25..1eebca30 100755 --- a/script/update/vendor/inject +++ b/script/vendor/inject @@ -87,13 +87,13 @@ detect_board() build_dependencies() { - [ -d "${cbdir}" ] || x_ ./update project trees -f coreboot default + [ -d "${cbdir}" ] || x_ ./update trees -f coreboot default if [ ! -f "${cbfstool}" ] || [ ! -f "${ifdtool}" ]; then - x_ ./update project trees -b coreboot utils default + x_ ./update trees -b coreboot utils default fi [ -z "${new_mac}" ] || [ -f "${nvmutil}" ] || x_ make -C util/nvmutil [ "${nukemode}" = "nuke" ] && return 0 - x_ ./update vendor download ${board} + x_ ./vendor download ${board} } inject_vendorfiles() @@ -235,13 +235,13 @@ inject() 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 + USAGE: ./vendor inject -r [rom path] -b [boardname] -m [macaddress] + Example: ./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 + Type './vendor inject listboards' to get a list of valid boards EOF } @@ -0,0 +1 @@ +build
\ No newline at end of file |