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 ABE3BC433EF for ; Fri, 1 Apr 2022 19:06:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BC77784326; Fri, 1 Apr 2022 21:04:57 +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="autT0sTR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 989CE8430A; Fri, 1 Apr 2022 21:04:39 +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 8626084318 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=ZKYCYFR1GCe0XEqod0MbS7+crs20goqx3/zPImzrMKuD8e7IOayvF2s3Uz9Z+tANCYLlVQTs6mYm2AxqIWoK1cu4eMq6b4Ef4vWi3Ydbgqeh9cllFa/EPRYF4gW3s5ekAsaG7oelwyFQsYY7JWIxOhkjkTbvRSfwBkhmwQifHR5qwz3U9V/l0zCaJOiBeOR32ufNyfD/GuPxpccK+jbIl2UUgHiv99gRi+SlJqFoFwePC/jmrDix+xApiKkRRPxIV2NmJrpuN9yzW5UTv1KRlcd0HrpsgUJNBqXaCW3xRdzlrYJnRVSH6+Tesntgpk9UQS++fsZA4bfZenDb/YE1lw== 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=Bm4J6kXCnOOhYPwtLLB+XVsRtN3UR+rKIgv9oXzBj5U=; b=Au+XM1FX0dFY8AwHIx1pHtKUTU1N1OUrkv1ENTZ6ZSpgWleZUAuWqRhxeo0aNMGMtIs0tXU6LObVGQIMmpqfexyGOVp8zJTyDAwBjQDr5Vf3gsEL8irYttioFtBE4EhijsEDqPWrN7WdO2REgCyO3Exe0PM5V7HsxyUsMWFfS/KH0dk4uMig56Cr5SgJZtWVmmROfs6y9fC5d/JXLo7IfdBWEG/17s95hEd2gLYOhGpiunQDXFc4mCiOfPTnqlUBLzNOT/GtofWvdkyFuLKsGO9TFx48l2NRmOo+ASmk18vcKnPQvbhuRrrY+b59/ZuQsBIFMqALAkShIA2lhhrODA== 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=Bm4J6kXCnOOhYPwtLLB+XVsRtN3UR+rKIgv9oXzBj5U=; b=autT0sTRep+FHvULT/EypzQT30dVFM+QX5igpxjhCIXc91BMyqIzprrcLMZDo0YIqRIOFANgVxHSWmUMtAaapGndirsm+XwdQ+obVgBhpUd4eRhfNRrsBCpGEyJNzem6KQeRI2+lPEgqRYESIS+jzQmBY5dkd35A9pgdjWf4xlfD66vh/J3YhAawJtgtWuUc6jV0rGJ2gE04W9cFa23sqJ99i7+v600G9eaLz1nyqt0ltmgsPQz32O8ZTYU4EUqMSZpNmZoN1k/QDFAj6Fiq51gHdqw5GvwXF7GdYcjq4Kwx6imZOqdsxBWSbdu3aE9LuRqDVOLz32R8an1PyKCy2Q== 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:29 +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:29 +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 7/7] spl: Convert spi to spl_load Date: Fri, 1 Apr 2022 15:04:05 -0400 Message-Id: <20220401190405.1932697-8-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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: ce8c16c0-11e4-468b-ca6c-08da14127278 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: Q7dPiwpydKNLwPdCvhoL0UscuYYn/UcW1266Mf4dcTyzmwUP1bNcNd3JUhAgcxQ8DZrt0/wxhNA+0CDXW+WRsiAe+NBvGQQteWKNvFMrTkTw1qwmfJk3fuQqsXDdAxXUHyeCexYiYCNF1g5EnJFni6BwOzZ+TpCbPr41Y4K70+gH8wQTePwTKgBMpy7qWgCrIcC/3wWcrYotZCF+0h0oKwdumajLACQrCnu02UqC552YtHV3cFjLXwJF3BUbKKeiJ0/q5yZJUKS/r51ZsrxGa5rVLveiB6mIxToHaizFJ2BILML3giCp813Wo4IL20JWQVsOEi0RvYblGWaeY1jWvJStX3P2R/5E1ObZg1OkfJDozTZXNDkrTA9Bw8cfeUJdT/xWlfSlCiaEt45fnbcmsVaj6D3VbBoarAsX+0vLYSIoDb0bQrttI6PqQhrLNgFmLuRAWfEUrJ38AVmnAPyKAxXcaJ4TtnRDn7veO/kI68K7uRy0q/yyM/g19R+DtCRJv6aOHPYWApmq9YIefUyhO98CNsRYrPAQA+dZ+/oObg/c5eiR5etAP7KsNWyQFIBbR31PUdiNPAIRFIeEd/FKKw3eobZng0DVbyz5Q8hgL74K+B0ZkSf8PSCyD/14nFgmy0jyY1fDa2XkOaRh53YdGmBdPMv4e8a8lQ5sbIJWaWAHBsq/FktrOGMnwMJ69WG0IzTVU4Fs9/4+SVefuO6ZGA== 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: =?utf-8?B?eHN3STJEQjRrcG9lYUtBMjhUTC9EUUdzc2YwWUtQRm1weTBjejlzcFltaGtO?= =?utf-8?B?amV6UW05NXl3RjlXTE1JeXJob1UxTmpneVUwaFM5NktrNUN0eXFPdkV2bTJl?= =?utf-8?B?MXVjbzlUckFzL1JWeXR3c0ZUVy9RVkhQVlhQcE5zaE5JQkY4VVFPYzl2c3lD?= =?utf-8?B?RHdXMWZDMjFOc01NRDBuQXJnTzI2WHZjbmFDdVdUMW9OempCbnRPeU41cE8v?= =?utf-8?B?SFZJN2lnVlpMU0dCVzVSbEgvSHJtZDBheHhqL00rK2pPTEszM3ZhbjVwOE9p?= =?utf-8?B?c1p3MFJYNmxueW1vNzdwbWkwaXlaS3hYQko2VEsyNXpucDJXRU5uSDJDQm1Y?= =?utf-8?B?N0thWFBNR1dVaFNMRXU0VHpLa29PMVdMR0REWlM2QVhmaEpFN1RocHJCVlky?= =?utf-8?B?ajFRZ2xyMzVXcDJza1JDNzEwNHBab0tsQ09xbjZtYjF2YTNzVEFLdGVBdFRq?= =?utf-8?B?aHc0V2lqaEVGckVVS2Q2bCtUUURUL2dob3Rqb0I0VVhyMTQrYzVWUFVDVkpC?= =?utf-8?B?dFg0YndjUkFBem95NmFpZU5SQ0s4bTQ1d2lGeWdlZFR6QVBxWGtrb0VWWnIx?= =?utf-8?B?OFB1bWFwQ1Z4VXdINnBEdDFLdVFNRGdvbnZpaEowaUpwMGUvaG9hZFQ4NWZx?= =?utf-8?B?V05GRkhhSkJMeVdlK3Y5RXdsaDVienJHOHd4YXVGR1BkbGhjSXAvakdpQXlW?= =?utf-8?B?bE9RME5MVHZPdWgvMzZNSWE5akVIYjB0czR4MHYySDJhMU9ubUQrck1Sa3JQ?= =?utf-8?B?MXZtOUQxMXlYNkJOR0ZwME4xYzdHSUNNZ3R3WUF4S1BacHVibmhLTk4zRzRk?= =?utf-8?B?VmpaeXJrejdOakhWNmgzSXFxZFBPZS81a2ViaWVRSFpUSmx5R0lHU2QwaWl3?= =?utf-8?B?UXc3eUVhcUpBd0xTT3lkelc4elczOEdCRy9BbHdXUEFZdzRQU3o0RTAzNkht?= =?utf-8?B?VmdVUzB5VS9NVWdoOTh1VXNsUEZQbWdQdDRncDRpWTZDbWM4VklaZVF6TmVY?= =?utf-8?B?YWY2ZTJyNndYNEk4VzR6QTdiODNuTUdoNVdpWjRmeEZjWkFHTHFNSVM2S3lO?= =?utf-8?B?SFh5M09UczZka2hsWUZObEpTa2x1WE5kSGEyZTV0SSt1SzhaL3ZiNnJMT2hk?= =?utf-8?B?U2JqOTEySENNVk52U3FWNDJqYXVucEs0UHpUV01zaXBNRzl2OTBFMWtSbXE1?= =?utf-8?B?UGlGVDRxcXlWVkE5cjJYVThKRnI3aHN6SnFtRlhiT1IxbWpYL3p6c1diRFJ4?= =?utf-8?B?ZVhGeGJyNnJMdTN1MTlCU25TZW52bVFnUG9hRU1BaGdDMWM0MEM0bHkyYXAv?= =?utf-8?B?VEhHUGlKeFduM3ZNNEtrdVJVWm1UZ2R6THZKTm1ndEVKdi9BdHpSMTdaZkZu?= =?utf-8?B?OWZLQnZpSmJCeldiTmd0eTRZOTM3SFpIWlNEUXBsTXdqZWhKVlMwT0pFRWRx?= =?utf-8?B?R2ttcUNoUWlRRU40T25EVS92UUduNmlLd1hZSmw3SmJHNDl2N2krMnNnU1dC?= =?utf-8?B?Q295QXFEdUlzdXdFZU1uTHllTEcyTGVacVlpZG5qWVF2eFF6VFdNR2VHenhk?= =?utf-8?B?VjByajV6OGtJMjE3WDhlaWdmd3pKOXhCRDlFY0Z4ZWxUL2hkczBUVDhHNmUz?= =?utf-8?B?eEpjbnl0QmRhK0F4Y1ZEOVdKMjZ4V21kRkxiRHZna2pUVWtPaXhqbG5GQStu?= =?utf-8?B?QUxTSTNZMlBPVTVFdjNVbS9uUVFRbUdpNmxSZnhuZkp5U0daNlZJZ1NSRWV6?= =?utf-8?B?c3g4QVlocVpHUWE4cXdoYVlWa2ZPVS90T1NrTDlnSHYweG1HWElNWlA0YzVY?= =?utf-8?B?QXZrWlFCUWVIb0EvSTM5aVFianBGOUNFazEweVpzMWZnRUYwY1laTzNqTzE3?= =?utf-8?B?aFpnWWU1d3VKUFZJb2NoTkprSnZCdGR4elA2MFFWcUV2TGtZV29TenR0Y1ZK?= =?utf-8?B?R2JWYytONW9YZkdoa0xsamUyR0llSmxvWlpBLzI4WnJzb3VnTzU2cjIrazNj?= =?utf-8?B?SlUyOXBMR0lYdkVkTlBFS09GVEtqR2EydFpSSzdXUExPdE1UNmZUQmY0L3J6?= =?utf-8?B?YlJUOHp0QTI2d3pQYkZjTHE3YmVhemliU3BRc3licjJQeXc3ME1oUmFtM0pT?= =?utf-8?B?dzd4ZmVIUDd5bmlnSkhGZEZtMlpuQWVwZHRUaWZoZkVNTUlSOXhLd1EyVHc3?= =?utf-8?B?QVdUa0lFZmRkcC9ZYXBZb2JFejJwbmFsczV3NFhEQ3JkN1R5SnRVTzdQT3JP?= =?utf-8?B?aXp6N2xhWjZXRmlFMzY2a09TNFpPNWNDcEY2TStGRFROS1M0bUJIQ1ZveVZn?= =?utf-8?B?VEhQTEduSFJJVVdyUWMxcVE1NmVwQi80TzliVWhmY21yZ2JoL25tSklqRzJm?= =?utf-8?Q?rQP2XWO6MuWO76iw=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce8c16c0-11e4-468b-ca6c-08da14127278 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:28.9925 (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: +cBso0AYk6MJM4ESHxU4rCpJ5aqPPAvq1iBmivQ1crFvGAi5FI5CmA/oVHIlGqlCdl81JSnE9w6av8o1+Qi61A== 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 spi load method to use spl_load. As a consequence, it also adds support for LOAD_FIT_FULL. Signed-off-by: Sean Anderson --- common/spl/spl_spi.c | 48 +++++++------------------------------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index cf3f7ef4c0..037db1a19f 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -83,6 +83,10 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, unsigned int payload_offs; struct spi_flash *flash; struct image_header *header; + struct spl_load_info load = { + .bl_len = 1, + .read = spl_spi_fit_read, + }; /* * Load U-Boot image from SPI flash into RAM @@ -99,6 +103,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, return -ENODEV; } + load.dev = flash; payload_offs = spl_spi_get_uboot_offs(flash); header = spl_get_load_buffer(-sizeof(*header), sizeof(*header)); @@ -121,47 +126,8 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, return err; } - if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL) && - image_get_magic(header) == FDT_MAGIC) { - err = spi_flash_read(flash, payload_offs, - roundup(fdt_totalsize(header), 4), - (void *)CONFIG_SYS_LOAD_ADDR); - if (err) - return err; - err = spl_parse_image_header(spl_image, bootdev, - (struct image_header *)CONFIG_SYS_LOAD_ADDR); - } else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && - image_get_magic(header) == FDT_MAGIC) { - struct spl_load_info load; - - debug("Found FIT\n"); - load.dev = flash; - load.priv = NULL; - load.filename = NULL; - load.bl_len = 1; - load.read = spl_spi_fit_read; - err = spl_load_simple_fit(spl_image, &load, - payload_offs, - header); - } else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) { - struct spl_load_info load; - - load.dev = flash; - load.priv = NULL; - load.filename = NULL; - load.bl_len = 1; - load.read = spl_spi_fit_read; - - err = spl_load_imx_container(spl_image, &load, - payload_offs); - } else { - err = spl_parse_image_header(spl_image, bootdev, header); - if (err) - return err; - err = spi_flash_read(flash, payload_offs + spl_image->offset, - spl_image->size, - (void *)spl_image->load_addr); - } + err = spl_load(spl_image, bootdev, &load, header, 0, + payload_offs); } return err; -- 2.35.1.1320.gc452695387.dirty