From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 2 Dec 2014 13:33:14 +0000 (+0100)
Subject: Add --no-uboot option
X-Git-Tag: 20141202~4
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/novaboot.git/commitdiff_plain/c59b3eab5e88158df1b369f532e78b154d3f6010

Add --no-uboot option
---

diff --git a/README.md b/README.md
index bf9e39d..25815cc 100644
--- a/README.md
+++ b/README.md
@@ -450,6 +450,10 @@ can currently be accomplished by the following options: **--amt**,
     Implementation of this option is currently tied to a particular board
     that we use. It may be subject to changes in the future!
 
+- --no-uboot
+
+    Disable U-Boot interaction previously enabled with **--uboot**.
+
 - --uboot-init
 
     Command(s) to send the U-Boot bootloader before loading the images and
diff --git a/novaboot b/novaboot
index 0dd1beb..aa896ef 100755
--- a/novaboot
+++ b/novaboot
@@ -197,6 +197,7 @@ my %opt_spec;
     "tftp"	     => \$tftp,
     "tftp-port=i"    => \$tftp_port,
     "uboot:s"	     => \$uboot,
+    "no-uboot"	     => sub { undef $uboot; },
     "uboot-addr=s"   => \%uboot_addr,
     "uboot-cmd=s"    => \$uboot_cmd,
     "uboot-init=s"   => \@uboot_init,
@@ -1636,6 +1637,10 @@ novaboot script. I<prompt> specifies the U-Boot's prompt (default is
 Implementation of this option is currently tied to a particular board
 that we use. It may be subject to changes in the future!
 
+=item --no-uboot
+
+Disable U-Boot interaction previously enabled with B<--uboot>.
+
 =item --uboot-init
 
 Command(s) to send the U-Boot bootloader before loading the images and