mv build/fw/serprog,build/boot/roms build/firmware

./build boot roms is now: ./build firmware coreboot

./build fw serprog is now: ./build firmware serprog

Signed-off-by: Leah Rowe <leah@libreboot.org>

3 files changed, 13 insertions, 11 deletions

diff --git a/build b/build
index 345a2202..14cac33d 100755
--- a/build
+++ b/build
@@ -77,10 +77,12 @@ execute_command()
 		xx_ listitems "${buildpath}/${mode}"
 		lbmk_exit 0
 	fi
-	[ -f "${buildpath}/${mode}/${option}" ] || \
-		fail "Invalid command. Run: ${linkpath} help"
-	"${buildpath}/${mode}/${option}" $@ || \
-	    fail "execute_command: ${buildpath}/${mode}/${option} ${@}"
+	lbmkcmd="${buildpath}/${mode}/${option}"
+	[ "${lbmkcmd}" = "./script/build/boot/roms" ] && \
+	    printf "NOTE: ./build boot roms now: ./build firmware coreboot\n" \
+		    1>&2
+	[ -f "${lbmkcmd}" ] || fail "Invalid command. Run: ${linkpath} help"
+	"${lbmkcmd}" $@ || fail "execute_command: ${lbmkcmd} ${@}"
 }
 
 usage()
diff --git a/script/build/boot/roms b/script/build/firmware/coreboot
index 5f40667f..10cc44a1 100755
--- a/script/build/boot/roms
+++ b/script/build/firmware/coreboot
@@ -386,9 +386,9 @@ moverom() {
 usage()
 {
 	cat <<- EOF
-	USAGE:	./build boot roms target
-	To build *all* boards, do this: ./build boot roms all
-	To list *all* boards, do this: ./build boot roms list
+	USAGE:	./build firmware coreboot target
+	To build *all* boards, do this: ./build firmware coreboot all
+	To list *all* boards, do this: ./build firmware coreboot list
 	
 	Optional Flags:
 	-d: displaymode
@@ -396,9 +396,9 @@ usage()
 	-k: keyboard layout
 
 	Example commands:
-		./build boot roms x60
-		./build boot roms x200_8mb x60
-		./build boot roms x60 -p grub -d corebootfb -k usqwerty
+		./build firmware coreboot x60
+		./build firmware coreboot x200_8mb x60
+		./build firmware coreboot x60 -p grub -d corebootfb -k usqwerty
 
 	possible values for 'target':
 	$(listitems "config/coreboot")
diff --git a/script/build/fw/serprog b/script/build/firmware/serprog
index 222d7751..0966af77 100755
--- a/script/build/fw/serprog
+++ b/script/build/firmware/serprog
@@ -12,7 +12,7 @@ pico_sdk_dir=util-fw/rp2040/pico-sdk
 
 stm32_src_dir=util-fw/stm32-vserprog
 
-usage="usage: ./build fw serprog <rp2040|stm32> [board]"
+usage="usage: ./build firmware serprog <rp2040|stm32> [board]"
 
 main()
 {