From patchwork Fri Apr 22 18:27: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: 1621092 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=PXR728p7; 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 4KlNGj2FBYz9s0r for ; Sat, 23 Apr 2022 04:29:17 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7B0EB83E3A; Fri, 22 Apr 2022 20:28:45 +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="PXR728p7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D24FE8189D; Fri, 22 Apr 2022 20:28:18 +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 autolearn=unavailable autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::60e]) (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 B994783DE7 for ; Fri, 22 Apr 2022 20:28:06 +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=EsfJDTB+aCNZMiVhDvEPfE4Sm2O8OD1iuQIyK0E8/RFXr1VQtIjRkqZg4D9RWQkClN7vf49BT69eHp/qVcSmLnE95/b1CgOeve5bZItKynBgWvDof/AXXTUYxwHGf1z+/1vi966RGLTycoFDbRimpAE/HJEqaIacu1nObcScuQte7OiOHTkZQZCcNvQMeQvsFFbjgztBYEMHUwi0LEP4RZPKep7+fJiSlmXhk2Rj4SS6o9QsrTikSxq6k9th2wUtegvjdvR90s/wCxcUKXinCF3OLBOISfJB2autEt8kfN7ZCmQnJNUiFpAQmDpi5bMnGcYC9gM9EZRFH2/BVXu94g== 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=FsMSvck2DKFBlDDze6KMFN67Deb1rfERr+t8wIHoSsw=; b=KgltmKwsapDkBuU9rpFCet21h8ZFPl92zw8RNd9X7JOkUdbp1ssSsHbIMrylfBG0/AV3469nS/2z435EF6dRQ9yVLAEiXFyqDez/iixxaWY+VoZm2ttlhmMVUEfzPdFNWulwceXWXPYca8mjz33eLx3spF/TXQm6XkW96A/jn1iwZLXXSogiN4/pCn3f1soyzHgKjw1YPcaJIBHlqPPZo7o6iZg7moGZioIuEm84sBkWrBOaspDONo9mJzf03NAEfiQxdO2DMY4bYZS0CTws3kaN8ybRXvYF1hTklRbPWZ2yNaaMENKOPBEbO3ihNg6O7jG+W6dLjyMnvdHDjIx6bg== 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=FsMSvck2DKFBlDDze6KMFN67Deb1rfERr+t8wIHoSsw=; b=PXR728p7yQQqCgXAwzx9umBcoVZsfZOiWY+3Plvr/ptIWGW/z8ER0xNZylagz+zv10LUq+gVMqxCDEPmWml8pyK78GH/quE3qnyoMaaTZL86KOCtJ0unRV9UtkmaTr6pS5PoLsesCyS0P0qvBqCOz7NzLCki0oS4AnvHPDupbVhaHHVQhRP9mZZt2+YuoubUjvfIh554hTWylpgow/eR5l6DuWwHKvdq8d6zI49YaceEE8dF32TWaAGGJ9W/azKg6YG++HTzZy9Mt+Kg+xxvsicS+/TYPbWPMLSJJ+Uee0eB3qdc/5ZH4sYxOy6D6R4X3N8WsR5SuFSIYP3NKPxVPQ== 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 DBBPR03MB5462.eurprd03.prod.outlook.com (2603:10a6:10:f6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Fri, 22 Apr 2022 18:28:05 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::714d:2b6:a995:51bd]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::714d:2b6:a995:51bd%4]) with mapi id 15.20.5186.015; Fri, 22 Apr 2022 18:28:05 +0000 From: Sean Anderson To: Simon Glass Cc: =?utf-8?q?Pali_Roh=C3=A1r?= , =?utf-8?q?Marek_Beh=C3=BA?= =?utf-8?q?n?= , u-boot@lists.denx.de, Stefan Roese , Marek Vasut , Sean Anderson Subject: [PATCH v2 5/9] spl: Convert net to spl_load Date: Fri, 22 Apr 2022 14:27:43 -0400 Message-Id: <20220422182748.2309992-6-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220422182748.2309992-1-sean.anderson@seco.com> References: <20220422182748.2309992-1-sean.anderson@seco.com> X-ClientProxiedBy: BL1P223CA0005.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:2c4::10) 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: d5a2a9f3-9087-4ade-cf0d-08da248dd78c X-MS-TrafficTypeDiagnostic: DBBPR03MB5462: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: 1tTtYaPBBx2ePwxqnx9afGcM7F55ca0yJ+zUtOlQaPrPrZDFiWp5Dl3UCrCVdGgqnmm2vUyZt4Bsmrd/RIkllzwIZ6WOlOeAoDCPEEYZeymiFnemahHQmQfnlBeByfdacTS9WB/8k1JWdphxOBOyerHXKLhLvQOzvinGci8q7k6FgCXfYeVBd7fb4XwB/i34cNUbX6Q6PAD7bZEuT7cioa6+FnRZxouhFZsUBhGfLpBcff+V+VJU2tEvnGWmYwVOS77M4pHHhfpK247rgko6RAJ370TLhmY+t497McOqr3T9DWEKdvUHAU3WTHEzrlc6CenW60APZ/srX96jEXyptcr/JoIyNZY4gjmqLwas2RgOvMU2i2GDC9SjCWkHmFCvnHl/FHH+g7Re9bv/FhUzjPkzGCiwoPNcY5zw3WgjiEK9fFmVE2Jqcg7NPshry1ybUhKhaD19OC4omjHB2+o+f/0/nve2aG8BZXkU3OjmhowprVTR1EPVi8DC/kKkUP93SS6t8CvqOqURM0aLU4n4w8lcVW3MXewSbuP8bgqS8CIdpPgdm2xWvd8GodWG+MxvX+TaMzbNPJxN22WBvQFHKrzJyekZ1bhLoq9xLBPZ8RgDEtj8Ien2rhvWkwBlveT+YaueDxjO46X+IYyPeLW6v7bgbgwyH2OMOmcWlQNTylma8fMmWFwkJ/x4DxKFGMc9hoq6K0AlgR11rwLMi/B/LA== 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)(508600001)(52116002)(107886003)(2906002)(38350700002)(38100700002)(316002)(36756003)(54906003)(6916009)(66476007)(66556008)(66946007)(44832011)(6666004)(6512007)(6506007)(6486002)(5660300002)(4326008)(86362001)(8936002)(8676002)(83380400001)(186003)(26005)(2616005)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kFMFz0tTUzacbUB9xidO+LRfyJgpTnjoJafzMnPekHAe9JL0fnH3v70vXQ1wucVfbWUJA6TsbovsEjjVsjJZaBLmumjai/CrOc8DkG8NRygjZFInwWhMrU2UB3y4rXFtb9ancn2RqWjDsM1siKNx1Uq6xVV94fcMxUQLM5xSLoER+ZoFSfyBwROeygJqC0SHuYYAut3IsxzT3Nx0/TzJwbDWGvvsGSZflJv4P1tjZHM/+VwZ4hBMQIvZv2C8URS8KOe9URUkWaR6GMQOTFeYiNloEpOObVB0hgxWixAXWAfwEjXHkEcr4u5xfAa4wGe/pM+J83cwszUSy4TCYwfREF/G+n5P2ZcRfW83xMzfgMVnQ3udt7zbAQLIdDwOpBtZmcAJhHAr8x1RB0kODuuSbhXbWJYi4SLj+VcVUlQSnfcjrWk4x8XgO264y4VdlB52BSnrhhuowP2cdXqtPoKxXw7mPxm/akSeLFlD3y2IHSeS5WZTmEHMeVA8Zd7g8zNwM2YdaINgIHs+c0k1B7hHBopGcjXp8U5kx2umXozwGU/Q51KNUmxEjgyIwXbJGrTDP+mQN00TZPO5+Qe4Emf6EZK8K4LL00mJiIbDMYPQc0aJQ7DsR7LGnKxttuDqZCzyS9ATV/AtSbu4EbNXNDTvl6eRSV+21tSS1SA89Bx50RxwkQ05WW+NuKalTg/JKaoHVcq4n+B2p1rXi8CAlVQZFSsT3Neo+tM/GP2K7e4K2NuLqhP2qxDxoTIHiCn2RzvIwXjSzYB1XdOOP7UkZxKij8PrrPRYrw9GPxtsJjeyNU6yNEj+ZbVwVxjxdT4IBdgQN3iLXkrHcfkQepERz+FHn09e2FEhgEzKPaHbGYpZs/ATXM12ccHG+GAEHQjyizuV2/hjqY0vRgYtfj81nTLbxgd17eQLRog31L3f9UgmZOXl52AS4eFt5tsZNGNgbL/H89SwvBMFR7A9CvM33AasMsrQ4I9ChMyn03K9MEzGZN/1umpzvohm8JOsu9FKTByj0peqnhsOYb18G94UG2zMo/eOtQAYvdbmGUuMUpJ5qP3dHqtyt3zPwHJLAWs6MCy0cnPY2tXDP3JiqOgJgvTPE+LmNbWYGT4FvuLUXi5EkAMVAJWY75EQ4DsWKwXMQVA2QZ87PTevv3DZhRXKC/vIoY1mPwQWSknBSrnOHkg83Z+aiZcDOn/inzzZodPqOH7vdSRigztsP1ypmydRb4YyZp5wM/ucMKExNoFq8Smg99qe5+F+8bazTKQ40wu9zkCzOoNY2CDdil8Nwwad3jGuwBoA++QzbkOcNUwuqUYWf3q7LqaeOxl0c7Q+D/8L73AHgbh2nXg4ZJp/p0i47AqZIY0rXecHiL27gvN82mG85Lzd7add5GD8PdoiIuFpF93FSkBRJx+OLBpCpiazYdHlM4LBIyK8NAHmrwK6iz/VkbzkAZGhhhZPEU7ruUC288fziaEDEE2WvGJRkeCRYNQ2KLIyBdCB7GyBDrcN/cqWylEOwx3knwO6bAU3/3zyTevERcLYOp9W4WW3qLdjJurLhMzB+h+ouoOIQFRmRQm+79O68H9UbiPDgt3qVxsqWkMO21w0+IHI2UrgedtCpqzHlIJHcYHJBiNCb63ZXv/Z4k5FYipd6LiN+4mo6PxSFpotqI9fgEJkDpINna2W/CDVgaopywvdmRuYKq004UcTNBZl8XDCZB4M0ZNOCy7mqsllTEgGzw3cKEyLb30yI6q5LwXXrJFuLYYF3aFi82JSCAM= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: d5a2a9f3-9087-4ade-cf0d-08da248dd78c X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 18:28:05.3852 (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: ZX48807yl3OUOeDHIxpnoeUTGbdx9oNJb82LDOZ8udpq5A0tmQC1ONQq/rDOY0hPZiFMnr/BLUR2JQ/96AjImA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB5462 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 converts the net load method to use spl_load. As a result, it also adds support for LOAD_FIT_FULL and IMX images. Signed-off-by: Sean Anderson Reviewed-by: Stefan Roese --- (no changes since v1) common/spl/spl_net.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index a853e6aead..3b4374add6 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -29,6 +29,10 @@ static int spl_net_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { struct image_header *header = (struct image_header *)image_load_addr; + struct spl_load_info load = { + .bl_len = 1, + .read = spl_net_load_read, + }; int rv; env_init(); @@ -47,25 +51,7 @@ static int spl_net_load_image(struct spl_image_info *spl_image, return rv; } - if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && - image_get_magic(header) == FDT_MAGIC) { - struct spl_load_info load; - - debug("Found FIT\n"); - load.bl_len = 1; - load.read = spl_net_load_read; - rv = spl_load_simple_fit(spl_image, &load, 0, header); - } else { - debug("Legacy image\n"); - - rv = spl_parse_image_header(spl_image, bootdev, header); - if (rv) - return rv; - - memcpy((void *)spl_image->load_addr, header, spl_image->size); - } - - return rv; + return spl_load(spl_image, bootdev, &load, header, 0, 0); } #endif