build/fw/coreboot: warning about bin/ versus elf/

also rename elf/coreboot to something scary

some users were flashing roms built under elf/, which
lack payloads. lbmk builds no-payload roms (and payloads)
under elf/ then inserts them, creating full (flashable)
images under bin/

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

2 files changed, 16 insertions, 1 deletions

diff --git a/script/build/fw/coreboot b/script/build/fw/coreboot
index 8efa39c3..ba66d856 100755
--- a/script/build/fw/coreboot
+++ b/script/build/fw/coreboot
@@ -62,6 +62,12 @@ main()
 	[ -z "${targets}" ] && err "No ROM images were compiled"
 	printf "\nROM images available in these directories:\n"
 	printf "${targets}^^ ROM images available in these directories.\n\n"
+
+	printf "WARNING!!!!!!! PLEASE READ:\n\n"
+
+	printf "DO NOT flash ROM images contained under elf/, because they lack"
+	printf "payloads and will BRICK your machine. Please flash ROM images"
+	printf "contained under bin/ instead. YOU HAVE BEEN WARNED.\n\n"
 }
 
 check_target()
@@ -216,7 +222,7 @@ build_roms()
 
 	x_ ./update project trees -b coreboot ${board}
 
-	_cbrom="elf/coreboot/${board}/${initmode}_${displaymode}"
+	_cbrom="elf/coreboot_nopayload_DO_NOT_FLASH/${board}/${initmode}_${displaymode}"
 	[ "${initmode}" = "normal" ] && \
 		_cbrom="${_cbrom%_${displaymode}}"
 	_cbrom="${_cbrom}/coreboot.rom"
diff --git a/script/update/project/trees b/script/update/project/trees
index 7df3c8bf..97b12954 100755
--- a/script/update/project/trees
+++ b/script/update/project/trees
@@ -72,6 +72,8 @@ build_projects()
 build_targets()
 {
 	elfdir="elf/${project}"
+	[ "${elfdir}" = "elf/coreboot" ] && \
+		elfdir="elf/coreboot_nopayload_DO_NOT_FLASH"
 
 	cfgsdir="config/${project}"
 	[ -d "${cfgsdir}" ] || err "directory, ${cfgsdir}, does not exist"
@@ -88,6 +90,13 @@ build_targets()
 	[ $# -gt 0 ] && targets=$@
 
 	[ -z "${mode}" ] && x_ mkdir -p "${elfdir}/"
+	if [ "${project}" != "coreboot" ]; then
+		printf "DO NOT flash coreboot images under elf/. Use ROMs"
+		printf "under bin/. The elf/ ones DO NOT contain payloads"
+		printf "will brick your machine.\n" > \
+		    "${elfdir}/WARNING.txt" || :
+	fi
+
 
 	handle_targets
 }