Message ID | 20220225145754.30217-10-philippe.reynes@softathome.com |
---|---|
State | Changes Requested |
Delegated to: | Simon Glass |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=softathome1.onmicrosoft.com header.i=@softathome1.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-softathome1-onmicrosoft-com header.b=IHn8/LcG; 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=<UNKNOWN>) 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 4K4tGz18mbz9sFs for <incoming@patchwork.ozlabs.org>; Sat, 26 Feb 2022 01:59:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C5E9583D00; Fri, 25 Feb 2022 15:58:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=softathome.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=softathome1.onmicrosoft.com header.i=@softathome1.onmicrosoft.com header.b="IHn8/LcG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 50B9883A66; Fri, 25 Feb 2022 15:58:15 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from FRA01-MR2-obe.outbound.protection.outlook.com (mail-mr2fra01on0628.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e19::628]) (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 0A71283B62 for <u-boot@lists.denx.de>; Fri, 25 Feb 2022 15:58:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=softathome.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=philippe.reynes@softathome.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LorbS49o53Az6nZiu1/aVfmZqPK84Cg/CC+o/IHxzGhwEUNCw3YeWi+wrl8wkLQBS0Zruk+geF7sGKO7IkYTdSV2+DJME60kUHKkewkrQOM09UmLAOSGBKnrip9nHBFJOcKP7VGmAzJqiv1dB+yuxfgofL662xprgItQj2hws7Ocay+NgJga5d9F5vluWJfWwxIXIcV969ZhTbAch0jiim1fzcvGnmnOnERNqqmA5p5TorV4NkfPGV72lJ67RnzvR8cwwuToRDvbJV/hNBPgH187G6gZBZ6hv1fQQ+267Uu9KH5v9PBc3r2LulnduS6C60l3NsWQBVBC5mFBqh6YlQ== 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=2pEEYn7nnzZOZl+jy0l51f0ICxwClBxOskAf3YPTKbM=; b=KnX1uZ9siLRchxlD16xIb9RKHJwRUxm1mZHc+klO+CeuSQAOhmDgl/EyK6qYfixp/SOyg34VdwNJJ0QVns/xwPK7KKSNiPPg+fRtITmOVV3VXtp43opWxQaZ9AJYE286z++uH0kdoWmCV8CRTFyo1bxms15FrRGgEJMtmTnfaxLXEUA0Q9aE9M80J6qXF4Mn7NUCY84HBjD5hl4AGmQyYcOj++o9dZ3CcbRZpZzsWiSMm40rtC/91a2jCoqknm4TqBULVDc82jKV3tvA82daJK0k+iVitHOhtE+xORegFBmgr2KIA9Eo/tUqW1FvlFRD35Nct+0XJwmBefNVhNvvOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.6.166.170) smtp.rcpttodomain=chromium.org smtp.mailfrom=softathome.com; dmarc=bestguesspass action=none header.from=softathome.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=softathome1.onmicrosoft.com; s=selector1-softathome1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2pEEYn7nnzZOZl+jy0l51f0ICxwClBxOskAf3YPTKbM=; b=IHn8/LcG/5b3LlM31w46JqcVS0XMeEx3M5eeNA4lhk+OuxljFD2joVCix3x6guQ68WV8SBzTz14CFyOayo+lHlWTFeLvkDT8TnJJ2+tujqXyRNazsQ66T5IRWShYwVumcdP4l8BwVhQLGSvLvAUVg3jAkyRxzxBuWgK4rf3D59BSvrIUN/8rJ6DJ4oiz7YnlVCACk//M7scI47rjvGFKgkkMYz9zhKEXvsR+UQa5q4cyeebHhfQQDqVCa1ste8D4/vbKRPNlrp7pGBUF6ux5Y94izi8OuD9RuDHjq2axc1DtnOuOEMvp3VXprEofk0UV9hTHwK+duAvY9+9WElQRWg== Received: from PR3P193CA0034.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::9) by MR2P264MB0083.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:11::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.25; Fri, 25 Feb 2022 14:57:59 +0000 Received: from PR2FRA01FT011.eop-fra01.prod.protection.outlook.com (2603:10a6:102:51:cafe::ef) by PR3P193CA0034.outlook.office365.com (2603:10a6:102:51::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.21 via Frontend Transport; Fri, 25 Feb 2022 14:57:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.6.166.170) smtp.mailfrom=softathome.com; dkim=none (message not signed) header.d=none;dmarc=bestguesspass action=none header.from=softathome.com; Received-SPF: Pass (protection.outlook.com: domain of softathome.com designates 149.6.166.170 as permitted sender) receiver=protection.outlook.com; client-ip=149.6.166.170; helo=proxy.softathome.com; Received: from proxy.softathome.com (149.6.166.170) by PR2FRA01FT011.mail.protection.outlook.com (10.152.48.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.22 via Frontend Transport; Fri, 25 Feb 2022 14:57:59 +0000 Received: from localhost.localdomain (unknown [192.168.72.32]) by proxy.softathome.com (Postfix) with ESMTPSA id D31EF20070; Fri, 25 Feb 2022 15:57:58 +0100 (CET) From: Philippe Reynes <philippe.reynes@softathome.com> To: sjg@chromium.org, rasmus.villemoes@prevas.dk Cc: u-boot@lists.denx.de, Philippe Reynes <philippe.reynes@softathome.com> Subject: [PATCH v6 09/16] common: spl: fit_ram: allow to use image pre load Date: Fri, 25 Feb 2022 15:57:47 +0100 Message-Id: <20220225145754.30217-10-philippe.reynes@softathome.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220225145754.30217-1-philippe.reynes@softathome.com> References: <20220225145754.30217-1-philippe.reynes@softathome.com> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 0c4bf459-84a9-4467-4357-08d9f86f3699 X-MS-TrafficTypeDiagnostic: MR2P264MB0083:EE_ X-Microsoft-Antispam-PRVS: <MR2P264MB00832542C6DCB2939810B7E8883E9@MR2P264MB0083.FRAP264.PROD.OUTLOOK.COM> X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w7Fk85esMLenoKlAIxGfyitpcPn96hOEja+2xrKBnJYbubl4FvsxeDxnNuvGflTEebEQ9TK3VxuOlQYriUM0IyuuVQOxN5eLJsYySvoZioJViNqAmpZNuS7fiyEhNkwCqEc2rDMdqgt0zEggXmql61wB3JumvZRdTRYMBh+fN5gsqKzfD1AM9feibC/ttfbfspY2Z8cx0ocw9YGq1BhlLVfQ+oTczgFM50VhpQEHXVb1aIlgwn6X4uzmeVVekSXcqiMtjuoHHdP4iz14yH3zQ5ejl3py1Le1+39YOIPsnKfl5seH8NjCD5bCe+fHTH2iBkOGPwdFh9WaL8VUQ3hpirh4/ygWgorySzcHyMOsPaqGQ/YfgjH3FKO1IFdW6IvXqMLmRzUi1LsYyYX5vpSrO2BaGxANCCJEv+9A9iGAs55jjCp8/HV0e8s1B4CQXtPbZQixzzIK4u9tA+lF98mbstoqRL9Kjrr0XoaJIZ7GUsIEhAoGOJY6D1XwF0IT5CXKTHLs3ff47VjfS8gOLEryn21H+gPVw15wDBo/GowtrWFdbHZNVCrOyvFD6hoaNFLY4IipcMkpP0kxsjziCt0f7pBOZkXBdNxNqVGH645Vmm3DbtJ2v7fO/d6D8jVoXVW8JkOm6Rz8Y+FcQE6U8SIFrQPZ9+CzkXlq7g3Dzae8MaLAPQRjSaq/1iaf0G567ramdvXj0w4pZNvWEsATq0M1FA== X-Forefront-Antispam-Report: CIP:149.6.166.170; CTRY:FR; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:proxy.softathome.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(70206006)(70586007)(6266002)(5660300002)(36756003)(2906002)(186003)(426003)(1076003)(508600001)(2616005)(26005)(336012)(82960400001)(107886003)(40460700003)(44832011)(8676002)(4326008)(8936002)(81166007)(47076005)(6966003)(356005)(36860700001)(83380400001)(86362001)(6666004)(82310400004)(316002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: softathome.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2022 14:57:59.0239 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c4bf459-84a9-4467-4357-08d9f86f3699 X-MS-Exchange-CrossTenant-Id: aa10e044-e405-4c10-8353-36b4d0cce511 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=aa10e044-e405-4c10-8353-36b4d0cce511; Ip=[149.6.166.170]; Helo=[proxy.softathome.com] X-MS-Exchange-CrossTenant-AuthSource: PR2FRA01FT011.eop-fra01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR2P264MB0083 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean |
Series |
image: add a stage pre-load
|
expand
|
diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index 3f7f7accc1..8296459257 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -24,9 +24,17 @@ static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector, ulong count, void *buf) { + ulong addr; + debug("%s: sector %lx, count %lx, buf %lx\n", __func__, sector, count, (ulong)buf); - memcpy(buf, (void *)(CONFIG_SPL_LOAD_FIT_ADDRESS + sector), count); + + addr = (ulong)CONFIG_SPL_LOAD_FIT_ADDRESS + sector; + if (CONFIG_IS_ENABLED(IMAGE_PRE_LOAD)) + addr += image_load_offset; + + memcpy(buf, (void *)addr, count); + return count; } @@ -37,6 +45,17 @@ static int spl_ram_load_image(struct spl_image_info *spl_image, header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS; + if (CONFIG_IS_ENABLED(IMAGE_PRE_LOAD)) { + unsigned long addr = (unsigned long)header; + int ret = image_pre_load(addr); + + if (ret) + return ret; + + addr += image_load_offset; + header = (struct image_header *)addr; + } + #if CONFIG_IS_ENABLED(DFU) if (bootdev->boot_device == BOOT_DEVICE_DFU) spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0");