From patchwork Thu Mar 10 20:50:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1604137 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=UtL03ANr; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KF1WF4YqLz9sGB for ; Fri, 11 Mar 2022 07:53:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8EE5883B46; Thu, 10 Mar 2022 21:52:59 +0100 (CET) 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="UtL03ANr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A6A9183B17; Thu, 10 Mar 2022 21:51:50 +0100 (CET) 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 EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on062c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::62c]) (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 CAEFB83B04 for ; Thu, 10 Mar 2022 21:51:36 +0100 (CET) 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=Sh3/r3D9arYJGzhY9H847Z6cCdSUyYRASoSi06gvZTEL1AnQFbCfzb5nNzmv9fCTQtmqKJILXLhYIgk3K4VhKZdGnWqyhQWyU7NQKNhy8L9sOkqYs2mw6p/6NjmmQcwRdRH9N08+uqYez3BKyqmkr1fLd8XzUqe99tP/mIYIPI8yPv6Oz6Hs0APEHQtNn9D0xVIiOH23ji3VQyLZW7ufWf217FOKGiIZcVOXVvKfiZgRQ6TQL6h6zaCVFCjHDQhcnGWPl7R276Xjxz8dRpeIEeqnsKz/02EzDxicta8mzfLGNgT0zuxT2KaWv4wPsnrGrDGKbpJwwzBEIM+YVWReyg== 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=0KJdwOl2WaQA7zYs7OtBwMdA/cBvZBH16m4gyZ0J7/c=; b=IC2JnrccgL3zRQwxmEh1snprHw5hp1s3pY/OacK8UReaxWOWovy29IfO8hBnieRvFvOYy7xvyUW1sR+sdfU8MRYp8fXffZab24RNZHBW999bpGhvVh8u+sShtcX3qDkEoVlmbgcha+qShlQ+mBvhs/BOi45HjZVuJuRGJP6kYhJToo+zOKdRKYJN3NOQG7qg2pKbyqwV8GLtxwD66vkm4svw0VUO8POCVvK1cvQ0/v+a/vm2zgPrNlyIjqD4bXAKwDxk8yNPDiIJn8Ramfjn7MUg2UJmwufNWMr2AlzfoZ7ljOZYGgeA83YEBvoiKgMM9drMEuUcKtP8sCFecKlVMw== 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=0KJdwOl2WaQA7zYs7OtBwMdA/cBvZBH16m4gyZ0J7/c=; b=UtL03ANr5yfLeFEoJi4zEP5fnCSP7SOZonvkgKa5HJUm1dH8eZ+axsfrXnRGDFKVuSz5EfN87fmNh/svZm9wYgIJuySGTll8FoEm1mQ9A5GQWnh/SqAnMGrN0n025rjuTo6swh/94z1Srymdv4sKxr8XFtnxrPnesKn/vbgltN/fyWf57fW1FsCHJC/vy+4oC6+vinlVSTikm+bzyVxzMSHtD1JnxH5Pb3YBO0RHxz3Ml2GrZrdrZzrioCA1qltFhg8x1G9GBpku/Jm/ydRIA6Qe/Jztj5uQAjgd4JPi5J+B+XXatXLUVQy9JwwM/sb2mkZvOYkP1/zqd1N1PkcypQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by AM5PR03MB3105.eurprd03.prod.outlook.com (2603:10a6:206:24::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 10 Mar 2022 20:51:35 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9860:b15b:f166:5896]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9860:b15b:f166:5896%3]) with mapi id 15.20.5061.022; Thu, 10 Mar 2022 20:51:35 +0000 From: Sean Anderson To: Tom Rini Cc: Liviu Dudau , u-boot@lists.denx.de, Simon Glass , Linus Walleij , Andre Przywara , Sean Anderson Subject: [PATCH v2 13/28] cmd: fdt: Use start/size for chosen instead of start/end Date: Thu, 10 Mar 2022 15:50:43 -0500 Message-Id: <20220310205059.499269-14-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220310205059.499269-1-sean.anderson@seco.com> References: <20220310205059.499269-1-sean.anderson@seco.com> X-ClientProxiedBy: BL1PR13CA0433.namprd13.prod.outlook.com (2603:10b6:208:2c3::18) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a46b85e6-574f-45f3-d6ec-08da02d7c3f5 X-MS-TrafficTypeDiagnostic: AM5PR03MB3105: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: KNhOgtIfs9c1AnrJil3+8wIGFhBY+b9591jRpvtvsBKT6cPJm7gZaG2Dx+yv9IHTJpczAOhT8er533BuaXgu6JHLScz7EYTiu3YOvA3f5zRjMveb38JeigpoLfXtJaHg2pO/rLMcH9hHL2bZxUhs4Nxee9Sb6BLk7FVcA03pmBtc3Dv8YI2PMZhFOI0i/bmjw/6Vk94/ZQi3Y5TCBfLvPlbkyWV3NsklCU8SECZnGEWKtrNylGuQ+j9e2R23YvS5M+3uxlWa5P11/zACSRl0w9w9r1ewjy0cBKsqMAVLpFkI8kN8PNjhOjNbrjl+JJmqq6wF1I1Yg8HB375GDJGFKl+UkVCJ4QzGoSUOSTJyzUixBSNTUtmFpeVasxqP+XO7tBAmSsYH705H6raKCMG4ONObxdRRTdZEfuyCk/vEegnYqIFz+d3Ivd0ZrRE1K80qtbDCWohsG1/HiyEI328Frs7ishTTb/FdgF4XXXsS3/rq55z5WieTPsPq8OH66D/u5YO3PcVanjW8k0fersLGAn23yY+SBKvdwQyrvJTFMWqKIYXZP68ZH5qjss1NvhnkUNcz+hkYzxK3B7nWOm3CF2MBqPwcBN5XkOZhGXdEYNNDI3S50lwER4ViFuZIikJ9ZSvQslOKJXORJwNO3VAU4mDSjYCz5trVkn14yWEohmHi3N0Z4lVQqJhu26pEyqLYXOnuhkWoYI8CCmUcwxAowQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(44832011)(8676002)(54906003)(6916009)(8936002)(316002)(5660300002)(66476007)(6486002)(86362001)(66946007)(2906002)(66556008)(508600001)(107886003)(83380400001)(36756003)(4326008)(2616005)(52116002)(38100700002)(1076003)(6512007)(6666004)(38350700002)(26005)(6506007)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: q29c9Zi6PwbPif/3JQKmc9Hpf9RmDsMHsUpI6YiVacMeJ0fhVhXKP3cGTh41osGZzVF7wxN4yjz1vuQlMoKkmx7nj7ynWOAsJQ9/FIzdn5WoNKDRsW4Dvl1A1c64dY6Db80fkFJcXikAA1QmOLwRxW+Wl0KJcdouOMv0NxRgmNUlRLAn8ERKgoJtPEAUOPGBFALv3AE6HFSnbo/kXiremWiRJIZGLng8GziprRI1u21zX6mhESzMRQfJ4Zq3AplAhSSvww3zvrBv81sCu3gxajN2BHEgXTVEzj7aXaytqI8MpIbpPvPdRtuN3Zu2rcpzBq+4sTbRmRtvxazhlKy/qAmuq5TlGQi00157I8y66w05JzBXF1wMlA2sUvfH3WETUqyOiLmL/6NJp+sokBmyAdAWoXDZfqTbHZIiujc8siX9XDdNuNzZRq/IN/RgAW1MjF8THrHOoqD6BrCrgy1vnD120wlKKIRUJ0w++fP39znj2nOHqimBXx4QMs1zZr3iAmxNi0enk8UysIIhBmc2AkkMvD4tmBY4cjPYCXGuZWwQYuWTAAh+K1OuLXm5HxhKiKLCCESpek2tWep3+wK0P111/jFSyBU/VlVz4c3xs4hntbzII7L9LnH6R9XVrXubq76GHEfzHzkpg9P8czAL2U4HuaX6hthfgS8D0P13z67MLwrhNWZLB1GWmOjkMG5uv4W2wijmLRer1lsnj7/Taewi6XZo0bzht4q4Sfp6Xx+hKUveCW46u35K8GgWZIfrNh4btRvjYRAdmFQMJeRwBAEwwcPmsbZYMlX2JX5um233EaSDg1slLxOpvQmO6tAFmFLs9t2FNvPvpTz+xv0EHXp3sNLdMJ1ZdMvN4IigwPEHxCHSs3pQmPiyqjfMRslFRYNyvlcmlJX/KGCJNfEZbgLRieKJbPNjXWyFl9l1+AD3IoMjyY/NzbCraO/+AdWnoN7Ctsbb3H+dai/IG7SiUCsrtJuAk6jAqfI+jiFshnKhPSE+IShtl346YkG1Xg37litaJCOzkVVwVIKbGJvTnCtXW2w0YSC99I7hs3ednkis//WynkwJFvUTZHEBXW+oPO3OlvDMMcJTNFbKDtxWMvGrRun1rfuQYnq9W9gQUnZtKq/W60u5xObTT3xaC6N953r5zf3DvGnbNS73BdMh2LQiNpWGXprYPjqsZtQuohVnIuMr8XnqZq3p+1jT21iLcT9suPT2WVT4H62Tdepn/XyZkHRmQpnfmtytFGSnYt5zJTU25xsA8343MWrDYydT/AyLE7ehEpmB3FQwmeVwrhCcQwziA5OumkMa7gDYGt5Wg71a6rzhs1/1lVZGbaEN1SFMaocm5mjf/427VGaQps3LfQ08ujf6LhNg+hxjmKydr3e8hsvtYDX9UOMemY3Jyo5WvIqWAOqrgT7r+91ZAf1r8WamSZq3zIOssgAMB1Gw4AW4bCiahlbVSJznpw6EQVxFpS+O5rnYErjwDLKWxNCK17Ia9j57v++zYcO2K15ghL5qRD4oyyoDBHe6bzhMSI+q+h4UAm0otBZcwR9L3L0Qpxs3OTEhkTCHd57neTJw5agK3ynNa8NmB+NplEEH0C8PuC2EJNOr0lWtE8y9iPnu455BNOGLR+nS23Yi4Y8= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: a46b85e6-574f-45f3-d6ec-08da02d7c3f5 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2022 20:51:35.6020 (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: CCB57DNQZbshFHIBkt6+Fd4ZTa00SjWYKLU+3BIfPw8IQq5PBX5uDQ4NXRSUmYN7SALLyjRtzWwAJGjlFNivJg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR03MB3105 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 Most U-Boot command deal with start/size instead of start/end. Convert the "fdt chosen" command to use these semantics as well. The only user of this subcommand is vexpress, so convert the smhload command to use this as well. We don't bother renaming the variable in vexpress64's bootcommand, since it will be rewritten in the next commit. Signed-off-by: Sean Anderson --- (no changes since v1) arch/arm/lib/semihosting.c | 16 ++++++++-------- cmd/fdt.c | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c index d08003cef1..45cd566cfc 100644 --- a/arch/arm/lib/semihosting.c +++ b/arch/arm/lib/semihosting.c @@ -171,7 +171,7 @@ long smh_seek(long fd, long pos) } static int smh_load_file(const char * const name, ulong load_addr, - ulong *end_addr) + ulong *size) { long fd; long len; @@ -191,11 +191,11 @@ static int smh_load_file(const char * const name, ulong load_addr, smh_close(fd); if (ret == len) { - *end_addr = load_addr + len - 1; + *size = len; printf("loaded file %s from %08lX to %08lX, %08lX bytes\n", name, load_addr, - *end_addr, + load_addr + len - 1, len); } else if (ret >= 0) { ret = -EAGAIN; @@ -214,22 +214,22 @@ static int do_smhload(struct cmd_tbl *cmdtp, int flag, int argc, { if (argc == 3 || argc == 4) { ulong load_addr; - ulong end_addr = 0; + ulong size = 0; int ret; - char end_str[64]; + char size_str[64]; load_addr = hextoul(argv[2], NULL); if (!load_addr) return -1; - ret = smh_load_file(argv[1], load_addr, &end_addr); + ret = smh_load_file(argv[1], load_addr, &size); if (ret < 0) return CMD_RET_FAILURE; /* Optionally save returned end to the environment */ if (argc == 4) { - sprintf(end_str, "0x%08lx", end_addr); - env_set(argv[3], end_str); + sprintf(size_str, "0x%08lx", size); + env_set(argv[3], size_str); } } else { return CMD_RET_USAGE; diff --git a/cmd/fdt.c b/cmd/fdt.c index 2a207bf2b5..7d7cae88a2 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -638,7 +638,7 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) if (argc == 4) { initrd_start = hextoul(argv[2], NULL); - initrd_end = hextoul(argv[3], NULL); + initrd_end = initrd_start + hextoul(argv[3], NULL) - 1; } fdt_chosen(working_fdt); @@ -1083,8 +1083,8 @@ static char fdt_help_text[] = "fdt rsvmem print - Show current mem reserves\n" "fdt rsvmem add - Add a mem reserve\n" "fdt rsvmem delete - Delete a mem reserves\n" - "fdt chosen [ ] - Add/update the /chosen branch in the tree\n" - " / - initrd start/end addr\n" + "fdt chosen [ ] - Add/update the /chosen branch in the tree\n" + " / - initrd start addr/size\n" #if defined(CONFIG_FIT_SIGNATURE) "fdt checksign [] - check FIT signature\n" " - addr of key blob\n"