From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqKbq-0003Q9-U2 for qemu-devel@nongnu.org; Thu, 16 Aug 2018 11:54:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqKbo-0007Rc-U4 for qemu-devel@nongnu.org; Thu, 16 Aug 2018 11:54:50 -0400 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]:35136) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fqKbm-0007P8-R6 for qemu-devel@nongnu.org; Thu, 16 Aug 2018 11:54:48 -0400 Received: by mail-lf1-x141.google.com with SMTP id f18-v6so3771174lfc.2 for ; Thu, 16 Aug 2018 08:54:43 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20180816145554.9814-1-stefanha@redhat.com> References: <20180816145554.9814-1-stefanha@redhat.com> From: Alistair Francis Date: Thu, 16 Aug 2018 08:54:11 -0700 Message-ID: Content-Type: text/plain; charset="UTF-8" Subject: Re: [Qemu-devel] [PATCH] docs/generic-loader: mention U-Boot and Intel HEX executable formats List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: "qemu-devel@nongnu.org Developers" , Peter Maydell , Alistair Francis On Thu, Aug 16, 2018 at 7:55 AM, Stefan Hajnoczi wrote: > The generic loader device supports the U-Boot and Intel HEX executable > formats in addition to the document raw and ELF formats. Reword the > documentation to include these formats and explain how various options > depend on the executable format. > > Signed-off-by: Stefan Hajnoczi Reviewed-by: Alistair Francis Alistair > --- > Based-on: <20180816133438.17061-1-peter.maydell@linaro.org> > (https://git.linaro.org/people/pmaydell/qemu-arm.git/ pull-target-arm-20180816) > > docs/generic-loader.txt | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/docs/generic-loader.txt b/docs/generic-loader.txt > index 31bbcd42f6..a9603a2af7 100644 > --- a/docs/generic-loader.txt > +++ b/docs/generic-loader.txt > @@ -56,25 +56,25 @@ An example of setting CPU 0's PC to 0x8000 is: > > Loading Files > ------------- > -The loader device also allows files to be loaded into memory. It can load raw > -files and ELF executable files. Raw files are loaded verbatim. ELF executable > -files are loaded by an ELF loader. The syntax is shown below: > +The loader device also allows files to be loaded into memory. It can load ELF, > +U-Boot, and Intel HEX executable formats as well as raw images. The syntax is > +shown below: > > -device loader,file=[,addr=][,cpu-num=][,force-raw=] > > - A file to be loaded into memory > - - The addr in memory that the file should be loaded. This is > - ignored if you are using an ELF (unless force-raw is true). > - This is required if you aren't loading an ELF. > + - The memory address where the file should be loaded. This is > + required for raw images and ignored for non-raw files. > - This specifies the CPU that should be used. This is an > optional argument and will cause the CPU's PC to be set to > - where the image is stored or in the case of an ELF file to > - the value in the header. This option should only be used > - for the boot image. > + the memory address where the raw file is loaded or the entry > + point specified in the executable format header. This option > + should only be used for the boot image. > This will also cause the image to be written to the specified > CPU's address space. If not specified, the default is CPU 0. > - Setting force-raw=on forces the file to be treated as a raw > - image. This can be used to load ELF files as if they were raw. > + image. This can be used to load supported executable formats > + as if they were raw. > > All values are parsed using the standard QemuOps parsing. This allows the user > to specify any values in any format supported. By default the values > -- > 2.17.1 > >