From c14461a56b5203893466eaede7747047668693d8 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 15 Oct 2023 11:22:43 +0100 Subject: delete include/vendor.sh and merge elsewhere move it all to other files where items are used, and not used anywhere else. this reduces the size of vendor.sh. also remove a few redundant variables, or variables that are not meaningfully used. a few items have been moved to include/option.sh Signed-off-by: Leah Rowe --- script/build/fw/coreboot | 2 +- script/build/fw/serprog | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'script/build') diff --git a/script/build/fw/coreboot b/script/build/fw/coreboot index 487bfa31..9e266ce7 100755 --- a/script/build/fw/coreboot +++ b/script/build/fw/coreboot @@ -22,7 +22,7 @@ kmapdir="config/grub/keymap" # target.cfg files have to specifically enable [a] payload(s) 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="romdir cbrom initmode displaymode cbcfg targetdir tree arch" v="${v} grub_timeout ubdir vendorfiles board grub_scan_disk uboot_config" eval "$(setvars "n" ${pv})" eval "$(setvars "" ${v})" diff --git a/script/build/fw/serprog b/script/build/fw/serprog index 0525962d..eb0e5ede 100755 --- a/script/build/fw/serprog +++ b/script/build/fw/serprog @@ -7,8 +7,7 @@ set -u -e . "include/err.sh" -eval "$(setvars "" platform pico_sdk_dir pico_src_dir stm32_src_dir \ - boards_dir)" +eval "$(setvars "" platform pico_sdk_dir pico_src_dir stm32_src_dir boards_dir)" pico_src_dir=src/pico-serprog pico_sdk_dir=src/pico-sdk -- cgit v1.2.1