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 C3F81C433F5 for ; Fri, 1 Apr 2022 19:06:02 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 269CA84337; Fri, 1 Apr 2022 21:04:54 +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="XN+B/yyx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3361284318; Fri, 1 Apr 2022 21:04:40 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0629.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::629]) (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 4750784307 for ; Fri, 1 Apr 2022 21:04:30 +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=MH0OlLzcj0qxXftIzrA3AhLJnQR4mPG7jMhkI/DGXoiNUdR7HrLn7b8DHoPWK3wk1Vix12lAHuBLOluFEnvKsecrzMEyl6Y6HPrxTz2+p8Uu5RjXewBGYKqQlKOOZwYdakFaTR2ReHvaDmuN2PbO/QFEUIhLAr+6Rle6ZbzYhYwzHaLTK+oCUTQ/CrwRNswiuajfVCXfi8OR1pKGm/RfXEwlM64OvBVVJVH+C4PnoTfa4ACrZGruC9sG6JanNQ/qhhw2OlyoUYcRErPJUiQZmlrVRU5jkKszQY28bwDCCgGs2aWU1mF37pfLN7Kov9/IWP11NU1ZKpYmFx+bi8rcWw== 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=OJUPyhKMmLS6AiQOD2KeIpORvwxFN2Thkfkv3IG58AU=; b=K2XDve7aeLKWXl6uEYiJx2PAxTQtFcGwgGnwCe7IMUBLGQbusxHSrzW/OCs4wnWyfFIiVieuqSBJTALdyr8AkkoSpCAtmpw0mY/IAzCoO8CRznUlWAz4rrRdhZjnz8Ofw/jJ1LYl+if5bUpSd56FThhoiGsgdYMoO+kLSXy/y5NWXbjVICpmqed/pG2NxtznDaiFL3z2w5n3VH0iyhezXiRdrxHRg/vVh3tbf4ZzaG3A4vO8EUroF/0/h/B160Vrw2QOTu+3PqNL+NkGIh5DVHX74ZBLkC7hM2+UIWDoATz7p6QkeEfWI2tF1TabA3STX06hp4VRIk489LN0uNlfqw== 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=OJUPyhKMmLS6AiQOD2KeIpORvwxFN2Thkfkv3IG58AU=; b=XN+B/yyxNnSWTAp88uXnCKTE9TqRz3JDW+GYKBm7wJF6hzsMnIAOg/gKuLj2jKRB25Ty2LoN7MUFeRValgzWvKVbTOObcP+fM6erHTas2izBK9m7QTpRx5lAfVffdr1BNzSlZcC/2/GSz2fwn0CLWXmvRI2h5TT9wSDKSQLw9++h/GYUIjW/pDwQn6PisCyAiPTBg2N/EwESyt+GVdWa4FGK3i2yiB52XBleK3ueCuk+O6fMjjOHgqhdbqadwgz8J48nzCzYQ6/v9t7RacrsTcQfzqIxRqzWev28YJFI7+prgx7kYWpASSrr3aEefmTJu/8MFp4HxQY0VYDyjNLf4A== 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 VI1PR03MB6463.eurprd03.prod.outlook.com (2603:10a6:800:193::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.21; Fri, 1 Apr 2022 19:04:26 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::356c:789f:d20f:92bc]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::356c:789f:d20f:92bc%7]) with mapi id 15.20.5123.025; Fri, 1 Apr 2022 19:04:26 +0000 From: Sean Anderson To: Simon Glass Cc: =?UTF-8?q?Marek=20Beh=C3=BAn?= , u-boot@lists.denx.de, Stefan Roese , Marek Vasut , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Sean Anderson Subject: [RFC PATCH 5/7] spl: Convert net to spl_load Date: Fri, 1 Apr 2022 15:04:03 -0400 Message-Id: <20220401190405.1932697-6-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220401190405.1932697-1-sean.anderson@seco.com> References: <20220401190405.1932697-1-sean.anderson@seco.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MN2PR13CA0001.namprd13.prod.outlook.com (2603:10b6:208:160::14) 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: 96fd61bd-4c53-494e-a6bf-08da14127109 X-MS-TrafficTypeDiagnostic: VI1PR03MB6463: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: X5HjNBoT97/AgHd5194msqkvi4zB7yWvNuOA+MQGxNTBY3v75Zy8ioJdsMEZB55jIHBRAl2J53jOMRE3hyWU3IDh+cMZdqRAH6osU1eJmoI7Ao8T7aVOuEpc/2BZTvlyXu8hSoqtigI7Qs4ot4qRmknbhqaBZiSkeu/uACegs4NU9Wtt5LCMHpdU84D2LVm+0ej+mxYIRUb64qMhUH/w3P5hVAgNXaNr5SvgW5ajoauDuoDUPbPl2xdljpAn10Sc2VRgg/maBKkCpuqHPnF41nobFGNeyLKhl19B4qLva+SZgABvg1yvLy7Iu9uM3vF9yKmAU+N2NYHptqXTWtuwEJp8RedMfVAAgfnRVgSA0+ZSBPHI5RTzr5kzSlJW0+BFiBnnRhZ4/mzBwXiNz+hB8XObTie3nxEzn5o8et/PKD7YLTrIwKY1WLgwL5g9xfl9OOkxi8857HTq+trWCdvqWLlE43kM1i6jGwMxrS+6X2KG8TGUjO0C8CcOQTsHnba/x4m6dAVyNd0Q+ENvUITA8eiGa5E637XsKH8bRMNINn1c1nPp0V8r8oBHD7vEXmDCMGd5d+Z4woMUaltpEFMAnfiFKVizrbEvVuLXIb3z3n2SjUpsCrdde0IeMYUqTkvdbKHzWXC1kW2+nILYklvd75wgQ/D+OcX31kGlMGY9P5+MSIdl/9pnCrVRxUiVSqWbubZSyCP3MXvCe9LjipDepA== 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)(54906003)(6486002)(6666004)(8676002)(316002)(66946007)(6506007)(6916009)(66556008)(38350700002)(86362001)(83380400001)(66476007)(508600001)(38100700002)(6512007)(8936002)(52116002)(2616005)(4326008)(186003)(26005)(107886003)(44832011)(1076003)(5660300002)(36756003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GhXz9PXM1IINFW1CEBMxhPW9CcHNePq3IZu0NghbnAl7qneB+7UGDTRumILl?= =?us-ascii?Q?cpGRwS6jMlIw5slQxSAZhnXp0g6lrlXViRMXHMeNkTKlCaVC1uaJP2TP/tJD?= =?us-ascii?Q?FNErMfRgBruulC7Jr0vQWTNSGANok+P8VvGZxPrOmA27vBTg7TqDjhIBiL6z?= =?us-ascii?Q?tnhGTgCdpvW6Jsnr6NFty06d7BXLIJhQGVZY1jX4CvznsuvYTo4ncrlFpDg9?= =?us-ascii?Q?SOMUYXqm4JBUoXJJOKqe5hXgrcilzN8tc0jSUWazthCFZyZ/JYTtDWAgCi/F?= =?us-ascii?Q?BxSNR4UWJaB+BOU0OreXf7vhjKQi1goU0rDXiLKpmsrGwIFeN9yjQXG99eGg?= =?us-ascii?Q?OBs7aFmu/C9u5YRX78/vUgAffL/RbNppEbERnbcAbtiEnGGwrHT6zK7/a1Oi?= =?us-ascii?Q?jbCd6Boca0ENBT+UzcOYv0DEL1kbg/WixZ2pbyyp+hRPDjJTlJ3PxbVliZH+?= =?us-ascii?Q?AVLM5SYAd3UdBgYlw5Sx86ntVIiZ0CtZImR+b8GeFm1hxAEwDxHCOvtgJWLB?= =?us-ascii?Q?l6cBbIF89P7HnZxEYVP97ifbJZZedtT3FEuhIwOCg7kdBzrbWOVi3aSyepLm?= =?us-ascii?Q?r89UMPtXl90cxV8yKuzn+L/Y327Ojd65GrrZW5VfeNTRA6/obollgzWdfC+W?= =?us-ascii?Q?wofFdp3Bjm/zVAp3VQJxy8KmcsV5LgfrCORPGe9N3bWdDaB5lYG2kU1Djplk?= =?us-ascii?Q?Acv3wVES5rhlIOU+9U4dOFkON3m+/Svne44pVEIFY6cOrdjp5MjWPHSAJqrf?= =?us-ascii?Q?+vFMh9wQ7jbKYoqZT1CWRvTV2a8AM652xrqDXaddhZBrLN9uRYOMIsHCWrod?= =?us-ascii?Q?+BlDOl24EsOSsRLzJHE5yXXprXz2ZBxmEcHoW2cSRTLPi9cW4xgZbbJK8Txi?= =?us-ascii?Q?pYmODUBeuOzRe5IVK0K/SW3kt0F8ZXzORUp8aqu5pq5ojC0ksdrv39IwqKDy?= =?us-ascii?Q?nMpRp6IHXmmP3jae2XA0CAUdkTGDKyHkt7pTnkdfAT8ghUA+k9aHdGoizB3l?= =?us-ascii?Q?BBwVbUYG4VNqkThTkSRZ7ynOB5csaTtQiRFyl5GYKwhslrC70+N/SOs/FcZu?= =?us-ascii?Q?RGYwMNqGNEOe9dPQGDixqvHaMVAl4dhtPdczqFTBmHtgtOUvhc8S8V+4vXfJ?= =?us-ascii?Q?oQwz/14KK4KEttCo7AHol8yhn4StTAfWGDL+9hV+MY/gm7VMpYO4TDLjnZd9?= =?us-ascii?Q?205z9+mhakRINVKruzTRHj+OuA1l6j3Q1vr37aw+uypgEGcMFb2x1BTWpwTz?= =?us-ascii?Q?anozV07aIfrDt1YjCF4Sb+OZ3RprDeO9aVuLHFodwWcMvfaoe4MPt52SqN78?= =?us-ascii?Q?ZZf8IKVGOpjjYCWp7lPQ2MsNam7akOF8321NI4vQ/75jpOo5gieZQZG33e5p?= =?us-ascii?Q?S4QXMd+U+GAeYY/j53rgYqya0Iigsm/jDctHlybvapHrxu4MV1cDg2SnsMGv?= =?us-ascii?Q?Vn7Bb7qvz0DHwVwxmH8XsyaKzegWsDzoXy15XEQJlBd0wRPMt1Yv+BCk7QW/?= =?us-ascii?Q?cMC/ANNC5LFtgwDR89EJ1Hz+I2pMTv82jwSoKzr/WndBAPn+Fv7nTygiri+1?= =?us-ascii?Q?DlNxf8K8E3PJepfgda7GI1ECkyfeG0oVHnmBDHx2XZcIyCM5eUsCSv6L4XCT?= =?us-ascii?Q?nekVlpzeAig8cQhvGzONVjB9vYLXa/2xK3HiSs24hnSYmQ0o+uLjk5nahfKg?= =?us-ascii?Q?V3OoJh56vbijj3Y3AerSMP/+mMY20MLgTj+H7qeM/MxdABJz3VsHBIN4cW3W?= =?us-ascii?Q?cvvjsoyYdzsWqwPM/iqhveGxRSMzZNc=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96fd61bd-4c53-494e-a6bf-08da14127109 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2022 19:04:26.5864 (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: 1/wKHgVI0EFLMPvpmcbVBwUNyBh8NZCVEAY//bwyTFoJDcdsss1xoiWfBBCnoGoYjkKfO2XeNlivxif6c9SXmw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR03MB6463 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 --- 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 -- 2.35.1.1320.gc452695387.dirty