From patchwork Tue Sep 19 11:37:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1836655 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=hlY/CLPn; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rqflv6Yb6z1ynZ for ; Tue, 19 Sep 2023 21:37:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D687686B3F; Tue, 19 Sep 2023 13:37:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="hlY/CLPn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 243EC807BC; Tue, 19 Sep 2023 13:37:19 +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=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on070c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::70c]) (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 50C3486AE8 for ; Tue, 19 Sep 2023 13:37:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P1bDcfefacZgmak40Ug+FXUq4VLmycymH2YZPXbx9u0A80KAS6xxd8a9AvLoPkPBuvTQuPZ5o/zopiaU/NyySFt2HY5WJ45AsNUxGMeDU9lcJCicc4gBwRQFPYpd1n7F194lTUVBbqGaMQrBZZ3y1kTYQu4CfMQL3UWhISIATVGf7dWJXdZciqdtGHk7WQztudTKUVBnW+yF9wdWx+xeYQtd/Cu1TtgY4gHokutU80Qxh09yEQpwp6ZmyCizRem72e3BOXSODy86X3/zLK/oobEJuUGsfuk7VL3vK63BYNlrvBUO1/L8NpW6Pk+kXnk33coVHgDYgDiYSPe027UOtQ== 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=IXlk1FeHUZN9NGeBsaOEOTVbGLYfRu4NhN+uSmfCtD8=; b=cF23xpiS0SoWnanI50IIoDAjqfagUCKaLDP/P+cp2VW6lfCZ+NJ5YrzXrcnYMVfvN6gku2KdH+UhcTe0m0BTtBs9mv+AhKhVUd1BYfDjoehBLJf4lauOdbcMYpmsr/y+4ZFueLyefMYI/NU2U+k8gwyEjIPKom21Cj+RAPNDLM8ZtcIdnVqs1eislK7fhcUwqwnoLc86ugUo/rJ45BkjeTD6UJa0tldmKmfUwJtUCHIZVVTqMbrdIHp7KupuFKdDqXrGJ4HgyKZycij/lyFWhEIUw5WQjW2LBqJwHG8w5MinqBqz9iZ3pU6fCZ3rZM/2PmhnAipq4O7nnICoTkCjEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IXlk1FeHUZN9NGeBsaOEOTVbGLYfRu4NhN+uSmfCtD8=; b=hlY/CLPnfc3gsTKUxyO0BPbnhz2IzFcFgG4K3d+tYYcQ7SMOJpfYK/vhLNaem915LyNOnuB4v3GnLuWujCrjhZjYDgBFJfBEAUss5xH+WXZ8DTfPbBnUH9EYt9zC8Ozlyh5vowdBq+TXilFR8+TniIXaWCzVaGlctWe787KTcqA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by AM0PR10MB3683.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:15b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Tue, 19 Sep 2023 11:37:15 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::52ba:4d74:6ab:aa5]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::52ba:4d74:6ab:aa5%7]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 11:37:15 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Simon Glass , Alper Nebi Yasak , Kever Yang , Rasmus Villemoes Subject: [PATCH 1/4] mkimage: also honour -B even without external data Date: Tue, 19 Sep 2023 13:37:02 +0200 Message-Id: <20230919113705.109639-2-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230919113705.109639-1-rasmus.villemoes@prevas.dk> References: <20230919113705.109639-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: AM0PR04CA0074.eurprd04.prod.outlook.com (2603:10a6:208:be::15) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|AM0PR10MB3683:EE_ X-MS-Office365-Filtering-Correlation-Id: 8de19e29-e499-4541-0d1a-08dbb904c5e6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dag6+DMQZ0cn9T4mM1xtc0z2BEVp2X3s/StkzUxZel5bKWnVNVhevhaymgPSGCbPhuCLmQ/pjKUTYWWoKZLicj2wFfkzwt6+WBzrpb/LSRtMlrV5ij0HsyN9YajQDTepAs2Qeww4juIuKUzIGRhPPxg7TT+ckW//exZ+pedxsdJ76eSwgiErgXsA80tvj1VSIvDbJxmaghPb7lqf4GzZDwd8Mtp2m0Z9XaeQSPw6rmZ241U8UalC2oWWAibp6o5/l3sZpVAafZzii6VY9fbYmqNjUIx57ua7L4rWPZutnA6Q82WS3kF5zTgg99PGP1N+rIWkkl9JF+RWW0VCoLp2z0jv1Tbk594/kFa1UJIuwHcCFaoviKO+tAyNmHKdWh5MAtsjgvXQgp4ia1/uy9j8kbm6gspf2Fg4G/DyJEL9QYAuD3bpfeHoeAlkwyIsIN4SXKHvJLYXHoHSYrXVQ89fOUqI6pxR97aOw4Rkbo21KX0GmCXKL0GVxxiBSGFSHur2UpkAAk6p3axlI17P/vUKGpnCpHb5pQPvSV8ZT37qyazb5CwZHWMnY+gLLeId1epY+3zLXTdxOK+HUt6wjXiG2/568e/dKaMUIHaexzms9fXhZhnjEokV5/ZiAdCV2d5i X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(376002)(396003)(346002)(39850400004)(136003)(366004)(186009)(1800799009)(451199024)(2906002)(5660300002)(83380400001)(6512007)(107886003)(26005)(1076003)(2616005)(41300700001)(316002)(6916009)(66476007)(54906003)(8936002)(8676002)(66556008)(4326008)(44832011)(66946007)(6486002)(8976002)(6666004)(52116002)(478600001)(6506007)(86362001)(36756003)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g73oyui43lz3q3cts6h1eH6th0tXew9InBECnbflXQwvnjIILwECRZZDDvKVPJjqIn3G7PlKEX8PwuaTSyio0uAOc/j976Rpc4gY2nRQN9GI9XGZccPEYQme8n9tyA0Jrx4Ey3X39Mw/UR8+2nm/lLfFVf5Mel+Lf71ir/h4gmPPxa9/Cuh6ZuQnvdLR8jocknxhiTc5uXKNa1j0YuyC/gIrtY1PKmOUoWK6iRrhCUaoB7dhvh1kgGBGUJx8wMWGwWPH+9LC68kgkCKv2kiosvQVJX8rlORRc7nBDGsMclJuYE/7/hyH/PFjVCP3CMt2kxl5YjAk25OFEfC/Vmxb8e/HgxufaWVxd0HSLwAThwc5pNdDMba2sUtpLSsXwBdLbyiQUbTsCsR3KNOJptcgzCuSwCtPXCSSNKTNuCGyDMDIM4CecH38ITdVqDLSXyB58EprgfkzUI5hAIP93kMK1qchRdtSRe9/rTgvYmLe7DkFQVZ8/FrptYBC63FdHzcjg+G9j6vMiJK0QaWJhYE3opkQ4rjCZ2rR9sKmSp0QapHN3EdcR7bH02y2fNFYKUHARHllJ+KBKoCB/Tia+v2aLY5Ppd4lFcjOWyvj3Cl6qjOQjCFhPM76AYhmQwhWHG8RLIl9ajbk6YqUjb8vM/qyLP6+cHck5PoC7sbocg5zfxtvnTmZmbq4QEmlcFX35XAoLO9D2povg6WEJJbMZ/aOWYm4fscNPqpzQ/ehZeA3cgw+3DqvnAtWK4vOwg4neW8aUWwQJnwgja2CMoCKDKvY321TtvevA5POKGCdOjVadwv+69x/edkrXzPDIJbM1WWSJxZCOguvtHlXya+2jlYHPAMjpSBXDbtuHDK91HB6XnvsmFbP7Qy06nNNipEnmYM7oC7OQuVzQC5WPSrmF/jawXhAszMAodYQ36VJFA7ZBI0T3t8yfzxNWog33X9C6MQSoAtBJriwSS/1V2xfn5y4Wxqm8L/iMjp46QqRADy2/VKBHUpb9tuQsXV6MrFfCS2SwAPQZkqCY1Po9UmNJB6gNuv+566ZQVWXlxvhujPEwQErw1vaw6N8iYIrzMMKhxHoX5dukarBKu73VR2gVdDYP7UJmwWazhFuOddMhaJ0B6EMdxBnsuf2XC9MKn3YrgLkOmPyYhs5o76h9CIGFPUGOZPyC5HAvIV/XRra44JKZ6dfMt7oRCsO5M32N2KtHu4IerFRR/uKA4N//9Q3wbppCUSwj1tRO2fD0i5g0vdMkoYGv41oAk0OcBx3CAIKit+fosnC3bM/GbxDzVcUe6LW7Ysjz90o0eJz0cYeA3FUnXj9vsWzntadHVODUu8EOby+thzurZpmqwZNdWDcT0GQrMKVDBSWcAX4RLDHs/2AqUs/o59bNPOETm5+madIbHB2+Ub6GsY8WEDRJUSHHc+m+wl6jKQ82DnOwyOh2g45gEO5ashv8bCp/d08GkLzClNdLNZUIdy+k7Pv31KD0gJ7jOdW3P6PKfhRfW8YQS4N1r/RgGU6U9aQMrcvFmnle1McMa8QRlGMukbvz1NXTJtZW70l6DepMlWGq98E0oeBitXQ40a08qhDV2/Hh0GeHi9fdWpHIXOb2PXhGrOOlmEZww== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 8de19e29-e499-4541-0d1a-08dbb904c5e6 X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 11:37:15.5416 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OcMJMDn8XawDlBqk+wRk0paUdRpIXLiKCXmgOVT7A4wLPaVbGUnYBevZYZmEOiZbUsIJGmbAucKV3vYbcyFcW6Tajp6AmxEmKyx9sqiNz1o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3683 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.8 at phobos.denx.de X-Virus-Status: Clean In some cases, using the "external data" feature is impossible or undesirable, but one may still want (or need) the FIT image to have a certain alignment. Also, given the current 'mkimage -h' output, -B => align size in hex for FIT structure and header it is quite unexpected for -B to be effectively ignored without -E. Signed-off-by: Rasmus Villemoes Reviewed-by: Simon Glass --- tools/fit_image.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tools/fit_image.c b/tools/fit_image.c index 9fe69ea0d9..2f5b25098a 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -712,6 +712,42 @@ err: return ret; } +/** + * fit_align() - Ensure FIT image has certain alignment + * + * This takes a normal FIT file (with embedded data) and increases its + * size so that it is a multiple of params->bl_len. + */ +static int fit_align(struct image_tool_params *params, const char *fname) +{ + int fit_size, new_size; + int fd; + struct stat sbuf; + void *fdt; + int ret = 0; + int align_size; + + align_size = params->bl_len; + fd = mmap_fdt(params->cmdname, fname, 0, &fdt, &sbuf, false, false); + if (fd < 0) + return -EIO; + + fit_size = fdt_totalsize(fdt); + new_size = ALIGN(fit_size, align_size); + fdt_set_totalsize(fdt, new_size); + debug("Size extended from from %x to %x\n", fit_size, new_size); + munmap(fdt, sbuf.st_size); + + if (ftruncate(fd, new_size)) { + debug("%s: Failed to truncate file: %s\n", __func__, + strerror(errno)); + ret = -EIO; + } + + close(fd); + return ret; +} + /** * fit_handle_file - main FIT file processing function * @@ -817,6 +853,10 @@ static int fit_handle_file(struct image_tool_params *params) ret = fit_extract_data(params, tmpfile); if (ret) goto err_system; + } else if (params->bl_len) { + ret = fit_align(params, tmpfile); + if (ret) + goto err_system; } if (rename (tmpfile, params->imagefile) == -1) { From patchwork Tue Sep 19 11:37:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1836656 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=m4g2mve9; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rqfm50dXmz1ynZ for ; Tue, 19 Sep 2023 21:37:41 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3DE7E86B49; Tue, 19 Sep 2023 13:37:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="m4g2mve9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D134086B4C; Tue, 19 Sep 2023 13:37:20 +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=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0700.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::700]) (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 C528186B38 for ; Tue, 19 Sep 2023 13:37:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cFrlNYRIb+GmsKr/EwDIjgQ7+LzcmxMDUybap9+7mCZEo5D69qx+mcAGNZ0vT3A2ds37nmfTOAQn9mjhRrZ6LQ7Ydl/GIoZ7sethMNKPHtkWf7XS12qxXM8uS3HY5b19s9t0qrMVAeat8AL6O/Ii4efM9XnfQseDFRjf6+ypYy8/QN/vBptSh9tGQepQiLRHtkoP9Fx+eF9pWwq5/woi/DPDuOzeRrW2KTS6LVhiqAyClXRVFizmiT/g0FpiYl6oy/Dx9X4zJnf491T3Sv9gVlpqZ8xwvans1KDZgsHW3qAgFcEh0fS50ZJU67jebX4xfGL4uwNfFfiHHnZXsrVvdA== 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=WJw4aWSo9hK2oLbiowTP02hOOuWa3vq61EtNyrD6H6E=; b=a92FMHjcW4udxcnE7/nmpzbAXNIrjKMm8XaNlO9Ko76prB6hzMFvZX8p+NcBTDjS5pbeltV2qCo85SU1xlG0Wf+nLwl8iS3y+ReeN5Bggyhf6S3BATmEaA90hkt22Yxl8oQ+WvMIz5PhObRpK9vfOfQyUD22+fGIwqlpNCFASyb+1iGzkenHM4ZKTXanbMvPeMiJnIBquF4gSScDyqxDd3e744m5v4DHHq8wroKh0dsilXXuEg+1892m1+TdEZyu3uTkkGguAOIKDoKcmpuOCdAX6M5m7xzYpuEkpvmQmcfVVPGgfSobwL1lTvbxrAI6brdJU5GEjA9G4O62JrKZ7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WJw4aWSo9hK2oLbiowTP02hOOuWa3vq61EtNyrD6H6E=; b=m4g2mve9z69dXjWCTypk/ZEDSrUcv7t5ffCVgBmTv0j8qm8r0S65wRH93gFwat7TraRjjMdEklLTSEtHkVrsNpdofvTZ9mST7vUMXyx7mPGbcRele4xtlh77Mn1owUKhukGxDmWQjYZMxeDKR2ZXlW00X6ZRJdb9o5b4KbtlNjU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by AM0PR10MB3683.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:15b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Tue, 19 Sep 2023 11:37:16 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::52ba:4d74:6ab:aa5]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::52ba:4d74:6ab:aa5%7]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 11:37:16 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Simon Glass , Alper Nebi Yasak , Kever Yang , Rasmus Villemoes Subject: [PATCH 2/4] binman: test: rename 275_fit_align.dts -> 275_fit_align_external.dts Date: Tue, 19 Sep 2023 13:37:03 +0200 Message-Id: <20230919113705.109639-3-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230919113705.109639-1-rasmus.villemoes@prevas.dk> References: <20230919113705.109639-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: AM0PR04CA0074.eurprd04.prod.outlook.com (2603:10a6:208:be::15) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|AM0PR10MB3683:EE_ X-MS-Office365-Filtering-Correlation-Id: e572028f-c792-4098-6dec-08dbb904c645 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BP6MyQ8HhDgLwF4XsNF7yQZ6tJfyTDC4wDNd1RY2dwzPpVxHDlx/+ssu6Yig8GHw2mcmKbzUS2Otd0Te9BDAp+Gc2xvjHxyKpP17sWG0O4ORziojPeWwcd5RM33lja9a0qXrFmPEDIL+C9f8wCK51HXaYi0P+YyjG+L+1oIb2qXxO5pocrjzSQnxfG2ZLcXpJ669vnxazwI7wIrdiiGgzt3U9KiJL6nA4H2Sw8hHVBbJFlbr3hZli3BKa3WtkYGJEUpoM9cllxNP2Pz23C/h+Zv6UKIXW3yubOTvU7BDgFf6BxE7MFrDgAMZIVK4w1GyIXZZ7w2Zs/WSa1wLe7OKNKA6Zf8wfENJfTzSdJt6//FbCZ4Gcmt7r4c9ws5xAQ2XFkZZpaShK6J3BpXM58KsRFTa7BpSXYHHDk1CLdJNAC2D6iwKnyrteT4VLQFFaueQwDK1UP9whIJbwaR/mYmbzKSeWNgvMoK6eZI5SKakZrFqGO4lGgu1uRAxfZZYQ6UGuSF6sDD7/dB0YureLA9swG9/NEmX/JvCXaeYDnctNJ2VwsthwQq+hH9mhZoDdkxMXenZKfZE3piZBu/Y0rFQ/UzM9OOLzLJ/mJEVqFSHVsEUn5FIBApBOxT8eNWIaVrj X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(376002)(396003)(346002)(39850400004)(136003)(366004)(186009)(1800799009)(451199024)(2906002)(5660300002)(83380400001)(6512007)(107886003)(26005)(1076003)(2616005)(41300700001)(316002)(6916009)(66476007)(54906003)(8936002)(8676002)(66556008)(4326008)(44832011)(66946007)(6486002)(8976002)(6666004)(52116002)(478600001)(6506007)(86362001)(36756003)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tiamDYjWjwCXnjo1MapOJixZxaw7WiHpbwJ+xt9dstZ9VpKhqGl4MqlzoxUCTCENRLfxA3TlpHtIbLY4yBMDbBzZ/j/ZolNCHWmVSjZloA931rJv+A08LjjF9ivZe2ld+29Ms+sQ8BdGDignt5HEmRyAnngVHRgqF7LhTxokGuxRVx0khADDosAqHJGapq4ppYYBzgGQbUNSv1MG8z6TjRm/+duNtztwgbUPTWgnPoQp0XuoMvo7Es1iKkIJurZL9xA1AyMRvSx70ay+prEmzes2l15sndN2khyhoc3EiVfzu7IIFZza8Ty4kVw073p/WijU2Zexj0rku61L1ND/qxGX6mIYbBHSbZyd233Is6fDOkFRFBexZ3xvKcoc5PV3eDhsBaUEnQhoxhUOwW9twf+rm3kNcGUEYZtY8tQdHkkQCAF6JR7xH0rLfeoyAB/eS3vaG0G2Zs043KQxnIybNIIKkEoNqz4ud23EBRot0+6ZAFi1kDw0P95ZlpLON3jz1DHKrnLUYBsNc+2nLi2o5ivoCGnv3G1XJ+ThF4aACsDl0aWITHy8Kdo1ktfMAHh078TILBrhgWpHKv8PtXlKhkIFqQqySwo3uXP8PcyGmCBbS4n1vOF8AHQ1ObSbw62Durl5X+YWVdLdAZTg0vk/C5181aIXpZFgqREIlGCvXLW3KM0zkxBir2invF8Og9Aj1rylwqzEtlNl1YJAOf+03oAzg29Z1r+xWJ24srWGz5CpJFuTMxr147uULUfb2V9RGyR+x89P+nkIeCdlb6kh8ax3S9I5trvzbeCmf1V4YXbhLGpiV2Zx+YIb2yO4YbTEhYe/C7zAoKcvJm3B7SmYw6QqWVXWE39gZucQZjMAWCBxRNhgaKDvgz3QyTd2CTAPtbaQATOb5Tq8Gw+4bs6k5aEcvJ/yYjm1YH/KzjsLjHpp7Na+yS98yILLuFjSdCoxnUHh2X6TO4wpQ9g7V9yKI581wBCVWgfS2UxlLLsGrJypVJAmj7zLLohx2jyzgV0AJHohD8YTl02NqccOC2KyMSKjh+2bGI3IidXVDjR2r5lzFL6MjXYhjQK5wKav5EbfVcRj6vd7lAP8s7wByLv+Hvd8FAGZO65i/Edrc+BDKxqhWG/I0n1ySA/dDHieMdQrJAWfj19no+aqJ6PoeQtNqUh2NesMr85fKBrK2s/z1piPkiyEnQ7Ha34zI8OQmyvh0/Xy19CswIh1CYqOpO3QOycsss/Z50F+obwjPHMR1qI+1PAel/aUOeY+7Mw+foUjnJmCQkKgKpplBjaFUq30wTnK7JtfzAqAqRjPB7BEf7oJTKkQmNSI1biskPJ5pBkADWmxC52rZRUZAlODuRlCXgkxnpJJJi0MJe4NcJ5pJKOGAs9qXIon4nbagP+TEIituNLVKhFAOnrtPeKYMK6P2oCDqK2qYlfcstbV+rhScDa3hOuqs4eqpH+QiG9pFxFIrpQf+xuq+kUo5MZqrvAI9P0YpOSLvRMBpvCYJt6PbotsqPnz/JWzr4+8ClcsXVEotr+LI39WuJSrWi5wTemfayEPmNxLpxGVRqDp7QFvzBK9QLIKUeCeR6Fr819dQdw8kT4NkmVpJSAL1W/Th2yGgw== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: e572028f-c792-4098-6dec-08dbb904c645 X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 11:37:16.1680 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UbJmHXQfj7m71VAqYoUlP7I/HWqzX9GiY1Y4IM5Pr53sQY2FPERmxiVO+t0cI8Vn6NBTtNjVAhgFJIAY7XafQHUFk8WxkRYuxGAOTYhX3dY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3683 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.8 at phobos.denx.de X-Virus-Status: Clean In preparation for adding a test case for fit,align without fit,external-offset present, rename the existing test case and corresponding file. Signed-off-by: Rasmus Villemoes Reviewed-by: Simon Glass --- tools/binman/ftest.py | 4 ++-- .../test/{275_fit_align.dts => 275_fit_align_external.dts} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename tools/binman/test/{275_fit_align.dts => 275_fit_align_external.dts} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 1293e9dbf4..d26e7511f7 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -6522,9 +6522,9 @@ fdt fdtmap Extract the devicetree blob from the fdtmap self.assertEqual(base + 8, inset.image_pos); self.assertEqual(4, inset.size); - def testFitAlign(self): + def testFitAlignExternal(self): """Test an image with an FIT with aligned external data""" - data = self._DoReadFile('275_fit_align.dts') + data = self._DoReadFile('275_fit_align_external.dts') self.assertEqual(4096, len(data)) dtb = fdt.Fdt.FromData(data) diff --git a/tools/binman/test/275_fit_align.dts b/tools/binman/test/275_fit_align_external.dts similarity index 100% rename from tools/binman/test/275_fit_align.dts rename to tools/binman/test/275_fit_align_external.dts From patchwork Tue Sep 19 11:37:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1836658 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=mGQ3wLb9; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RqfmV1Wznz1ynZ for ; Tue, 19 Sep 2023 21:38:02 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E507B86B5A; Tue, 19 Sep 2023 13:37:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="mGQ3wLb9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DB39086B49; Tue, 19 Sep 2023 13:37:20 +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=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0702.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::702]) (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 4BD2486B40 for ; Tue, 19 Sep 2023 13:37:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HqMntfWEr6OeAW12lKNHwlfX78Ain6QnykPZakJtA2O9xWmd924w8lyyGmROb7hxs/9q1AD+379TSg3oBJ/Q6ZWF02f6ujRv4yeLQTOtD1Dc85MZvdNmiLUi5G7s3V5FQBMqxIxr8bNE7MeJQn/bT0Ar1lDOrXRXUm6blMMx3VNCQ29frVK37xAdzIqgapMd9TMyWrX6K4hVGTpU0R5XTDjJTa1JVpSsIb6bQIp71GJWSHRPC3QRxJrrpyvB4S10iAsSEIit6jhPQzSKWd9f0elr2cyXcxQGUj5SnmSnw3smbrDQ+7xTfDQkoiACOfwJayK+Q1v9xEknGmNMInFWIw== 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=xTXRnoxZFCSChqBsykR+dcg3yqTwPhHhkqakFK1nzOA=; b=CjimC3FkgRgYG5Us3KLhtJlMk7QqmHO0NtLzR8H5XvhevcZcGx+5TxyEjTfOfpGPdsDxJ21U8l2C4O8iFHp1Kd2B1+NVNsVOunfL+JdSM3VIAzsiLtkG8Nvvu2WNSaKsWC1d7npIKf16l6UjyoRmcGQL6Ln9H949JKY+e+1DQYJV9e0/fT7gLpa3yCUGJFbY2cNYNVaTJ4Ok5pOcVFDh5oisq0T35cWEi54Bkp3J/yXqYgwRgw9l53rA9juLXYkZXvPV1dZo+KXpptPS/zUDEpgnuuMoiQY6w3bGQI5exsf8VrLOjsi0yLNIkTUre1YYg0jMkdpupWEz3uFDYZk9Xg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xTXRnoxZFCSChqBsykR+dcg3yqTwPhHhkqakFK1nzOA=; b=mGQ3wLb9LqtH3g074EvaDJHPIbPxJvnBXkCc8UP+CWCmF1/c6G+zPFng+D2oTwq9JYcWFppYWppMCMv3chz+/7Kc/nitg1IxbdUAT20f602JWjrgRn+OdfVwMJ0rHsEDRj7VKNTcmaSwR43EUW6Yp0CBy03pLIvjdXlvpQ1K6X0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by AM0PR10MB3683.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:15b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Tue, 19 Sep 2023 11:37:17 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::52ba:4d74:6ab:aa5]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::52ba:4d74:6ab:aa5%7]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 11:37:17 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Simon Glass , Alper Nebi Yasak , Kever Yang , Rasmus Villemoes Subject: [PATCH 3/4] tools: binman: add test case for fit, align without fit, external-offset Date: Tue, 19 Sep 2023 13:37:04 +0200 Message-Id: <20230919113705.109639-4-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230919113705.109639-1-rasmus.villemoes@prevas.dk> References: <20230919113705.109639-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: AM0PR04CA0074.eurprd04.prod.outlook.com (2603:10a6:208:be::15) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|AM0PR10MB3683:EE_ X-MS-Office365-Filtering-Correlation-Id: 832413f2-f79a-40cd-cecd-08dbb904c6a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 90xm3XnOFRp4zSvel4eRa4OjrwyLr12YDwa0da+LUgBD1nDcf4fNVShX9bUrFMljyfGnY57WoaYnSwYJkQv5zuksih/90fOWF5s7fG9vx6t/BZ371GORR19ZKvZWBoAq6Yus04qbvC72qz0s1J4qgftwGBLXzyroCGMhAm7Vivo7iYWlEHElnG6/W4RjWZBnIMgW2Mvp2MRNmMG6VM4Nx6XkBXZeMm1rcEAQw05JZ2Wn3PhLLV81xQ9DC4ksxF+7Vf2NgiQWS32B50v3XqL5x5k2O1Azmpqw9WZegBf1K9zGEGAQoutYT1UnM4W1ZmDoRCX0MByErf6ZjLSe6W68KM7WqWL2IlQY6eR7t3UpKfsRqk+XOuV248cihgMBj7ks/UUqccxCd8rnyHxu35xIDymB5+BQg85onXQCuKDbwPcL1fyIBhSN9KxP984kv/6q1nx2GJ0UU173ZB551jEhkf3Amv/fcV9EOxamesBcmezyQjkEaPtRrYaAUgQvnYyVwqPEeThTiFPjJ9HQ9Tx+HMiGNiYzzpT13o8yqnyljBHGOZLgI58jkU9CguB77nfeaYIWH8Jn8Fy2/SKANImZcK6qRLYlr6HSHuMEe4Q3EMOTxqdSLcVeXXrVY784n7S3 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(376002)(396003)(346002)(39850400004)(136003)(366004)(186009)(1800799009)(451199024)(2906002)(5660300002)(6512007)(107886003)(26005)(1076003)(2616005)(41300700001)(316002)(6916009)(66476007)(54906003)(8936002)(8676002)(66556008)(4326008)(44832011)(66946007)(6486002)(8976002)(6666004)(52116002)(478600001)(6506007)(86362001)(36756003)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zEmnNuHAalXFVByqnbv/aeoSkQDUbMH8RzI44ELBqcgmbQpYyeM5C+R4+SRCEdWBthuZsia4PM8LVi716Uw3sIZXIwTi8W3JwFHkx6et/D9hL9YJoaRT0c5hluroPtlf5QHPesPq5gmCDjLWm+tQ+EOoi7oNWN1wrB4wFChusiyshwSurF9/G2Zg5Q1py0Eh9Z/gx/fSPMFciFONPWP5qIqGnDpswy/syRYXbaTTbOGVIyf6NvJ5AhfjveVPaHM1qPZXCt/dX28o7sUejiORjM3xD3ILrdUPLfuTV2nOS8hBIMMKx0+zWgqOrqPFW8zUz43ti4/aYqfcXnMZVvFzdKiSzgi+jhbztr16pbkQ2IVYOwoyLkQAdxKx2zd+evItvY7uyqv1ovaAwHrj02aS+A8F2cfmyTEdL05GXpM3HN6AfvGPvbAThKjKB7HOqYxQ8K0zD3lcW91HlyLrQZF6Z21vUAh83gG9+eEh54hvHE/DbBAVBJelS8m0qAs3ptDf3keXpejcYcM12NpFsPmi25o5uj6n4VZMUAEKi27Vbm3iqvMyItWVBxlg38yMEXLHf+A1oaWnXZbxVlrMmi8BSNko3LsOK1uI9d3QZ43B8akVEmFEEXfDy4YCMpSbkLLx4+YfkSnX0rZRmhS0CdVFSpMHDnk77EqMwdPDWpyZmvLIEns8/2aG3jKXImKICPkZrdx99pO+LkZMtxhCd8rSXqg39hXNGLk1eDPIvt9gYwTJMRxW4ROKhriBbW3d0IPy++cVjqBvxXcNOzyuZ66C2pavns+O0nW8fNnCEPbjaOmBgZvGKGjxaKdXFiHoOBBxzLL/EGgeHiPth9lIZKC1o3tebZUETi7oul027hxa1P9S3Z3HVDcKFW1t/6tYABFyOWsTZRVHcjc7+mMs1zrXdG6XGEHsqpvRnVapvL9palDRhF67uyGCXxBx3Ojuvm4YbId4vRqOqvMcecbzUqLaDNrWYj6k+BXlZOIYttPYLqUq1eMSy2EH/NVfXbvZwUnB2xAn8xhX5/qQcy7FhlAXlgFiMvC90ROiRUj+UoTTAUsDKnevGKfst5TjNOm5fJFBYoGOkzfAfRncmi403c1OLFlhuCIS1CsxIRcPPw85UJLMflf7Asn4K5jDIZV5BM3DoIJoWLO7eKgCeikJVP9gT7SBhjd2u6TiYGCkNuN+bpKQ1gSjyvITLnfijhVQPjElz1yGUnbVKpv7d2uEYjoQXP6hF/JaNuuKzztmQxzP5w49EkrMAIKjk4x9a2hwfMcYRXWL9WCcknx9TwsqXLWg5yDwz+bMuCwFziQRnk3ZTj+GarEMDkKkblqhW0w66z7O+RgJSAcTUFdwsi7w5ih29MLD7ky1Lz0MptnzEh68zMnoqXe/5alQKJggba3HIv+H6BA2arvOJ4rW9SnI/JlHWr2ZKolJDB46AuF3ro7sbEy5ZRdb9sLx2ub9R0dpmN4KXcMyGCUg//bNMaBKG4ceYLnhBm1ZrsVVd+UtKFtzGUbwppWM7JrYrZPnp/mtWdeV8Q/7JpSd4UowC5bRo3AxFyDQ5Vjhw+xfb/h+JfbxLw6rSWO1nM0IDH3/BN7+sSJ5xppbv66JePoHHjjccGelhA== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 832413f2-f79a-40cd-cecd-08dbb904c6a4 X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 11:37:16.7913 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dePPtJUF6iKRE412ITmQn7dGqhb0uzMO6OrnIaZaKsrm1JnY9Bww5GHjxvGaQwCG5paPfi20nH26BbwcWDrM85jPVepGOewYeX3uM4xfBHU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3683 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.8 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Rasmus Villemoes Reviewed-by: Simon Glass --- tools/binman/ftest.py | 10 +++++ tools/binman/test/311_fit_align.dts | 58 +++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 tools/binman/test/311_fit_align.dts diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index d26e7511f7..a3c465b3d3 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -7216,5 +7216,15 @@ fdt fdtmap Extract the devicetree blob from the fdtmap self.assertRegex(err, "Image 'image'.*missing bintools.*: bootgen") + def testFitAlign(self): + """Test a FIT image with a fit,align property""" + data = self._DoReadFile('311_fit_align.dts') + self.assertEqual(2048, len(data)) + + dtb = fdt.Fdt.FromData(data) + dtb.Scan() + + self.assertEqual(2048, dtb._fdt_obj.totalsize()) + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/test/311_fit_align.dts b/tools/binman/test/311_fit_align.dts new file mode 100644 index 0000000000..4a9b95b8df --- /dev/null +++ b/tools/binman/test/311_fit_align.dts @@ -0,0 +1,58 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + fit { + description = "test desc"; + #address-cells = <1>; + fit,align = <2048>; + + images { + u-boot { + description = "test u-boot"; + type = "standalone"; + arch = "arm64"; + os = "u-boot"; + compression = "none"; + load = <00000000>; + entry = <00000000>; + + u-boot-nodtb { + }; + }; + + fdt-1 { + description = "test fdt"; + type = "flat_dt"; + compression = "none"; + + u-boot-dtb { + }; + }; + + fdt-2 { + description = "test fdt"; + type = "flat_dt"; + compression = "none"; + + u-boot-dtb { + }; + }; + }; + + configurations { + default = "config-1"; + config-1 { + description = "test config"; + fdt = "fdt-1"; + firmware = "u-boot"; + }; + }; + }; + }; +}; From patchwork Tue Sep 19 11:37:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1836657 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=SnSRL6Fl; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RqfmG4VNMz1ynZ for ; Tue, 19 Sep 2023 21:37:50 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 936E686B55; Tue, 19 Sep 2023 13:37:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="SnSRL6Fl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D566F86B38; Tue, 19 Sep 2023 13:37:20 +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=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0701.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::701]) (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 A7B2886B48 for ; Tue, 19 Sep 2023 13:37:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FRTYMP3Hd0zhgeBAAl5bXTfnlUcQ1puXxBqA8BaN54GMEuvx9EMEDAieysPbQSEYOUcVQJswgkw8mPv98KvwZu9NGMYm9yk7y/ev95rFiMYsC3TKG9FiA2pnf52dN3vnQad0VvPcebakY47swpclU4AodmRYaK+IK3Xv9f3DDIDbqL7EMaO4kW/moOsEAoPkf7pnVcDO9bwC2o+5D/HhCrmaBhm1425jDQuluBVn53a8UkB0KLn2ouhbP25zM8tq1YnjLW9e1r2SP1F9kZoQYAiYogp/XBOmgnsXVHcggnBrvm0wY+YzK+HVZJrjRahKDZxo5iPlIcIxG0kE8CIb3w== 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=C2usS8X6FqrhASkVYySIML2AWhPRXTsz48b8n5Uy5IE=; b=On8CGn1/hoR/O4Rxp2oHsiSLFfp6JajuI72SBDOqwgNGgzXIYRUFamOPwezGpcdvv0snu0nZ+A1R/7ydRWWAu1eLmNrUMjjGFIt/1Huu7dJ9GB6CIQcrfg4G/llkjBOnJuIRCXgdJnqyx5gxbWU+mrnuEVaN6RNvHden3cvrdfij9LT+2SZpnk6RZCebsZ2nRlZk3m8jWmLOA0bu9PZbl3dsz3jNQEYePSNMFp8HbjDzgiCQpr5Ddyygib6ARIIRzpIIwIv3afwpr217cZt2o7phm8x4ELvjb4o06/wI0E4Xj6zFaqkU1/Z3orJk3sypHUv+MZF3QtH1VxxoJfghwg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C2usS8X6FqrhASkVYySIML2AWhPRXTsz48b8n5Uy5IE=; b=SnSRL6Flj/Esc2uMS52/YE1mGMul1TVxsD667Izs1CfZfGxyKJbwoUT+a3RHnxlC/p3iOXAX1XqnNBFBYmLyCq2doBF9fLeS5uzI6t0Sv/ubO8yP1ttHpvCAYL6kybvKGRZKBS1wN+CJvY1rxNUGNBJ8MdHeG263PcVASjfndHY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by AM0PR10MB3683.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:15b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Tue, 19 Sep 2023 11:37:17 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::52ba:4d74:6ab:aa5]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::52ba:4d74:6ab:aa5%7]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 11:37:17 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Simon Glass , Alper Nebi Yasak , Kever Yang , Rasmus Villemoes Subject: [PATCH 4/4] binman: update documentation for fit,align property Date: Tue, 19 Sep 2023 13:37:05 +0200 Message-Id: <20230919113705.109639-5-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230919113705.109639-1-rasmus.villemoes@prevas.dk> References: <20230919113705.109639-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: AM0PR04CA0074.eurprd04.prod.outlook.com (2603:10a6:208:be::15) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|AM0PR10MB3683:EE_ X-MS-Office365-Filtering-Correlation-Id: 6e84ae7b-1581-437e-56ec-08dbb904c70b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F+UiInNZWVUTFlMzX7ohkHSnDoMWBUCXefVb+v5FBistmAke3pfDWLtw6Sw1vggQMJ1g5pAJbiKJGlt5fRZz8ib72qHfMd8+QH2/XoaA+s5cPrId5Pp/wCC3+IlvW0IntbhissualZohjKbCqHLLgNrDbgHpfNHpwJMCOK8EOlvSLaBF9r70i/qYJg6Rbxk5f00zsQDVjfuAnehcyX1YR+RgvmMeQ9nNNqE8JcDQTP5Z9MM6bVqqDyUptCHHVTWCxrh1iB+Z03mzl8tLErrtU+jbGGyZ1xZsHhwNQtgGqIDY7bnUNHIpRNuBjlye6OCzV9MxXBHXUTfCnlB1lPhCEX9GjTBJ3zdb7Fuez0uR2RdLvy6N15LXRFsuqGwm0adxzE8BDulSEXXmILeL/z+SZPzJ0KTSpy7P3n2SPnr3574PD/KNjY9lTRlVHtasQe3tN+YyN7PkNLohyddmiQe/W0JLtUVu2D08CtgnXWlyM0BxvAtksTKYZJRGp7O6MLPw/GMJPauHSfSGf7AHhYxuMl9ce7SHsqll/Z/VfBdydb12R3pI/0VC2+qt7VVKCqjiGd43b3z87dvny6bnK0l70Bsw6l31fOwgkB/Xkvvso07Jw889lmbSx56+Jv2M7/nY X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(376002)(396003)(346002)(39850400004)(136003)(366004)(186009)(1800799009)(451199024)(2906002)(5660300002)(83380400001)(6512007)(107886003)(26005)(1076003)(2616005)(41300700001)(316002)(6916009)(66476007)(54906003)(8936002)(8676002)(66556008)(4326008)(44832011)(66946007)(6486002)(8976002)(6666004)(52116002)(478600001)(6506007)(86362001)(36756003)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: asEmmaB4SfI7AekVynMtvLpOkcJRLF9400U29ap3awxCIHQchUgHUuwnqVRc8RvBMkjhkVZf2he0p7p9yPATQ5SV9siSuws50pdFSiCeFmGlfwFLrZVXv6LqvK9Htr1H07ZwnN7XoVtDpDFMZan2ovvNiOjUA/eTmz/Cbyegli4LCPZIqZlKyUrAL79cD/ykZRRdaFO4AmHlcxI61DHVDG4zYQJJ3EeP+QKgrYCkwuQ1p9INKT6MPThk4wncX9ONnoJI8Q41eyBR15sOQNNd3yzWJcdfL/oQcjQMbbDKOwbobJAuxNJzZIA7XO4hl9bO6qoTdqwksbPriIor4UNk95lhe3ULFOPb0Pnegvfey21MhfpId6qH7ywGcsGsM7jqG+1jdBtpMp+9vBYwlabolumflJG+fgaFsKZPbnarHQv9YiuuFwd+dFjqg8yjB/qQoN4wkrWZNY9zBUAodLa0saJZFRZEZzy/Pc7taqwq1hZYvqBJ2S2nDnuvQc25eKRp45m7lgYc5m5shQkUdvpWlUOAM7ENhTYNfXfbRaHdpFV4T2FUywiPYsKaIJ8jvELoHVIZtmpzwKeFlHBdk9s2S5KWAIirQPzkIJwov6LK6k1yj7GdOAxHEtpm8bRwP6V84g8RKyM6pC3pzWGUyYv0lJ/m7ktzSpJ6IuGaqliJR0oX2Y/pSPHexYggT2h89cnNIyWYs1l55ubunz8FO5kjA4xwV5ySv8esT5A512N+B8oZPp+BrTWYIkt7Z+kdWNL/oN2pGwGyghfHkoTJ30HP+jMCEYUqDfErsoVKTe+MoQgzBrQHV3lhVirbdBGNcpVemU2oJIXX/ugzQNDhrynNTwRtffBPz2aFvTuFxTH+6jaN4FVWTkQZPpgie3JAcEwSSWdH4iTbj941AZlScUc/6V7kk/qFG0CKEPyJuBWYriYJyu0Sr7YeMJFhrQEO6iE/9HorUTUgWSi4W9YCpnkIVcODnR8lTdnNfendelwrXnRsKBUh/Sg555Nfx6VbCwRpfYY3OFNEyR1e7XcJXadWr4tHtIT5ZJWqvdbYphzhL2Wyg6kQG9lyOTWl4i7xenLM6jHp+/tMosAfA7d4Rw2mDYq0bdAn8scKKotplG1lGHeSfA6TcezD9jGVoZeapITv8EO54wWLcr2v/+aQ0y9QnThISe7M78r2Y01uhax8Y25GG8age+h+5HQNSv7yVX82NkMMMIZ2pVyCc/qN4oCK1SZb1ZQvYVTQJAZ5R4PmrJJa3WkQeFA95BTpnK3twn22p8SaRJO/kkgK4hwM5CW9S790mCbfpdnjEb2EGXA+rrwU9kOfqfp/+dG5BQvwV2O88fN7H4ot7Q91m84QWbbrU9zsYRkgF3odOeIpK9GYe5z8bL5sBmnY33OY0k8vPsGV8vB93KfzoMS6lc2erCivmK1QsxEs4ZLOfkjYGEANz3bj/ONIKuPi93EeYVn8M+tU6zJty+JZPv8t9CkWtwgQRg04CI4XtHvXAAcWlxSt4k5H+1fSki1e1UPlooXsueSQxSnYSfLYVUoGGn2EhODwSEevd0bordz/UTfMpN/XucpMXy5mZdGglutLwxT7mVkVn3RmovI7siCoKSoAwABouA== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 6e84ae7b-1581-437e-56ec-08dbb904c70b X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 11:37:17.4721 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4cfWODuPfTIQYqzy+XMR6HvqE0Nhx9ZO/i9VcwW3p/Z2LcpmVLcD6B6e16LOYHJvrSI/wyNigugse0jjAMd5WnEc0eiGPW74o0K6iN+5eOk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3683 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.8 at phobos.denx.de X-Virus-Status: Clean Eliminate the repetition "what alignment to use ... and provides the alignment to use", and indicate that fit,align can both be used by itself and together with fit,external-offset. Signed-off-by: Rasmus Villemoes Reviewed-by: Simon Glass --- tools/binman/entries.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/binman/entries.rst b/tools/binman/entries.rst index e7dfe6b2a3..f9ad27ce8c 100644 --- a/tools/binman/entries.rst +++ b/tools/binman/entries.rst @@ -691,9 +691,8 @@ The top-level 'fit' node supports the following special properties: external offset. This is passed to mkimage via the -E and -p flags. fit,align - Indicates what alignment to use for the FIT and its external data, - and provides the alignment to use. This is passed to mkimage via - the -B flag. + Indicates what alignment to use for the FIT and, if applicable, + its external data. This is passed to mkimage via the -B flag. fit,fdt-list Indicates the entry argument which provides the list of device tree From patchwork Thu Sep 28 08:02:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1840617 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=g9eS7gMa; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rx5Zg2Qsbz1yp8 for ; Thu, 28 Sep 2023 18:03:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4FAC0869CA; Thu, 28 Sep 2023 10:03:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="g9eS7gMa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7AF1386E13; Thu, 28 Sep 2023 10:03:13 +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=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on070c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::70c]) (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 9785086844 for ; Thu, 28 Sep 2023 10:03:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PkXie1bWpKaOCKhU/KRK7W7RvyL29BNabEvWdYAshkDU6ATtF/y0vi8OIfFm7fO8kR4zWNiTpGwmtcp95IcMkBEU9mkeH+Wzow+h/F5UYKgxBEEqAVo/q6y++GfrQhSW67U8barcGrEdqwEuHQdp5yMyBxFfWUeJ94dztEtypjiPbX1BIr/Ih6Mnnk2tlxAucSwWVforj3aZ2w1eBewE/5bLGhSvI4st/jaKKfseQVkCbAHK9eaBKOZyHASptOxxRA9MHPrBS5JSNiV3eOSMW5QK39EJxAaJtvilhG+Gnl3LukuPmQJcbzRt6IZbXaLiAdxWFnpFjS0QMT/3ZfcYjg== 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=FxBkGPHo7hlTNbXNFyAjy+e0A2ee7RBM7+7cgU59w08=; b=lo3zpx89AsG4KMJ6ewgJP/6DeHoShnpkBclQIoy+CyASM7TPF7+VN6x5w9PbTrVV4kWB1TpHy6071Pc32gAdPjZw3/JZRcC+0ICc0AlJDu+jdM5EWdlk76wtNl2Fs63hIqY6DTjwo6udsPx00DtZJ4QKuJVFgSMKjOmw3qyYXBwLz6lKFZwG9iXhmWQwDXwwExUHLLibZyKwEnXvEYDRzvpe28l/XJe4uOn+L1TWrEtqFJJ+TUybsneIQcZf8e8FDrn2nwTX0J3vwYjlQzsP8Abuc829+696XX8U99L4vM1Sh0MF900Zm8C9PTisg3dMhjAwyDbYKeJIPa2Pd1+xIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FxBkGPHo7hlTNbXNFyAjy+e0A2ee7RBM7+7cgU59w08=; b=g9eS7gMaSqxjrsGie6NK19NUXQxD6t/2FzEQHX+Wd1Mdkzzpuw070hlg97WKPEJ1nMBRFtlvz6R3QkpHuUgnK5ScdpN8nmCSplhs1x961QUZwVu4yV7hVOJ0FqMh1/myoGdCGjDyO1eweNkqgvcZ4A6QoIm5+UpLUsl0tg30wAA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by DU0PR10MB6851.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:47e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.25; Thu, 28 Sep 2023 08:03:07 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::52ba:4d74:6ab:aa5]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::52ba:4d74:6ab:aa5%7]) with mapi id 15.20.6813.027; Thu, 28 Sep 2023 08:03:07 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Simon Glass , Alper Nebi Yasak , Kever Yang , Rasmus Villemoes , Sean Anderson Subject: [PATCH 5/4] mkimage: update man page and -h output Date: Thu, 28 Sep 2023 10:02:57 +0200 Message-Id: <20230928080257.2650461-1-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230919113705.109639-1-rasmus.villemoes@prevas.dk> References: <20230919113705.109639-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: MM0P280CA0062.SWEP280.PROD.OUTLOOK.COM (2603:10a6:190:8::16) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|DU0PR10MB6851:EE_ X-MS-Office365-Filtering-Correlation-Id: ac6b0716-87cf-4ad7-8d30-08dbbff95943 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t2ITcE8Oe6fw9jDYaZDWgXOD0dphtOLV+EVAa1jDxkOufMA44OeOA+oF5uyBc/G1BeCzRS+cdAEi5NPvV2p1dB8AiUYWravkiIdP+/ONSLf4RDGC414pCRG6xdLz4bdnFdW8WPiqQ4CUTcW4ich+Qwje+d546cEQobyclx2xzfJEu4iCW9oQorOTEzLOmFiDtvlY8lnhtebxTYcNC4IoSTJQthuh9lV4Rkbg68WK09FLK9BMBLuz2xxGoDGQ00dsPq9L5wSFzyyGJ1eXUkpNyeEscXxrXFaB/R5lBHX+PKOV16eA9vJknMmBeEu8F9gTq+P1TxpIX4MjryTLCfEM2vfbRrmzctslVghJZMoIK02uKwGjClPFb0KX0jAiydjo+WBuE31D4OWc/oCG5b8i38oGdun78qUBnjg3erUGGdmEUCzfzNJa5yRNHdHK2Rp4b/U7VBl0Pv7ArYE6/L1k3B32aE8ZXMM3qlky2z+epaASsSvzVeUsoi5P7utL70boudzRTGFYRls5CSyWsMxjuhk4bvwiQK9nbVx3kKqj4/pPcVDb1T86leA6178KkoBpDYobQ8S4/nvzCJTpU/35ijd+GBjyrakfScnvXPM02uvXglyPcw0XHyAjM5C/34UE X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(366004)(39850400004)(136003)(346002)(376002)(396003)(230922051799003)(64100799003)(1800799009)(451199024)(186009)(2906002)(15650500001)(44832011)(54906003)(8976002)(6916009)(66556008)(316002)(66476007)(5660300002)(8676002)(66946007)(4326008)(41300700001)(8936002)(6506007)(478600001)(6666004)(6486002)(6512007)(2616005)(26005)(1076003)(52116002)(83380400001)(38350700002)(38100700002)(36756003)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: w5NHiKBWsN+9GDcGtDwOnB/B2cMdk4SxuljGl3qRpnLkVmEE2/Zr4sg1IFBbzpDVo5CrRZQQDHfalUbqnIyLiXSeo2NFw0EntVWWbUIG7A7dnGFESVDrdWRxGyL03oaX4dZ0xWeOKp+SSfSHJ33TLoMmn3lqFpc+wf42yMjeI/7kxf/kPHEQU/fflGhaKYx9+10FlS3WhVsYoOmCr7iUCmQhMjq+Qxxt7HEeG1RmwslshoBqPfJb7GL2AaWS3+r+HypslWmwVq3d+O6FY3PykhmblIxEk+BcjQ2fQ8u9n052NtPwW6zsRngGJp3rIlZsp4nKaSjKcABIp/AVKXMIYN9XvnUlnTEXNlmfQAPWOVO4ceHUgObp/rrmThar7sxu3Og3A5uiBeTz+BGewbE+1LR10H84+IAXd6hJnt4LefTj/WJgoVEY5xoVw0waPbuZiCvz9h2n/KqE+qBcqb8n1xOvQhNJiqAUQFLtG+iLzP9vNch8iRioxJ2TSI5fWUfvLbuy3SIZ/a1LPmGDpSJ1g5wLf6QHj1nfbNNeCORoC1ZUlY4Ww5KnpzSzaAP/0ol+UrwXWfDToJ0FquHQimAyKTN9U2xbiru7RIl41WsklzZNFVIIXXX0eJsNefhj2qft+u3NPGJYFnicOUSL1ZhFHkydzkLCcT+ip6ql6fx9L8ixRAYXkWVq9GJfVdqgZBJ6vIiWAPHbZjQUuWb6Y2w/+M7UtIMesn9SvUr8CaDC/vzgTqG8IZFcoJ2NvhbGNckFBXuVCQnkvytA0eOqS4pP2s/QHRXjFkBpcDXgFKJhe5xrCkWcJAFTA997b7sjzcj3c6lCXH7ZS4sfF0Agy0+4EOUrwlbId52IwxSa6NMmfGuKYNdHWzTDB4c7WZ7yYp+fKF50/CLcUl1O3c6zyzWC/sljlFHjUOGgtAGPqoGj8mumzWBApHO+s8BCXj9ZkFdRsPsAfFoiI3aAf2U07pbbNTmKr133VPwm5VEyOVF4zhxRuuZj6rx2eG3F4xGfniXL1BR5ElW8DGVI8ZyeFcgw3ZDxT5JgDBn1GHssEQkHc1x582cCP//1rlbgWxtBh0//RB9srvd/Tsli/vrxJM8B8/bOYPgZZzI4+1b0sfkPaufLVW+MmwefMHhB0wfdkzdU+9sbT7QjBlEld/bcAkJroWjjpH+hLYidCYdiSbanoSEaHke5muh8o22yrZFI9+BqSvz672bTj2hBa6HgzI398ZeRcbWYz+5wGQ7Q8buDxZ+7xxY2p7ppasmWHmdc0kiUYab/TfUKZdHS5w+MyRB3IpD7oA/07uc6X5le8bBlrAPOQ53qrXBJag20opiDeUDZkg92n7/94YSA8iXvhpfz6EWLQzCy+N0Niw0tfEcUpMINT9+VXzXauHqiT86oEEqdMkz4gG5jGuT12Bejw718kdb+WbnH8fBOuz3MrDkjG5pZUIeeD13Yy1nHyxdHIZdhq3H84yrW0t89shVUBxHSnUn9A21MRZ8/PswSXOyeuMFbnGGCx/Pq2xn3Wu6r6mEm1ylL83W0DTOK4pF1P5l/iG7mR669dzD3UkQvziS1eoXtzG9Mm9JvZOsc3mXziTDE0rbBbp4QJWqNYbbFIjeEQg== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: ac6b0716-87cf-4ad7-8d30-08dbbff95943 X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 08:03:06.9950 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: a0aUKaBt17Kn7WU3/VptxxXz7ogJoWVBmHI/yddJvn14jDjmYLq1wqiAu+HPGswLeK5ZQziuebPu7qL/NjzpwVgDsnCe/QxIeMvWEJN1mtE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB6851 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.8 at phobos.denx.de X-Virus-Status: Clean The man page correctly said that -B was ignored without -E, while the `mkimage -h` output suggested otherwise. Now that -B can actually be used by itself, update the man page. While at it, also amend the `mkimage -h` line to mention the connection with -E. The FDT header is a fixed 40 bytes, so its size cannot (and is not) modified, while its alignment is a property of the address in RAM one loads the FIT to, so not something mkimage can affect in any way. (In the file itself, the header is of course at offset 0, which has all possible alignments already.) Reported-by: Sean Anderson Signed-off-by: Rasmus Villemoes Reviewed-by: Simon Glass --- doc/mkimage.1 | 6 ++++-- tools/mkimage.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/mkimage.1 b/doc/mkimage.1 index 76c7859bb0..1a4bc25936 100644 --- a/doc/mkimage.1 +++ b/doc/mkimage.1 @@ -281,8 +281,10 @@ properties. A \(oqdata-offset\(cq of 0 indicates that it starts in the first .BI \-B " alignment" .TQ .BI \-\-alignment " alignment" -The alignment, in hexadecimal, that external data will be aligned to. This -option only has an effect when \-E is specified. +The alignment, in hexadecimal, that the FDT structure will be aligned +to. With +.BR \-E , +also specifies the alignment for the external data. . .TP .BI \-p " external-position" diff --git a/tools/mkimage.c b/tools/mkimage.c index 6dfe3e1d42..a5979fa6fd 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -112,7 +112,7 @@ static void usage(const char *msg) " -f => input filename for FIT source\n" " -i => input filename for ramdisk file\n" " -E => place data outside of the FIT structure\n" - " -B => align size in hex for FIT structure and header\n" + " -B => align size in hex for FIT structure and, with -E, for the external data\n" " -b => append the device tree binary to the FIT\n" " -t => update the timestamp in the FIT\n"); #ifdef CONFIG_FIT_SIGNATURE