From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C9D30C433EF for ; Thu, 10 Mar 2022 21:00:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 33E6783B25; Thu, 10 Mar 2022 22:00: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=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="LHbkzYi6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1A9AE83B26; Thu, 10 Mar 2022 21:51:53 +0100 (CET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on0608.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe09::608]) (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 1952383AF9 for ; Thu, 10 Mar 2022 21:51:38 +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=gUy0eDAMyaQ8Rsc1uBP2g3wkNxNvtWEkQbumfWZZvgJbmANWg1vdFQSvSyxCK3ib8VrkZeqpuyRKSIZ0EMf/ri/wVWRFyqem6pihPfsBfi6oNJRJH+Zojqqhd2lZ9QvIYVyjp/EqjLSZTVpa5UjKM727U8jlMJy45imG4hwMoJM04xmAcnjzB7oznu968ebwHcNBEC0GxvzD93ntCMTkGAsq2Ix3+H6wgBUhMae+F2iufEeTQ1eGqRHoc6/uPLgJPZDVuqXICz13vR6hZzsnspWKpuX/BWy9aZ+IVlDu89g6aBjWtSa9qJ64PL/ZXBQnREpvqXyautPeELETjwcYvg== 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=6llIHKxoXx+Ogeb5NgD2Hhe41rot3vd3/BrcLatdrNE=; b=CNp0NgWUw3hvkbjepiNYqbuPfXPONy0Rk9k3zD0T9OSQm2FoSyqwzTNww6cO09+hWFtM5SmwCGSLlaHRwfqfWZ3qMR3pDs9jSznelcUEiTgG0xR5IXcu8d7zGc8KP1jpSC60ic5eE50oe/gBqTDTVX7U91HiCPE4nER8tU3BMJwd+A2iSrvZ8L3Ly7IBIxlAi/BCJWTGY5YwvDYxiFJwaZip3PVOmoS8lcudiyp8BOnkbTJ4jvbRLT4V51OjpzsyHbKCzW/Q8tyShawIQFSfrj/aoe+ijlD2hSx2TS52hWBnZ7pNm5/C9JCoylPJSjn86ODGZM+3u+CgFrazW66knw== 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=6llIHKxoXx+Ogeb5NgD2Hhe41rot3vd3/BrcLatdrNE=; b=LHbkzYi6lns/21Z5SKysibiV2gqXnkSWPSS4IseaWnNlF/2qNMSuoG5Jcx69LTTSegQKydXr7wGOmtDEhwb3JJ1sjNpb8aVEZjXv3ZmavvuVWkFwZKQv2gXpNqtJBrH9QzkO2MjkvrYIjdY3D8yz32BH2cesxc5HFwej4mCzgo3O9F7p3kc0ApyhjruqGKPliuRuOp+VxC3EZy8G1Men5qJPdFSeNwmE/XcvQl94cbI55/ZE3+NhQxL21sovtanOaspg5gpLttGkRDx6dFYL9kOh/CkUlDf9zZpMwewtQNUaBEZQn/twkrC4Eh0aD47qXZc2jWCAWZoZPvryx64iJw== 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:36 +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:36 +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 14/28] arm: smh: Remove smhload command Date: Thu, 10 Mar 2022 15:50:44 -0500 Message-Id: <20220310205059.499269-15-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> Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: 64d72b94-3fce-46c6-7d62-08da02d7c4a1 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: s8EmpEyLI6x+gZjmFpQcaAJUG9hWLC4eWIITnSXq1BwjGmxU0Um5iU4nLa1paH/ML54LCDjln9xaUCpqs9kHIkbArPlHWOS3ROJwpAWFW+HUHgKpScZ/K8WKnwqoNjnq5CUylUUkKxABHRYEdEbguZ8t1IGVADGTqufBdlXGcmgkHoHHeJ2UHQL8uNrMho0kR7pCiqXTt8KWUrymUTu8FHwdMcaanulUPjcrrXOl5qEbGubhY4mzjJhdOi3xo7jRIryZdQCL+m8j59crsycCE1Zk6gh7/4fHRf0dtfe2Ale+ZGh5JmcPuJ7vj2I28fpZ4Y1gDm5gsbUACyrgs+iplxkduGrDCZ0rdq9sbD3McJKRqFqiqmjMRoJkbZwEizlAtgU5h37kwQLjM8ZOv0uWyoHm4NZro4Lo4//tnTPsQPaIRQ8UyqZVI/9nZiJZGnN+deFhey2U1PpNT2Q9KUELPfU99b+MJZVQQbehbO2DusR6AmiYtuOEiC2r5gbTn3eWJr7qqBK2bElqy8F9S1Peh75piUf4RviwJkf/nOn5K1yw1Z3I5L4V67BtUWGBlAXqE6XSRkWmON0GlNdAl1lzJcHzHgAhLW+DagXc/DBkRcWvMQC6d+thyl2M3YLy9yBkz5HS5y1kNtMlOwoNiNlhtP6ccpSw30ogz/8ZmOaC+/xwZHK5ZP6g+dU+OhjJevVDZgKDNmB0V2+vTcflh/uWwg== 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: =?us-ascii?Q?RBeYHsSWCglAvblLRGcceFyMYGnTsWVbxMYoYF+kbJEXmfsoUlzDnD8Z+1r4?= =?us-ascii?Q?Cq4oSxidDeafB+PcCDVpI/FLn+AE5PIMviTrsJYho6dqxn2dIg0JEZDaS4pV?= =?us-ascii?Q?INWHRlNAUJJ6CO7JiVAAOXY9zQSFUaqjbUrs4EIHUgMQofsfgs5U0H2w41nh?= =?us-ascii?Q?iOzMaxMVUGcfgKkHjJPFf2nDEWKRwHyTP85dZKetN6t5W40kt/V5GGTZQUic?= =?us-ascii?Q?K+5qrIn8Tcj0pLgEYkzpu9akAlYg+XQ2WR2nigDg2LLmT8kwBn8M3lM0COLx?= =?us-ascii?Q?hprjNUjw1XaF0fQqP+xCSgyF3kiV+pGsIMl//92iFsHuGEPAHNsn/e6j5f3f?= =?us-ascii?Q?a99bKeJEBt9Cj3WgTY9mpfBThwY2IZhTyPvET8aoSt4qxCxvcAGY+uqaR9ib?= =?us-ascii?Q?8ISCsrNa1Ay3Gyg5o52EyBN1vI6achn55WMvZNXmkvUWO3GqWfNxCfnttMtp?= =?us-ascii?Q?T7ok5JzG5/p3IXa31gcnfPK/+hFNaFyDY5TZlJdC8Vu+Nsu4BxBkCJsewUoZ?= =?us-ascii?Q?TGvsW1+rWdFEPmhtUKUoU14tw1+rflPBQcRHKVftqKVl87d5AluNzyA2E2VT?= =?us-ascii?Q?TO2zbYfjaXXf1BJOqITGuDZB38a7yhVQNfJRBwPKYQ03fsQRJhXJMXnGKCzM?= =?us-ascii?Q?IuQrFY1kG5vSJkgqLh+8xBhvovZIYrjhTk4aavUCxdsSuN9tnqe3Hyly370L?= =?us-ascii?Q?yLfs5ztjXS+IFtDy5CujJ7Jt23BKYp6VPBCfp+oQtUV5Vl2BQBiSfhUUz9Vr?= =?us-ascii?Q?qPDXHfGDNA0XPWEbdlJCMK9eqOcOr/TuKn3RF5WysqZXPT/v5EOKnwf1BbKh?= =?us-ascii?Q?Iej8cuUBj7tX+7xrZwY6jvvQy3XJEVQao9XSBseosPLnh0XS9dXb/aX7Z0bx?= =?us-ascii?Q?XBZ5bb+EDNuAnEcrYS92spzGnKXwBjOmIVkXWbkRNMhL7fjP9OBLVpA1FG6e?= =?us-ascii?Q?MOjU0P9yTiydYZEsgcnV3DPnKX6fFwnDheMbPcNeZfh6NIBqmvnxCRZkx2mw?= =?us-ascii?Q?mGmK3gYSai7jQhky0Z7OmWD/5s4Iz1llfuicbW9kfEUrsE7iotDZZLbJfQGZ?= =?us-ascii?Q?6gaJCLjxgdKA4sXvO/FpfgyfysNbLEukuKrYDf1rxed6rAQpyOOCJ0ET9wRP?= =?us-ascii?Q?Py/LitnmL+Dywg0B6JY0lYux3UN4HoDej3f73qhDuIecsoB15GF/t1Q5m9s9?= =?us-ascii?Q?0NPp0nUomounjTcxA7FFIr37BWziO5kXX93YX1uQ5KGpSW/M4hvGdL/ZVRRl?= =?us-ascii?Q?jXm0WEXRiHCliB7sfP7vtzWNmTH9o2bCVPdyy2ZWLLSuRZCC8I+r0EGtFzY9?= =?us-ascii?Q?37yumVqlTWchugt0lr7fb8k8ZTEdUdl/fASukIwoBGVpSJem5Zz7RxdvFvXj?= =?us-ascii?Q?NdfZ6IGrC5lWUe7vgg4rXQkSgFB78b4exTqgmEmym+Snu3SS35m08jZ62SzD?= =?us-ascii?Q?OhJXtvWYOQDLVcx66LIGjH+mOpBiY1UGZzFbTbkLwvwgBNav0XEn+IUGiqpF?= =?us-ascii?Q?UDMw92Y0UOm8DDds25HI/v6xMNH081z7Hs0JDjoNCjCO8R2pbwHfo8gaUlLg?= =?us-ascii?Q?jK44w9vnqBBdJ46mls4hSw71X7Ssn/iuuybpWZ82dYJ89Bytk130iF2hp17z?= =?us-ascii?Q?SYCTB1WhLyh2Da7Eg0vOtf8=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64d72b94-3fce-46c6-7d62-08da02d7c4a1 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:36.7894 (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: stirCCHtIVlqkJ3xS/BwyVqrX12ZPLTybuogXyvKzn/2b24GkaQuEAD7bUauX8LS1f4Mfdn6XFIzjpqma3y5zw== 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 This command's functionality is now completely implemented by the standard fs load command. Convert the vexpress64 boot command (which is the only user) and remove the implementation. Signed-off-by: Sean Anderson --- Changes in v2: - Rebase on Andre's series arch/arm/lib/semihosting.c | 76 -------------------------------- include/configs/vexpress_aemv8.h | 10 ++--- 2 files changed, 5 insertions(+), 81 deletions(-) diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c index 45cd566cfc..57ab25294f 100644 --- a/arch/arm/lib/semihosting.c +++ b/arch/arm/lib/semihosting.c @@ -10,8 +10,6 @@ * available in silicon now, fastmodel usage makes less sense for them. */ #include -#include -#include #include #include @@ -169,77 +167,3 @@ long smh_seek(long fd, long pos) return smh_errno(); return 0; } - -static int smh_load_file(const char * const name, ulong load_addr, - ulong *size) -{ - long fd; - long len; - long ret; - - fd = smh_open(name, MODE_READ | MODE_BINARY); - if (fd < 0) - return fd; - - len = smh_flen(fd); - if (len < 0) { - smh_close(fd); - return len; - } - - ret = smh_read(fd, (void *)load_addr, len); - smh_close(fd); - - if (ret == len) { - *size = len; - printf("loaded file %s from %08lX to %08lX, %08lX bytes\n", - name, - load_addr, - load_addr + len - 1, - len); - } else if (ret >= 0) { - ret = -EAGAIN; - } - - if (ret < 0) { - printf("read failed: %ld\n", ret); - return ret; - } - - return 0; -} - -static int do_smhload(struct cmd_tbl *cmdtp, int flag, int argc, - char *const argv[]) -{ - if (argc == 3 || argc == 4) { - ulong load_addr; - ulong size = 0; - int ret; - char size_str[64]; - - load_addr = hextoul(argv[2], NULL); - if (!load_addr) - return -1; - - 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(size_str, "0x%08lx", size); - env_set(argv[3], size_str); - } - } else { - return CMD_RET_USAGE; - } - return 0; -} - -U_BOOT_CMD(smhload, 4, 0, do_smhload, "load a file using semihosting", - " 0x
[end var]\n" - " - load a semihosted file to the address specified\n" - " if the optional [end var] is specified, the end\n" - " address of the file will be stored in this environment\n" - " variable.\n"); diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index eb1f7a78d3..8badeed577 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -170,20 +170,20 @@ */ #define BOOTENV_DEV_SMH(devtypeu, devtypel, instance) \ "bootcmd_smh= " \ - "if smhload ${boot_name} ${boot_addr_r}; then" \ + "if load hostfs ${boot_addr_r} ${boot_name}; then" \ " setenv bootargs;" \ " abootimg addr ${boot_addr_r};" \ " abootimg get dtb --index=0 fdt_addr_r;" \ " bootm ${boot_addr_r} ${boot_addr_r} ${fdt_addr_r};" \ "else" \ - " if smhload ${kernel_name} ${kernel_addr_r}; then" \ + " if load hostfs ${kernel_addr_r} ${kernel_name}; then" \ " setenv fdt_high 0xffffffffffffffff;" \ " setenv initrd_high 0xffffffffffffffff;" \ - " smhload ${fdtfile} ${fdt_addr_r};" \ - " smhload ${ramdisk_name} ${ramdisk_addr_r} ramdisk_end;" \ + " load hostfs ${fdt_addr_r} ${fdtfile};" \ + " load hostfs ${ramdisk_addr_r} ${ramdisk_name};" \ " fdt addr ${fdt_addr_r};" \ " fdt resize;" \ - " fdt chosen ${ramdisk_addr_r} ${ramdisk_end};" \ + " fdt chosen ${ramdisk_addr_r} ${filesize};" \ " booti $kernel_addr_r - $fdt_addr_r;" \ " fi;" \ "fi\0" -- 2.25.1