summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/rom.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/rom.sh b/include/rom.sh
index 6ffbb228..c6cb2f5a 100644
--- a/include/rom.sh
+++ b/include/rom.sh
@@ -155,7 +155,7 @@ add_seabios()
cprom
[ "$payload_uboot_amd64" = "y" ] && [ "$displaymode" != "txtmode" ] && \
- pname="seauboot" && cprom "seauboot"
+ [ "$initmode" != "normal" ] && pname="seauboot" && cprom "seauboot"
[ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; :
}
@@ -180,6 +180,9 @@ add_uboot()
if [ "$displaymode" = "txtmode" ]; then
printf "cb/$target: Cannot use U-Boot in text mode\n" 1>&2
return 0
+ elif [ "$initmode" = "normal" ]; then
+ printf "cb/$target: Cannot use U-Boot in normal initmode\n" 1>&2
+ return 0
fi
# TODO: re-work to allow each coreboot target to say which ub tree