Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AB074C433EF for ; Sun, 12 Jun 2022 22:14:47 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2392784448; Mon, 13 Jun 2022 00:14:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JQ+TB5ND"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CAAD484434; Mon, 13 Jun 2022 00:14:21 +0200 (CEST) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1B43684424 for ; Mon, 13 Jun 2022 00:14:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qk1-x731.google.com with SMTP id b142so2930887qkg.2 for ; Sun, 12 Jun 2022 15:14:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0cP7C/udH4eOsBzY/J5EqElcx9AN3qdRb4qK3KT4xTE=; b=JQ+TB5ND45kgs5eRLp/SqG9CykK2EPuPmH4wY5lcirlJZ1Dm2Nmay83YMRXtKObLg0 VSbz/PnCNRWy+KyIGupVDRWrH15r9oDNuszIbOFlcqx7JgQopqp/PzbsU66CxJRNIxo/ Nd3Kyp2bO20w9kXRStEKK3xwNyZJcmBV6+rF4ORKYwiJnhc/7/sx2xYKGcqTYd76uk5H pUORBHyE1rVntwy3YupVeC+P1FB6B/Fe2gX2Urj4qelokHy4HukW47IbugHnntdYwtxH qEQ1XUCNVYjJJ8SPEcXJqVK1iS47/tHhhXZ7eSSiQoeaafhZW8RZrot9U8E0LBnqqmfI CzGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0cP7C/udH4eOsBzY/J5EqElcx9AN3qdRb4qK3KT4xTE=; b=zcM+Q8OdKJK6ZpOqJGdNOo4zXbXYje4nsZYPPYsilg2r3LrXCF7/pAk4XzKdC533gI icAnVYpKiXELBADAPtT8ZQzN/LmKIaMVq8ePIJqbZHXdqw6zcz5kO+60pFqThM4n0tlr XdRbX5T3680TsKLO2O6JR7oCpZfinN4IGep/5WucHVfG4Q2OfrRvtINzRct7Is/hc6jG XJ24RZal5mO8rQ3Aw8Flw4/FhVmolRRq9gctEtVmLWenH9Okh1OsfXdN1HM6+2BGku3/ vnLZznGA52cY91LTYHJRKKDfCQ5oc4p6ZyCbx//gRMcYzH2lskc4r/+ZPzP4oaRFdPs0 bnbw== X-Gm-Message-State: AOAM532GBYeUS3PBoZXOu9ns93Mc8TK9HLigikImjoPydp7PmCMWBY11 nAxMBFLMthOqymHkNHlExBw6iu50HQYo/8DI X-Google-Smtp-Source: ABdhPJxvQECyXC9/dYjCTdnnibvkNNm82kh4O1bcBwsq3wxyOnvk507idrYQOneM4gCft4i5Yqvu/g== X-Received: by 2002:a05:620a:2681:b0:67e:909f:d5ac with SMTP id c1-20020a05620a268100b0067e909fd5acmr38464739qkp.125.1655072056562; Sun, 12 Jun 2022 15:14:16 -0700 (PDT) Received: from localhost (pool-173-73-95-180.washdc.fios.verizon.net. [173.73.95.180]) by smtp.gmail.com with UTF8SMTPSA id 7-20020a370507000000b006a725432959sm5006948qkf.37.2022.06.12.15.14.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 12 Jun 2022 15:14:16 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de, Heinrich Schuchardt Cc: Simon Glass , Sean Anderson Subject: [PATCH v2 02/14] doc: mkimage: Use empty request instead of blank lines Date: Sun, 12 Jun 2022 18:13:59 -0400 Message-Id: <20220612221411.1608406-3-seanga2@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220612221411.1608406-1-seanga2@gmail.com> References: <20220612221411.1608406-1-seanga2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Blank lines do not have well-defined semantics in fill mode (the default). Instead, use empty requests (.) where vertical space is necessary for readability. There are a few places where we use a paragraph instead. Signed-off-by: Sean Anderson --- (no changes since v1) doc/mkimage.1 | 110 +++++++++++++++++++++++++------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/doc/mkimage.1 b/doc/mkimage.1 index dc597272d4..be12843928 100644 --- a/doc/mkimage.1 +++ b/doc/mkimage.1 @@ -1,5 +1,5 @@ .TH MKIMAGE 1 "2022-02-07" - +. .SH NAME mkimage \- Generate image for U-Boot .SH SYNOPSIS @@ -7,34 +7,34 @@ mkimage \- Generate image for U-Boot .OP \-T type .BI \-l\~ image-file-name .YS - +. .SY mkimage .RI [ option\~ .\|.\|.\&] .BI \-f\~ image-tree-source-file\c .RB | auto .I image-file-name .YS - +. .SY mkimage .RI [ option\~ .\|.\|.\&] .BI \-F\~ image-file-name .YS - +. .SY mkimage .RI [ option\~ .\|.\|.\&] -.R (legacy mode) +(legacy mode) .YS - +. .SH "DESCRIPTION" The .B mkimage command is used to create images for use with the U-Boot boot loader. These images can contain the linux kernel, device tree blob, root file system image, firmware images etc., either separate or combined. - +.P .B mkimage supports two different formats: - +.P The old .I legacy image format concatenates the individual parts (for example, kernel image, @@ -42,69 +42,69 @@ device tree blob and ramdisk image) and adds a 64 bytes header containing information about target architecture, operating system, image type, compression method, entry points, time stamp, checksums, etc. - +.P The new .I FIT (Flattened Image Tree) format allows for more flexibility in handling images of various types and also enhances integrity protection of images with stronger checksums. It also supports verified boot. - +. .SH "OPTIONS" - +. .B List image information: - +. .TP .BI "\-l [" "uimage file name" "]" mkimage lists the information contained in the header of an existing U-Boot image. - +. .TP .BI "\-T [" "image type" "]" Parse image file as type. Pass \-h as the image to see the list of supported image type. Without this option image type is autodetected. - +. .TP .BI "\-q" Quiet. Don't print the image header on successful verification. - +. .P .B Create old legacy image: - +. .TP .BI "\-A [" "architecture" "]" Set architecture. Pass \-h as the architecture to see the list of supported architectures. - +. .TP .BI "\-O [" "os" "]" Set operating system. bootm command of u-boot changes boot method by os type. Pass \-h as the OS to see the list of supported OS. - +. .TP .BI "\-T [" "image type" "]" Set image type. Pass \-h as the image to see the list of supported image type. - +. .TP .BI "\-C [" "compression type" "]" Set compression type. Pass \-h as the compression to see the list of supported compression type. - +. .TP .BI "\-a [" "load address" "]" Set load address with a hex number. - +. .TP .BI "\-e [" "entry point" "]" Set entry point with a hex number. - +. .TP .BI "\-l" List the contents of an image. - +. .TP .BI "\-n [" "image name" "]" Set image name to 'image name'. - +. .TP .BI "\-R [" "secondary image name" "]" Some image types support a second image for additional data. For these types, @@ -133,42 +133,42 @@ when loading the image. At most 256 parameters may be specified in this manner. T} .TE - +. .TP .BI "\-d [" "image data file" "]" Use image data from 'image data file'. - +. .TP .BI "\-x" Set XIP (execute in place) flag. - +. .TP .BI "\-s" Don't copy in the image data. Depending on the image type, this may create just the header, everything but the image data, or nothing at all. - +. .TP .BI "\-v" Verbose. Print file names as they are added to the image. - +. .P .B Create FIT image: - +. .TP .BI "\-b [" "device tree file" "] Appends the device tree binary file (.dtb) to the FIT. - +. .TP .BI "\-c [" "comment" "]" Specifies a comment to be added when signing. This is typically a useful message which describes how the image was signed or some other useful information. - +. .TP .BI "\-D [" "dtc options" "]" Provide special options to the device tree compiler that is used to create the image. - +. .TP .BI "\-E After processing, move the image data outside the FIT and store a data offset @@ -177,44 +177,44 @@ FIT, with each one aligned to a 4-byte boundary. The existing 'data' property in each image will be replaced with 'data-offset' and 'data-size' properties. A 'data-offset' of 0 indicates that it starts in the first (4-byte aligned) byte after the FIT. - +. .TP .BI "\-B [" "alignment" "]" The alignment, in hexadecimal, that external data will be aligned to. This option only has an effect when \-E is specified. - +. .TP .BI "\-f [" "image tree source file" " | " "auto" "]" Image tree source file that describes the structure and contents of the FIT image. - +.IP This can be automatically generated for some simple cases. Use "-f auto" for this. In that case the arguments -d, -A, -O, -T, -C, -a and -e are used to specify the image to include in the FIT and its attributes. No .its file is required. - +. .TP .BI "\-F" Indicates that an existing FIT image should be modified. No dtc compilation is performed and the \-f flag should not be given. This can be used to sign images with additional keys after initial image creation. - +. .TP .BI "\-i [" "ramdisk_file" "]" Appends the ramdisk file to the FIT. - +. .TP .BI "\-k [" "key_directory" "]" Specifies the directory containing keys to use for signing. This directory should contain a private key file .key for use with signing and a certificate .crt (containing the public key) for use with verification. - +. .TP .BI "\-G [" "key_file" "]" Specifies the private key file to use when signing. This option may be used instead of \-k. - +. .TP .BI "\-K [" "key_destination" "]" Specifies a compiled device tree binary file (typically .dtb) to write @@ -222,53 +222,53 @@ public key information into. When a private key is used to sign an image, the corresponding public key is written into this file for for run-time verification. Typically the file here is the device tree binary used by CONFIG_OF_CONTROL in U-Boot. - +. .TP .BI "\-G [" "key_file" "]" Specifies the private key file to use when signing. This option may be used instead of \-k. - +. .TP .BI "\-g [" "key_name_hint" "]" Sets the key-name-hint property when used with \-f auto. This is the part of the key. The directory part is set by \-k. This option also indicates that the images included in the FIT should be signed. If this option is specified, \-o must be specified as well. - +. .TP .BI "\-o [" "signing algorithm" "]" Specifies the algorithm to be used for signing a FIT image. The default is taken from the signature node's 'algo' property. - +. .TP .BI "\-p [" "external position" "]" Place external data at a static external position. See \-E. Instead of writing a 'data-offset' property defining the offset from the end of the FIT, \-p will use 'data-position' as the absolute position from the base of the FIT. - +. .TP .BI "\-r" Specifies that keys used to sign the FIT are required. This means that they must be verified for the image to boot. Without this option, the verification will be optional (useful for testing but not for release). - +. .TP .BI "\-N [" "engine" "]" The openssl engine to use when signing and verifying the image. For a complete list of available engines, refer to .BR engine (1). - +. .TP .BI "\-t Update the timestamp in the FIT. - +.IP Normally the FIT timestamp is created the first time mkimage is run on a FIT, when converting the source .its to the binary .fit file. This corresponds to using the -f flag. But if the original input to mkimage is a binary file (already compiled) then the timestamp is assumed to have been set previously. - +. .SH EXAMPLES - +. List image information: .nf .B mkimage -l uImage @@ -294,7 +294,7 @@ skipping those for which keys cannot be found. Also add a comment. .br .B -c """Kernel 3.8 image for production devices""" kernel.itb .fi - +. .P Add public keys to u-boot.dtb without needing a FIT to sign. This will also create a FIT containing an images node with no data named unused.itb. @@ -303,7 +303,7 @@ create a FIT containing an images node with no data named unused.itb. .br .B -o sha256,rsa2048 -K u-boot.dtb unused.itb .fi - +. .P Update an existing FIT image, signing it with additional keys. Add corresponding public keys into u-boot.dtb. This will resign all images @@ -314,7 +314,7 @@ with unavailable keys are skipped. .br .B -c """Kernel 3.8 image for production devices""" kernel.itb .fi - +. .P Create a FIT image containing a kernel, using automatic mode. No .its file is required. @@ -340,7 +340,7 @@ file is required. .br .B -d vmlinuz -k /secret/signing-keys -g dev -o sha256,rsa2048 kernel.itb .fi - +. .SH HOMEPAGE http://www.denx.de/wiki/U-Boot/WebHome .PP -- 2.35.1