From patchwork Mon May 16 20:11:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1631826 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=0L3AiQRT; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L29Pp1lTFz9s5V for ; Tue, 17 May 2022 06:11:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 933C484191; Mon, 16 May 2022 22:11:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.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=seco.com header.i=@seco.com header.b="0L3AiQRT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1F7E4841CB; Mon, 16 May 2022 22:11:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20630.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::630]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BB604841F3 for ; Mon, 16 May 2022 22:11:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B7jn5cI8JiN7ehRYhYoiPjf8/n7PKaCHdqIRf1Y2RDfXwKYiE0ny6PcN6xtzImJyn+kQoFeeITjKexzn/XusiZRz+oIp2tPI8cx4wJnoSqgxKnjG9s4WQ+z+GpYVAdxqkw9BoGV0DgEnflaQzDUeYbiGu+jaqu2IiyKneNxUNq+mTNszTEANAqYAlVyFT4cluaDgqKYhuGHR66q7s3HHyyZlHcWnKpT/7vM3vkyEPID+AKNGf2DPKZVtRVh4FSzPVh6HOgW+eEbZTpail5gglcDeVMO1qlqjzWH0PX/5Zp6blIfv6d4B0WRmqwQx0U+1xbJyfim0+YfBCMDDuNpxhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NDXDqLXBSR/bjSw4AJXD/vEis/UEtE1DaEeSGn+rotA=; b=lM1ZZkpzWnk9HRIAF0BiSyceUn+hLvuth/+fCM5/JrkHdeZE49jEgyg6g2Rb5nAGTD7YQ9bOvODtfPYQWwnXz4Fk+lnSBAAzw7mA1t+Rrp3cPDwTefsu4BmWFrjiFjynNXvGibx3k36WcJvpmL84K1knzacZw7wz4MJatejBfuchauGy3lXIMeH0eBC3FrnXBT2NYQoaqaBhLmFT7+4DcZNPjW9DEhGyg2q+yvCRvFs1qPBzURNq+fMsfgW/pDB6GF5wPtNh5MlWdwxgVaNA7ZW23Y2wTYmHuOINtOEIQfJv9A4XHYLY75LBY7v9RcNXlucVTRs4gL+D96YsW9GlvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NDXDqLXBSR/bjSw4AJXD/vEis/UEtE1DaEeSGn+rotA=; b=0L3AiQRTr8mZbcs4cVXxDtEmsnij0xaTxrpD/iRXpUP8XuuKKMH3CyngoALfrvPXNykkBEkQ77aq5+0bC+SzyGsv/y3Idxxkb/sLQa8rdTCHT4lxJOKo6qRywdAlCjMl795aeMLQ/WS1p9EOkV47HNPv4k2uJXQBA7c/FrYrxQ4r26pufkdKfN+ue/3voFIXAMSUUMf0jUUnwcgNIa4RfH/L3hIl0C+KZCOJgvG8ERQjeaAFOCzDAcHZC+mCUYuQY4BaNzG8OLrMUvhtJ72e0KGZqSQNmx5ytO18SLp2MSDZiEnwCyKltaU89q9SrNES8xy3OYJhDnaZQGVklIOV6w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by DB7PR03MB3595.eurprd03.prod.outlook.com (2603:10a6:5:5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Mon, 16 May 2022 20:11:18 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::cc0b:c665:8330:89bc]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::cc0b:c665:8330:89bc%3]) with mapi id 15.20.5250.018; Mon, 16 May 2022 20:11:17 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Heinrich Schuchardt , Sean Anderson Subject: [PATCH v3 1/2] mkimage: Document more misc options Date: Mon, 16 May 2022 16:11:07 -0400 Message-Id: <20220516201108.4070444-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty X-ClientProxiedBy: MN2PR19CA0071.namprd19.prod.outlook.com (2603:10b6:208:19b::48) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f496385c-1139-461d-cd8e-08da37783c81 X-MS-TrafficTypeDiagnostic: DB7PR03MB3595:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: brmv+GLHxEzGeeCKLp7kdouTo4eCbcBwX0RzlxnDYpqTf8J2idCy0EbLGy3P+0LoggtAHLm7uNRSbSSXw1g3xVtfEn/ZDXSiemzN5JjiJh147PSKRPjXAep09g16uvNsZm5e9RP4KTk9ameJdveggaXU4U63cKOFI/GcJHVWG/+h9B0cPlHQ+v3BmrwJaJQhh5/KNeYToXLYtjMKw6Xdu4nOmbXs53zJzzmEXN6k7G7WMEC39N0EWpSDJnTZTxjaouMoqVF8OV158Psxotl6j1gkYl/7+qk+2qX+50usA3dC0psRNLIMhjEs+daPFmdZCereV1hCbIJqaIzLXzkuPtYBe+Bja6dN+z3GYMVQBNV/8nRcCvIEl9EV9YgtpoavKlU6Mf278wk+FS+HGHMYaPmG9uv0MQJ5JUVOq5Ph1KVze9LIupv7/qIgRwCIZLdgcPbBO/+GaFke80mSAj4cRH6jCmR9Zmdom2QZF0P8cPlbOg29Sw6DaPqPNLMzY9nk+570Z0ZAE5yXN2iSXX/dQnNczSJkb7rWcE584EkyeOuwesm+cWzbf+9fQhJwRaV2+QHF4tjYY/wqOMpyMIbkjCactbN6/dKCWRAikgezuKfNfv6cP36g/s2rzc21tPXT+Ha8j6QQBkI4pWy3y0v4Z4KxRlUFZEE17iKdUZnBGGAQS3nKPeLH+SlBhDJ0y8jKSRkrttJcI0Wix2GtgyKuQg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4972.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(66946007)(8676002)(4326008)(66556008)(66476007)(6666004)(2616005)(38350700002)(38100700002)(86362001)(83380400001)(8936002)(5660300002)(107886003)(1076003)(186003)(6506007)(36756003)(6512007)(6486002)(26005)(52116002)(2906002)(44832011)(508600001)(54906003)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j0IC3dbKJy3+WZuzC+iLtlsG9wTDK/BtsorlZl4YYldZNhSpAhpwgljiTsj8x0Ix/o5P6RO2gpD99olx0dxVFV+vckbBgq97WNsLJDR7gg7mdasBhOWHm/xGHOeP8jMfdP0gUcQtg0hA1iNLwzzIzjJH5awssVjsGvD25aMPOvwazvwjlw0Pu6Wpx6v5TZTg54kRD8n597rJcT5DXFJtvLuvpLYw2186Mzh+YnmLjXNrDkqjI2lPLWLJWeE93CWfP9oqPCXVavvysIZH0TWA7ltUu04sNCe2Y1o1fLu/CsZEmBwJUYAFsvAYNsxh5p+xA3yONSTF7dgLMYZZkODZchEJI8Pn3uoWydvi+6PSUD8ZcnB4PZH/2nTfR3gV/dW4C7Vwsl7FKF3Sz4FkzRGmYo3LAREVJfNlkPy/117KOkXFK5KXOu+jy/vhf+2jC+gL1XkdFk5jDkY06GDkphoL1VYcK32N5SuEY56QPsgW7C5qMZ2eX3AEFqvzlJ3tmymEGzlQP89j9VL7SnYl+Lureid3ueKi4/5Lw+0kPsma1izzaXrR6SZcJAPTG5kAJugdMrbx16qfavKkrw4yTdFeb/X2GbdhKOIfItyqubgWyXko1e3BsT0XoADt5n8UHZRnWWiwr+H7fCCmKgRTRFJ7W6qdsBV7w0Zybac4w/Bj/KA0xYcxc3GokVklZJBa2CMc2w97fg8622v0g/01/LFZE4VRDB+l8NjmdIOHU4fGx+h+oEElvUs5Oqx2VJEe8zfHDszY6ax7fJJstMgZy3uaexeEkoEXNpPFkaW7/KbNdvVX5rXwvVyUBF6nU0qUkBrW6p/hTn6jq57Se3mod6pCzkK8r92tWGaJwP9PsqnefeBylUB8rY65naz7UgUN+rL7rrTVeDD070rLpr03NnU1DDHR4FsK31ECWS+b+1h9vN6QsqgWDAm93O80T/7u2hgx8eLfB1S5uLqYX9tcMiBJ/KmsU7WFU9jOKhh83iope2/vsD+wJt2ZlZ36hgXMSto/O9Gg2dpPjW1mIAja06lbHuadehh3AnXyHWUsC/Em2vrI6/KbjFvykLdE56fLUqWYMwV0Q9daCMvWq7X+3D0y+NwZyz844luXBbmCulmzYMLZP3aRV6yNU9WmnF2xvOpUow/WfRmEC1Xo2p/6e5/0WnZCv/ONo0UP/jAVoo6/ihXcYor+pCWuwHuSL09TDwUrkJ1icp5vuNG8se0wVdAU8OxcZmHHh63OpbD0RWb2Lde6eyCUgFEEBl2hEtovydyFLyXPXzbkgwUCXL9IWWvulUjxJsE91u79xT734d+PiFdZm0Mb4OlMbxo/8keOWDBrfHnkLJrIgMExyTKchNoDahl9zREagusszBIE1qL6EXmn6ERDJRM7hw/Ci61kv+xc+3ASgtI0knOLd/9zSSJKPAmAvNix6Dq3nl7xx4KZhxVDB37w+fzZ/mQcZufEbbzgPS2FcRQE7XS8kBgm9sl+K5sa0fzdY5ZVTi7oiryXnfLzmhhpsSJK/i9WPQXan1w/+3GyFgV6+5bP60bAsGbBOm/1+OeKU1aHTPJtSKBhg+NhB5Yg4SS+EsImAkNRTijSqzwtmDMViLt1fFzobbFGoBLPI4dfoNgOaN/Ux7IPI1wVNUkDtnth1cpnAw2aJ+jAmJ33YMLrDaMdPnjkn84NACr3VZOWT0GghNscjZsSA6hwRZXsOAxI0Dvyzu8NJdGuGc7RCYDo8B0MAwJ13pYQ3JOWQN35WzTGyRsRQOy1H20= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: f496385c-1139-461d-cd8e-08da37783c81 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2022 20:11:17.8183 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WWbukDj4bJmiJ0Gz0mBhi0hb/Z4B3A3O958pK6NQObwc3yiZtQkPOyndOMXHbQr4PQCyhklt71s4nljavp2HIw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB3595 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 Document -G and the secondary image types which can be used with -R. Also reword the documentation of -s for clarity. Signed-off-by: Sean Anderson --- Changes in v3: - Rebased onto u-boot/master, as v1 was applied instead of v2 - Reworded commit message to reflect this Changes in v2: - Document secondary image types - Move -G directly after -k - Reword documentation for -s doc/mkimage.1 | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/doc/mkimage.1 b/doc/mkimage.1 index c92e133732..878db90475 100644 --- a/doc/mkimage.1 +++ b/doc/mkimage.1 @@ -99,6 +99,30 @@ Set image name to 'image name'. .BI "\-R [" "secondary image name" "]" Some image types support a second image for additional data. For these types, use \-R to specify this second image. +.TS +allbox; +lb lbx +l l. +Image Type Secondary Image Description +pblimage Additional RCW-style header, typically used for PBI commands. +zynqimage, zynqmpimage T{ +Initialization parameters, one per line. Each parameter has the form +.sp +.ti 4 +.I address data +.sp +where +.I address +and +.I data +are hexadecimal integers. The boot ROM will write each +.I data +to +.I address +when loading the image. At most 256 parameters may be specified in this +manner. +T} +.TE .TP .BI "\-d [" "image data file" "]" @@ -110,8 +134,8 @@ Set XIP (execute in place) flag. .TP .BI "\-s" -Create an image with no data. The header will be created, but the image itself -will not contain data (such as U-Boot or any specified kernel). +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" @@ -176,6 +200,11 @@ 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 From patchwork Mon May 16 20:11:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1631827 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=CeeOJVWI; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L29Pw0pmKz9s5V for ; Tue, 17 May 2022 06:11:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4CFC8841F3; Mon, 16 May 2022 22:11:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.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=seco.com header.i=@seco.com header.b="CeeOJVWI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 662A784184; Mon, 16 May 2022 22:11:25 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20630.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::630]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 37E058419A for ; Mon, 16 May 2022 22:11:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vew9+YxIeMLzvLz+kSniaCDYsK4UVz6k7BfrGFLmohO1zqklkdwOm76X2I1CHbKfip0f5r2iSAqBMOUN3nS0s+10wakvkyfJR+S3W43qSxrr8Pdi3zf3uh/NI5FtRCYE5ixI1Uk1ldqHBdvP9wmt/pdw2cUTtH4Cq13QnhbxUMISazW2zSReIRMFjAF5GHSDzKqadq0QK/V6SbzFsuz30r/ForbHODsTe0yBc+nqmrIk5O2nZag8BvuoaNLR9xPm4hO0+MOsz17sjikYqOaQS/EuIukYmoYi4kxUpiXK92w3AHE9MlMHZOeRFW+U5z4uyMmtKxhACDRtWqBw0idRdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eIT2WDuWALQ81kmEiXiO3y5j31OD/tgpaaVuYUntH70=; b=OvRDxD0jW5zzS3yG10hw/M1vYRDBBkDAMfVyoCKh5nm8EsUTeqO15YZsLdJ6HrhdZOzu0BnU6ObcpcG4rS92lZ+6b1eb21TJujM2k9hBu7vj+wgbfcFyI881pHnbCIGwLhTz2ntkvMizpoBwR5YVq9qE0Or1f/mP+0VgCrRIbYXJzURLhZe1ETC0tDI39nH6z5H0tDbDZfJdfqJEGsj+VbTCEiZ58Ph98Wqjvz9DMfRLasSbkSR0qiTae6edRaPdzSiZAQ2ftUuMH6n6PphazXpMJrvQV7q5D2IFh9Q+YCIP6g/xYxHSTmNVV9VFa5oKBTp99WKfWtCWxl4yiQHAbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eIT2WDuWALQ81kmEiXiO3y5j31OD/tgpaaVuYUntH70=; b=CeeOJVWIBbLoCYjURFJRikLkPc0OvSXOftPmrDot/83ubb8JAb1+rbuGibz3/aRzcT8S3gNP7FK0yW9iCXUugaMUDaS1WRY3jK3p0WiQLNaxPAZFAhPHPHEiq1rvBRexHaTFdkgwu/WKOMqjcRG5LWROqNQvw5ugFZXa/JsHuBIEcKxYD+FisuO/P6KmMG6q3bHdEMTukUCo1nNDK6LGGb83SsJjPiRPeBfFzqKy5rJanBcs2YYBjD2Kl17coEVDkxxGq4M9t7qQH9FLjMoYbYnjXIN+mwwKdrYlZjQFQ9lPQ9BuOgAMQChxwiP4lNFy2PN4xa9/GKvUEJndoywAdg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by DB7PR03MB3595.eurprd03.prod.outlook.com (2603:10a6:5:5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Mon, 16 May 2022 20:11:19 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::cc0b:c665:8330:89bc]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::cc0b:c665:8330:89bc%3]) with mapi id 15.20.5250.018; Mon, 16 May 2022 20:11:19 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Heinrich Schuchardt , Sean Anderson Subject: [PATCH v3 2/2] mkimage: Support signing 'auto' FITs Date: Mon, 16 May 2022 16:11:08 -0400 Message-Id: <20220516201108.4070444-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220516201108.4070444-1-sean.anderson@seco.com> References: <20220516201108.4070444-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR19CA0071.namprd19.prod.outlook.com (2603:10b6:208:19b::48) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1ea5b16e-f134-4323-119d-08da37783d2b X-MS-TrafficTypeDiagnostic: DB7PR03MB3595:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BGf6MCC9Ax3mIo7Cu86C4dAphflUTbm8VdTLfp815eutUhDQgClBVnDO1nNc2GGrPODPvA8bvdOlrPniZ5GbFvJXRt7WYeudE6+RK6EkIgcnf08i6529vhWm5Xr+Md4eJJ7zFTPbnxaOOxMARs3FdbtaliHRcRQrqpsI1GN2lpeldt3hgATIEXPSPgy1LJTR3K9jXAsHl+eiZ6n7bvSKrf7gKRI0DeIHIgWc7R5V81KUtbJkfO3LCPiHYyaTp3GZTpLVkq05CScVqKuAzHVT3tpeS+oJ/UIsmWP/A5Za/J81mh7dZw4VxJpq3PxQ8e3FfC53o6zIqZjrL2XW9ojs2AbUtCFX2cnhvwbxDydSukC0yIa63BpEshQADJRIAbUlIYyiQj263Bkxr44hDLjO+nktjnE94HtwCiNLk/kXwJEyJQwdJgr8CEBMGFOgxf/0YR10ZLCL9FjCOW7PB+u67UM2/6ffXEI7/MWc5in+IAcXfPbjYWf4k5PuxEJudZ0zYR4HX+iGLlvPfCgNq+rIdoAp82w5K335qrDqkgK/Z2h1mW43cParDyqmB7kQ8iVUSnqvqndpdzGaVUkjmXq+Au6e+RAuSd4o5yVDpGnBVBvFMW+hIb5hfuGJecsKKDBM+xw+Hj5VFVrCmf9mpvAokB5zDI0JeMWTflVDvw9+kUA16nw0oUBNC8ceXO5qVsm2DCmAFMznTMSB4GVL9HtQf44f7ilFHGgQ0PBKjgVywb9BJ242oyuarVGF9jDkyX4Bj9vIynOxXWcPsq+hq3LrVpuyfdLaCJv6m6nyuxk8zIc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4972.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(66946007)(8676002)(4326008)(66556008)(66476007)(6666004)(2616005)(38350700002)(38100700002)(86362001)(83380400001)(8936002)(5660300002)(107886003)(1076003)(186003)(6506007)(36756003)(6512007)(6486002)(26005)(966005)(52116002)(2906002)(44832011)(508600001)(54906003)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xlPeWsfm+NNJOk0/6lWOBHMCGNeMllJWjeU8M7cWKD1c0t9QZ0sUz5RAKbTFIu9BkdpVMqGGL0AaZRLocdBa0x2EVObCMJrzmg5lpg/BTAn+AKthuH0AAILyy2gxn2aYssgFvpws362PguV/kcCVo0ibqhqn3tSqXxwRonuXhc5WYN0VR9PVBy45tnhlvSTLbWSmmTzlB9r2Fg1LUb5aq9FO9Pa7qFv2V0ll7S8xDlTFyq5VFWxcg8dUMjrZIJ9vbxJxn2NurGfJYLV+dW6vCt0DC6zJNr56omTZfYaORa+x1YhLfRNDydRvrElafpIKu6I2tj7mOAYjI4OaUq03Wbkem5G9OeEiOroojXG4soZUoNNs6lup9Dsw+oXu0THqVw05P5FCLOrkIotzepImCCwLZRXmwjHVszq784SZLqxBo5+hDPeZl1ILaT0pBiisjU7q6frB9ojppux3jdHKq3G1uDuOE8p79AERZg0zuyMjzM5URn+Y4OdaXJ9iOzrheTntyKIMV4ihqiw9X7xZbl45b0FnG1XTsUsm2149t6erHxm/DXzMgK/4HtGHifdm+5r+pA89Cvdrv+XatFLaYITyDeKAf7/ODhysscqvvu8J2jbZBNYrbLdC9cjCPay03JglxhQF0214qUaHBBCxvjo7PUrekE55EUaL9t/0XEIeYloDPZhpyqd0cunhMlfIFLInT1GBMmIOz8+z2zSW736f+kMbHHVzvVZi0mBkCRY7GP9cxmJf2QwRLXhGlkZQSE3yxwOgAyJ8oE+Sl6pdWIDT/yQ4uFNJUeY01KJSviZ0o9cmIewvA/XT2LdhXEAg0f8na963Jsn0s+nIsTI76LL/2Fcvic5olHmO6539o1Qt66ouPejC4bmgqC/R6o3fV0rB5X4rpwQpTLfh2RRthjjoat84kUzUKEYM7N2tsAwpbpQosFYFNCInrNZJJvvc9v8Bbq6oEMv74dn6tpzcK1WPyiJek0kUYpRuXBp5f97kCGlfUfjYL7ZqYgBHNvHdHlKzq8TisRi7Qtpeat3XJPS88zgJRe7IFgT7jmvkhYyUw9+IroViaV8uEqNp4o0c6nrZ0krjel0IW3Aj99MI8mlrSpCTAXIaiVugnOCM2z6srt+W498PnLqcJcen8fn00BaGzdx6XgbWl1LX0J7p7CGRXlLQkTGh1NFq3WcwRLQT2JlUk0MgP4JRcxToRKekPzUzT1BNNITgajVwZc6/Hd44Gu9kATsNLUx7bcssOGmA274bwkMqvsN1nQz7yyrKYSVOhHfFnS9jHzVZuXVjI9o3LGSQz3To+HaEcB2HEd9ENoVUkwGVKAQOrHBNULpFct4AUBpTMbrqBkzp11vY1Onh0HiyOJH8nTAg4EVnbOWl9DNo9+RmKbtCPonnXl2tUHKTucZHW4XLnSGFw2s9JwXGkcpVEE5uEfAxAlQ5maNUXzF5FF3T8oiosqQVrQt+x1AIYqvMT7EAIlpzBcDY/rZ+jFihHnPSvtDJWarLbbYDY+6FvuD435O0RfajNuFS0z3vTHkj9pq76aZPzNpLToBsj8MMDJjm71sGXn8TJBOWvd9Vmaxqpc17mPELv+hzxFJESolsXnDpJpzFYV0SkdYYxa7NN6zArKaT2IIadH7J/jfJL2GpFlRUqjarikvnItboyfPagyRQZFAAZnTW+6Cux3kFMkcxxSyQO+NG1LDD/pqA5BRA5px9YB3YaSwExPW2wK5jI0N9sVPRfVZGB89YwkYMWXVMQK3FAwi1n34= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ea5b16e-f134-4323-119d-08da37783d2b X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2022 20:11:19.0057 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: eHNwgRfDbTejTfRPHdMLQzz95+ZSpMd7Jzsf4Ya5dRH3nxjFbvG9qNGReRFjCipnDTeqfRrDcM/+sN6wlM8K8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB3595 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 This adds support for signing images in auto-generated FITs. To do this, we need to add a signature node. The algorithm name property already has its own option, but we need one for the key name hint. We could have gone the -G route and added an explicit name for the public key (like what is done for the private key). However, many places assume the public key can be constructed from the key dir and hint, and I don't want to do the refactoring necessary. As a consequence of this, it is now easier to add public keys to an existing image without signing something. This could be done all along, but now you don't have to create an its just to do it. Ideally, we wouldn't create a FIT at the end. This could be done by calling fit_image_setup_sig/info.crypto->add_verify_data directly. Signed-off-by: Sean Anderson --- (no changes since v1) doc/mkimage.1 | 24 ++++++++++++++++++++++++ tools/fit_image.c | 41 ++++++++++++++++++++++++++++++++++------- tools/imagetool.h | 1 + tools/mkimage.c | 5 ++++- 4 files changed, 63 insertions(+), 8 deletions(-) diff --git a/doc/mkimage.1 b/doc/mkimage.1 index 878db90475..759dc2d12f 100644 --- a/doc/mkimage.1 +++ b/doc/mkimage.1 @@ -218,6 +218,13 @@ CONFIG_OF_CONTROL in U-Boot. 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 @@ -278,6 +285,15 @@ skipping those for which keys cannot be found. Also add a comment. .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. +.nf +.B mkimage -f auto -d /dev/null -k /public/signing-keys -g dev \\\\ +.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 @@ -306,6 +322,14 @@ automatic mode. No .its file is required. .B -c """Kernel 4.4 image for production devices""" -d vmlinuz \\\\ .B -b /path/to/rk3288-firefly.dtb -b /path/to/rk3288-jerry.dtb kernel.itb .fi +.P +Create a FIT image containing a signed kernel, using automatic mode. No .its +file is required. +.nf +.B mkimage -f auto -A arm -O linux -T kernel -C none -a 43e00000 -e 0 \\\\ +.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 diff --git a/tools/fit_image.c b/tools/fit_image.c index 0d5a6a28f9..48fc1f5579 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -199,15 +199,36 @@ static void get_basename(char *str, int size, const char *fname) } /** - * add_crc_node() - Add a hash node to request a CRC checksum for an image + * add_hash_node() - Add a hash or signature node * + * @params: Image parameters * @fdt: Device tree to add to (in sequential-write mode) + * + * If there is a key name hint, try to sign the images. Otherwise, just add a + * CRC. + * + * Return: 0 on success, or -1 on failure */ -static void add_crc_node(void *fdt) +static int add_hash_node(struct image_tool_params *params, void *fdt) { - fdt_begin_node(fdt, "hash-1"); - fdt_property_string(fdt, FIT_ALGO_PROP, "crc32"); + if (params->keyname) { + if (!params->algo_name) { + fprintf(stderr, + "%s: Algorithm name must be specified\n", + params->cmdname); + return -1; + } + + fdt_begin_node(fdt, "signature-1"); + fdt_property_string(fdt, FIT_ALGO_PROP, params->algo_name); + fdt_property_string(fdt, FIT_KEY_HINT, params->keyname); + } else { + fdt_begin_node(fdt, "hash-1"); + fdt_property_string(fdt, FIT_ALGO_PROP, "crc32"); + } + fdt_end_node(fdt); + return 0; } /** @@ -248,7 +269,9 @@ static int fit_write_images(struct image_tool_params *params, char *fdt) ret = fdt_property_file(params, fdt, FIT_DATA_PROP, params->datafile); if (ret) return ret; - add_crc_node(fdt); + ret = add_hash_node(params, fdt); + if (ret) + return ret; fdt_end_node(fdt); /* Now the device tree files if available */ @@ -271,7 +294,9 @@ static int fit_write_images(struct image_tool_params *params, char *fdt) genimg_get_arch_short_name(params->arch)); fdt_property_string(fdt, FIT_COMP_PROP, genimg_get_comp_short_name(IH_COMP_NONE)); - add_crc_node(fdt); + ret = add_hash_node(params, fdt); + if (ret) + return ret; fdt_end_node(fdt); } @@ -289,7 +314,9 @@ static int fit_write_images(struct image_tool_params *params, char *fdt) params->fit_ramdisk); if (ret) return ret; - add_crc_node(fdt); + ret = add_hash_node(params, fdt); + if (ret) + return ret; fdt_end_node(fdt); } diff --git a/tools/imagetool.h b/tools/imagetool.h index 05dd94d108..ca7c2e48ba 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -71,6 +71,7 @@ struct image_tool_params { const char *keydir; /* Directory holding private keys */ const char *keydest; /* Destination .dtb for public key */ const char *keyfile; /* Filename of private or public key */ + const char *keyname; /* Key name "hint" */ const char *comment; /* Comment to add to signature node */ /* Algorithm name to use for hashing/signing or NULL to use the one * specified in the its */ diff --git a/tools/mkimage.c b/tools/mkimage.c index 5c6a60e851..0e1198b411 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -119,6 +119,7 @@ static void usage(const char *msg) "Signing / verified boot options: [-k keydir] [-K dtb] [ -c ] [-p addr] [-r] [-N engine]\n" " -k => set directory containing private keys\n" " -K => write public keys to this .dtb file\n" + " -g => set key name hint\n" " -G => use this signing key (in lieu of -k)\n" " -c => add comment in signature node\n" " -F => re-sign existing FIT image\n" @@ -163,7 +164,7 @@ static void process_args(int argc, char **argv) int opt; while ((opt = getopt(argc, argv, - "a:A:b:B:c:C:d:D:e:Ef:FG:k:i:K:ln:N:p:o:O:rR:qstT:vVx")) != -1) { + "a:A:b:B:c:C:d:D:e:Ef:Fg:G:k:i:K:ln:N:p:o:O:rR:qstT:vVx")) != -1) { switch (opt) { case 'a': params.addr = strtoull(optarg, &ptr, 16); @@ -239,6 +240,8 @@ static void process_args(int argc, char **argv) params.type = IH_TYPE_FLATDT; params.fflag = 1; break; + case 'g': + params.keyname = optarg; case 'G': params.keyfile = optarg; break;