From a4bd49ded63ecfcda811bfbeb9a605a4253ec3e3 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 28 May 2024 23:47:13 +0100 Subject: roms: allow user override of grub_scan_disk this effectively lets you change the boot order. example: ./build roms -s "nvme ata" t1650_12mb the above example would set: grub_scan_disk="nvme ata" another example: ./build roms -s nvme t1650_12mb this would set: grub_scan_disk="nvme" this overrides what's set in target.cfg for the given target. useful for quick reconfiguration if building from source Signed-off-by: Leah Rowe --- script/roms | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/roms b/script/roms index 44fbc73c..1e596192 100755 --- a/script/roms +++ b/script/roms @@ -26,7 +26,7 @@ v="romdir cbrom initmode displaymode cbcfg targetdir tree keymaps release" v="$v grub_timeout ubdir board grub_scan_disk uboot_config" eval "$(setvars "n" $pv serprog)" eval "$(setvars "" $v boards _displaymode _payload _keyboard all targets \ - serprog_boards_dir)" + serprog_boards_dir _scandisk)" main() { @@ -37,6 +37,7 @@ main() -d) _displaymode="$2" ;; -p) _payload="$2" ;; -k) _keyboard="$2" ;; + -s) _scandisk="$2" ;; *) [ "$1" = "all" ] && all="y" boards="$1 $boards" @@ -150,6 +151,7 @@ configure_target() # Override the above defaults using target.cfg . "$targetdir/target.cfg" + [ -n "$_scandisk" ] && grub_scan_disk="$_scandisk" [ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata" _ata="" _ahci="" -- cgit v1.2.1