Message ID | 20211030065140.3589529-1-ovidiu.panait@windriver.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
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=windriver.com header.i=@windriver.com header.a=rsa-sha256 header.s=PPS06212021 header.b=NBE6usj3; 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) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hh93w5v4vz9sSf for <incoming@patchwork.ozlabs.org>; Sat, 30 Oct 2021 17:53:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 49582834E0; Sat, 30 Oct 2021 08:53:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.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=windriver.com header.i=@windriver.com header.b="NBE6usj3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 16E2482EBB; Sat, 30 Oct 2021 08:52:32 +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,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) (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 E533883362 for <u-boot@lists.denx.de>; Sat, 30 Oct 2021 08:52:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=693705c626=ovidiu.panait@windriver.com Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19U6qGqN030136; Sat, 30 Oct 2021 06:52:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=9MOeloAMPlkmPQ7P2GrqHdA+vSGx34oypOatBfMOZRo=; b=NBE6usj3t/zXai6/IpN/mR2oENaUWaAolMdC6ujivYVS96y97C+/6gdXjvqJpPb1F2LV xTC/ci4VsG2TBmMdbXhWipEymOT6GkWWV7VsrNHXr5MDDWteI9pNmwq5NP2MJml8zuPj D2JsBpNXWUjPBjpSbETiZ8IxPkYzpuwIb3F0b/PAFEk/RRc8L6TVh1CkxQbOhEMUoXKQ 4TE/6+F9MxR9DS17uNItK/wbeUAWnCiHeaS7a9Dg3Q1nDu7KlE2CrHaby4Zyqh4w+YS9 OpsrQf8bemAxFckmhs056tLdIKpggNeJSzsIoGP8WQBoNTSIvQhDHzz+RhXgzzh64nCX Kg== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2109.outbound.protection.outlook.com [104.47.55.109]) by mx0a-0064b401.pphosted.com with ESMTP id 3c0w1984ah-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 30 Oct 2021 06:52:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ewtwOVW6ohwO5LUfZ4S80Kozn21Tp1Hd/QnnkkDgf27mTccPS+k2ZFGrF4wHyEhzjNfSYvFlPsaLI0Dxw1/Bo2d7o1RybvRSdaUa5LKSNAFLznYzWwcmoPzWvIRRbHM9cO3RL8sA0cPc41CNzhtohz+4oT47Cw3dQaR7qitS/Tc4RxhDTnXyig4SF9HIOmMBFLgQR1MwS40MwEsmwpCKwKHDv573wNt0WjBgdgAJDpiqc8zLy66DKEd/ntwh8FNjgYwOTvIxhDBFh8puUINQP+QDdNtSdfz789fnlbEt31MFgyemhssbK2XWZB13owW3AtPpFXu/Ae5rqNpdIz+Plw== 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=9MOeloAMPlkmPQ7P2GrqHdA+vSGx34oypOatBfMOZRo=; b=Q7ac/vn6cgXz0+5R4z2BY6JpX8lYb91/WYIDP37L6EnU0edjtACRLuKhr5PEm0MQhw6eCzHxpQh7o5Il2gIvbnJpOvT0BfNRyQi4VrNmVE9oabATnSGgh/+KsXbYkxOWJ0RzX2QNfvgtpg5hp2DPc80uOFdI3LrAFoSgvPqaSndqFWdfnG6NfOtyYe1jNJdHYJbbhzz0f4uyDkk54o3GwvpJRQJ12t7N2B4lYGfqy2BGQNOJhjbdwU0XgMd+XPH4G9Z/rU/gAWIXI0JXmJX7fGjaZV5iHEU/tSZkZEJG1u0Ftt3LlQNc9ldoSLWFGUD39Cczs/1y62Ja7UhbfPoR1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by DM6PR11MB3612.namprd11.prod.outlook.com (2603:10b6:5:13b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.17; Sat, 30 Oct 2021 06:52:14 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::6daa:43c4:6ef3:a6d3]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::6daa:43c4:6ef3:a6d3%3]) with mapi id 15.20.4649.017; Sat, 30 Oct 2021 06:52:14 +0000 From: Ovidiu Panait <ovidiu.panait@windriver.com> To: u-boot@lists.denx.de Cc: Ovidiu Panait <ovidiu.panait@windriver.com>, Alexandru Gagniuc <mr.nuke.me@gmail.com>, Bin Meng <bmeng.cn@gmail.com>, Harald Seiler <hws@denx.de>, =?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org>, Patrick Delaunay <patrick.delaunay@foss.st.com>, Ricardo Salveti <ricardo@foundries.io>, Simon Glass <sjg@chromium.org> Subject: [PATCH 1/7] common: spl: move armv7m-specific code to spl_perform_fixups() Date: Sat, 30 Oct 2021 09:51:34 +0300 Message-Id: <20211030065140.3589529-1-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.25.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: VI1PR03CA0061.eurprd03.prod.outlook.com (2603:10a6:803:50::32) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 Received: from otp-linux03.wrs.com (46.97.150.20) by VI1PR03CA0061.eurprd03.prod.outlook.com (2603:10a6:803:50::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.17 via Frontend Transport; Sat, 30 Oct 2021 06:52:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ed1bc4b1-3d27-49d5-aac2-08d99b71cddd X-MS-TrafficTypeDiagnostic: DM6PR11MB3612: X-Microsoft-Antispam-PRVS: <DM6PR11MB36124D824DB6CC2B38BAA92CFE889@DM6PR11MB3612.namprd11.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:317; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: U4clqqcbuZc0vq8y2uCCrZpYnpGEbqLYxA0JvicPQgMDuxu7bGbNjQY9ocmHLVRx/TTU1t0KJ2p/1FCrhl9T3vMteDoGJNaEYeAsJ4KEt/1t/PJqafVAzfTC0xdUe9Gn+JZHtCEt0hmHNMdCfrFiAusjNLAy+dzwSUYAoCy9ngS4mcgW6mhjFavlhSFDcYQymyyjsi7WsGzK/ge/jNgcdUhQwihTwB+ppJbVCbbdebwSF/xkn5zQIF4fsjvdUKVXJdQghBBwDgDjSlAQg6NNpKKhojaikw0iOj4N3hZlwUc6ZdCAtpdgOFSztzzMQfkAM3C9bM3ABYZ4shvAn8mP11letmChil4zVByWI/y4+9N6vC9SGbE/gkBijVLGU2vmZvj+AyhJ3lJzW9/Z5ZPd5/Og0ty3L/NWtKM1SvyOAe68b3XMDymU2mzpT9j5M9+q4vN5yro3dFLnR8AY2j3Cvppg8nczRdZYZ4r8YzysyD2Yooss3EBk8ybpLXGCcqiLzEewnKmq+7LkYYH8wKmAbwWu+FytXU66QpeRGn35hjm8FHHVNPiNU8ltRNoxmIkUfPC3/soI1Dp01nGzJfm2JyaHC3WpD94FvpDr311JhezNxnZmhe8+CFnxl+ycW/7ZIuz/+reqaB68o+Gqwb8H1pRQKu3R8oXWqhVNFfazdDjvp4rEH/+7eGCZNtTHTNfR2JR48fy+rHNN609k87bccQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(186003)(2906002)(6506007)(5660300002)(4326008)(26005)(6666004)(956004)(52116002)(83380400001)(44832011)(508600001)(2616005)(6512007)(38350700002)(8676002)(66556008)(316002)(54906003)(6916009)(8936002)(36756003)(86362001)(66476007)(66946007)(6486002)(38100700002)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8odEcEKMxSNyRXYBI4a8tu+aRer434om+skoQXDVlK486hMoXwzKAeQUxnQjdFSkUF9E6jtKky+cHFGhY3b76T3Esnpjlr0oKDtqpXBMpOI3fibG2baqKB0LyAaPYv6qhWnu4QXOYGqBzSp/1073O6nrCLg928YING/J0xD8UOWfQbCLghYZfKSi9T6V06PB5h3LWxMNejl8kFY6rroZOI4bvzIyLuwm6saaJ2ePhIN48JGAJysoVYPGuvmccIE3pcnElsHoKrGAfN6mlBhPXDHaxGregVUBbws6jk8HmDzfHDiGDvXWC47mLWcLgThkn/MHUYImgrpoJUQOqmlB2aiabc6NLcAhaI0rSbfWrOXaW9RSV8jN8O4lZdXQ2DG8PQ776hrbDIyqYejVF9japEdCdyGaB53xbtnsdVn/dqdGLMNEK/DMAT8V+uFj7Dwjiox/aMdIZupMqnuqirFyffDAXpBHv/ZknRp+0qKC6AupeFRrUejL7gLyXNI8c6hqDcavpK3X0wayDwNJYEndpd6uAwItmf2ilbEdNtwQuhi4OuJweiySzLMhyFC1+vFFXmHm6CbYQqprJfPcgp8wzlzggCKX9XbPoPqApHTsGG+NJQ066lLVG4PFoqEsmhZaXxlEESm0hf3NpCBMe42kLjFQ/QS0isc7vWVKYJG/XghZkIe9cDnccel9l+S53ajnQIqGopCujMKc+SX62GMrLMjZ7884Rlnh57KzDVpRBxVGI/y9/+nO1cbzZW9CJTh0iVMgIlgDQwnNreS9snNuMVPD9unV89Gj64H3Cc7sjEGCoYMkp1TQD/nMaK5quCH8ELOkH7g9L4M5NoPHtbDof9+Mj0CRcF0DPKpiQoqua3sEeKAG62gxW4awOsTbPQaFCGvccyla2CFzAY/91ZM+A3kfT+xcl+OUto0eo5jVwUa4F/OVJmRsvhpOXvPHFM4GeAzcj7Qh+MMvMtJN9v0SbxCSNGIzYc6hXVRn8E32QjLOJ+DYXNF6wdCI0HmPInae/EbKVGfujRbl48ogbb7das/2ieqcXCEbM5x2BA0plBh1uLq/kiLkPU4ovGItYe1hhU7itjY+HVXgkuzEyGKV6u4kWqfMwuOoDFtHuBSF6YyfupY1i1Iu30jcbXATybaSrl1bAOvd7dCTAzADLUokPKommb9ihjursdeZErvrbFAwhFzOHYm6cNRT1bKm/0lUZu5O+mua+NlsMYOcfJZRTQjTIJdlSVjhm+e9p/u7AjM7yi3zIIuMeKuApDwL3VG0c5JANMAxiq7eVscKrAmC82wQjLX+npNp7N/RdlbwMicEmB2/+VlO7qQvZt9BdsXql/UEZ5Q07yZqf6yOvO1IMD6KkS1xchnfjOMJJjChG4ArLg7XuFNIib1NfaJunUAfa6ESn1KRivT5F/6KHmzKwgpeQflcweZjVySia8SaOC+wwUykNIjc6K0VHoKoYgEoqGTfmkCANPudcccvAinzmKC5QNIviLcsnZsiU5fDVrcXquJvL089MO0mhR+d/Rwc5KQ3AtEMszEanO8oMc5l9DW4UgAzTYUAOSgjjnv0576c8P8HQizHQXCSJFzp1eTodpozikKwKoUju/OfNCJDDXNjXFhm1HutKszDwo7fDcXmCQEuMac/kEgkS9OYoMz35o3jQgP/xXHxduhMEaQs5AqXQ0hX+1QGNjD+5iXYPn4= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed1bc4b1-3d27-49d5-aac2-08d99b71cddd X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2021 06:52:14.0268 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ESKXtpzvN6iOmsJYIak6y4Nu54FKlncraNgcJNWyVsmy8qkHAu4Ptp6bft5ms2ug55DgkzSdKR6Y8qUKWzOqDFsX3SRU8ZEItf/T/cOZ0sk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3612 X-Proofpoint-GUID: tnz5sSld5Y8ayoajbjWlOGpSXla9obs3 X-Proofpoint-ORIG-GUID: tnz5sSld5Y8ayoajbjWlOGpSXla9obs3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-10-30_02,2021-10-29_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1011 mlxscore=0 lowpriorityscore=0 priorityscore=1501 mlxlogscore=709 bulkscore=0 impostorscore=0 adultscore=0 suspectscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2110300035 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
[1/7] common: spl: move armv7m-specific code to spl_perform_fixups()
|
expand
|
diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c index 63721018c1..65427b5312 100644 --- a/arch/arm/cpu/armv7m/cpu.c +++ b/arch/arm/cpu/armv7m/cpu.c @@ -12,6 +12,7 @@ #include <irq_func.h> #include <asm/io.h> #include <asm/armv7m.h> +#include <spl.h> /* * This is called right before passing control to @@ -56,3 +57,8 @@ void reset_cpu(void) | (V7M_SCB->aircr & V7M_AIRCR_PRIGROUP_MSK) | V7M_AIRCR_SYSRESET, &V7M_SCB->aircr); } + +void spl_perform_fixups(struct spl_image_info *spl_image) +{ + spl_image->entry_point |= 0x1; +} diff --git a/common/spl/spl.c b/common/spl/spl.c index 0c08da06e8..63556f35bd 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -770,9 +770,6 @@ void board_init_r(gd_t *dummy1, ulong dummy2) ret); } -#ifdef CONFIG_CPU_V7M - spl_image.entry_point |= 0x1; -#endif switch (spl_image.os) { case IH_OS_U_BOOT: debug("Jumping to %s...\n", spl_phase_name(spl_next_phase()));
Factor out armv7m fragment to spl_perform_fixups(), which is an arch/board specific function designed for this purpose. Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- arch/arm/cpu/armv7m/cpu.c | 6 ++++++ common/spl/spl.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-)