uboot: Add default addresses for --uboot-addr

diff --git a/README.md b/README.md
index 47d45f5306283d335142b6b4340fe6b7cea985f2..08028ee6e6abf34e04a4081be673a60261c603ff 100644 (file)
--- a/README.md
+++ b/README.md
@@ -458,6 +458,9 @@ can currently be accomplished by the following options: **--amt**,
     where name is one of _kernel_, _ramdisk_ or _fdt_ (flattened device
     tree).
 
+    The default addresses are ${_name_\_addr\_r}, i.e. U-Boot environment
+    variables used by convention for this purpose.
+
 - --uboot-cmd=_command_
 
     Specifies U-Boot command used to execute the OS. If the command

diff --git a/novaboot b/novaboot
index 6146f3fa33d3fe007bdd7815dffe2a04b369aaa0..42743a77489c09cd67d6b842663fd59e770a8bee 100755 (executable)
--- a/novaboot
+++ b/novaboot
@@ -110,6 +110,12 @@ GetOptions ("target|t=s" => \$explicit_target);
 
 my ($amt, @append, $bender, @chainloaders, $concat, $config_name_opt, $dhcp_tftp, $dump_opt, $dump_config, @exiton, $exiton_timeout, @expect_raw, $gen_only, $grub_config, $grub_prefix, $grub_preamble, $grub2_prolog, $grub2_config, $help, $ider, $iprelay, $iso_image, $interactive, $kernel_opt, $make, $man, $no_file_gen, $off_opt, $on_opt, $pulsar, $pulsar_root, $qemu, $qemu_append, $qemu_flags_cmd, $remote_cmd, $remote_expect, $reset, $reset_cmd, $rom_prefix, $rsync_flags, @scriptmod, $scons, $serial, $server, $stty, $tftp, $tftp_port, $uboot, %uboot_addr, $uboot_cmd, @uboot_init);
 
+%uboot_addr = (
+    'kernel'  => '${kernel_addr_r}',
+    'ramdisk' => '${ramdisk_addr_r}',
+    'fdt'     => '${fdt_addr_r}',
+    );
+
 $rsync_flags = '';
 $rom_prefix = 'rom://';
 $stty = 'raw -crtscts -onlcr 115200';
@@ -1628,6 +1634,9 @@ Load address of U-Boot's C<tftpboot> command for loading I<name>,
 where name is one of I<kernel>, I<ramdisk> or I<fdt> (flattened device
 tree).
 
+The default addresses are ${I<name>_addr_r}, i.e. U-Boot environment
+variables used by convention for this purpose.
+
 =item --uboot-cmd=I<command>
 
 Specifies U-Boot command used to execute the OS. If the command