dev-manual, ref-manual: Image format implementation changes

Recently a number of changes have happened on the implementation
side of some image formats, and a few have been renamed.
The u-boot image signing code is now always available and no
longer in a stand-alone file.  The vmdk/mdi/qcow2 images have
been removed and are now just a conversion type that is applied
to wic images.

Reported-by: Tom Rini <trini@konsulko.com>
(From yocto-docs rev: ce86da3d48507cee12208e0138c285b4be83d8cd)

Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/documentation/ref-manual/usingpoky.xml b/documentation/ref-manual/usingpoky.xml
index a963268347..f0614d5d5b 100644
--- a/documentation/ref-manual/usingpoky.xml
+++ b/documentation/ref-manual/usingpoky.xml
@@ -1243,11 +1243,11 @@
        runqemu qemux86-64 core-image-sato ext4
        runqemu qemux86-64 wic-image-minimal wic
        runqemu path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial
-       runqemu qemux86 iso/hddimg/vmdk/qcow2/vdi/ramfs/cpio.gz...
+       runqemu qemux86 iso/hddimg/wic.vmdk/wic.qcow2/wic.vdi/ramfs/cpio.gz...
        runqemu qemux86 qemuparams="-m 256"
        runqemu qemux86 bootparams="psplash=false"
-       runqemu path/to/<image>-<machine>.vmdk
        runqemu path/to/<image>-<machine>.wic
+       runqemu path/to/<image>-<machine>.wic.vmdk
             </literallayout>
         </para>
     </section>
@@ -1274,9 +1274,9 @@
                 <listitem><para>
                     <filename><replaceable>VM</replaceable></filename>:
                     The virtual machine image, which must be a
-                    <filename>.vmdk</filename> file.
+                    <filename>.wic.vmdk</filename> file.
                     Use this option when you want to boot a
-                    <filename>.vmdk</filename> image.
+                    <filename>.wic.vmdk</filename> image.
                     The image filename you provide must contain one of the
                     following strings: "qemux86-64", "qemux86", "qemuarm",
                     "qemumips64", "qemumips", "qemuppc", or "qemush4".