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 18BCCC433F5 for ; Sat, 1 Jan 2022 17:15:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8651A8305B; Sat, 1 Jan 2022 18:14:31 +0100 (CET) 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="o+2Z1ASf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E880A8141E; Sat, 1 Jan 2022 18:14:23 +0100 (CET) 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 80B6B83022 for ; Sat, 1 Jan 2022 18:14:20 +0100 (CET) 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=800048d64d=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 ESMTP id 201HE1ZE020330; Sat, 1 Jan 2022 17:14:01 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=5EYkl2vfvFZWYmchEWv8JKTRpDWjqhyV2mklM5x/jz4=; b=o+2Z1ASf+RNlilKnjL+EacJfHSzNGMiQiBjsyKySZmLi8DjHLiOTrs1PvWiwGCpYv9rj xprc5kBNhPAvbLCRD3EoCk/ClJVZu0UGBoU/hFgEb5zs/0KHC9hlvCcXPj4CWLCYZkpr QFZD6Qa+C4BYproMZB0qFRPHpHxsYogKV7PB0XGxts2/VhiXr79/YDabQg2oXdVULQ1Y bsTq11l8xdwQLJ7qkX3BBUu2HTrEPwwpTEdhiZHiuRvZ6qp8+PpdNXiGQtgtkTmviVD9 BcXgTW4jg/y5TZMfmrFTMICm6BR3h+/30VT6RAoqUKhV816tkMO0RY13Mo7KNXtvxgif 4w== Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2170.outbound.protection.outlook.com [104.47.59.170]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3dadx808rm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 01 Jan 2022 17:14:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NoiCQvo/NhBfhgm6nqth0PePItZkx4o+dEtwvBLYFFGroMNoHbWmS+Ah2gGKQtTrJBRybwujh9l1HOcwevGNGkh1M49syhxVOlSE7miw0bEAVcnexsdK5MlE18j81Wn8DnL1MYMUmRQfE87hA6EXrQGUXjJ+KnIAuENsj1bv81tu8zAfzqflbQVTGktOqadZQP0R8L7e/EKbBQ7aOKgDj49x7rJZlxhf5BL4kBFvDy3FcaNNFp8Neadwv0Gm3g1e+TaDuY2/DOhrX0psJTOvDkVrkhV+FJtYKm1AHJyLIguyLw52OckcX2Causc+ZZpEUtjpqmM3KlSt5AF+gXQiWA== 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=5EYkl2vfvFZWYmchEWv8JKTRpDWjqhyV2mklM5x/jz4=; b=ct1ivN5qvHil6UY4wbjkQ83eCpUOl4286hKtHpp7m2oaIYgAdoqh47UucWRS96pePUjm1roV/DA3Bzaizn5CIuwNKJEgFGcbI4MdkJ5bHFjofNXnTdritecGPXOVB9hkMoOc0jk0xYyOB0SCmro+IBmTXfgxT+i/NICJuZ1jhvZKVyykqI84MJ7xkzpJjpRlH6KyyfRhTmaqNqXaBA3P+Hb0bIEgXwbAqbm76PMfINLBZqVF+qyMAjwoT2tNj/dBp4/tPBsWY+lSVBuSxExluY/bZ9BOr6MD5gOrPH6d8mOTU+9OsHHpVTLCIGMup1MMxZOVPBzCvzdWnDlbK1k9uA== 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 Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by DM5PR11MB1353.namprd11.prod.outlook.com (2603:10b6:3:a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.21; Sat, 1 Jan 2022 17:13:59 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7d5a:c35:1ddb:11f3]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7d5a:c35:1ddb:11f3%8]) with mapi id 15.20.4844.015; Sat, 1 Jan 2022 17:13:58 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Simon Glass , Alexandru Gagniuc , Bin Meng , Harald Seiler , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Patrick Delaunay , Ricardo Salveti Subject: [PATCH v2 1/7] common: spl: move armv7m-specific code to spl_perform_fixups() Date: Sat, 1 Jan 2022 19:13:25 +0200 Message-Id: <20220101171332.2676936-1-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.25.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: VI1PR0801CA0071.eurprd08.prod.outlook.com (2603:10a6:800:7d::15) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 213a6def-1d6d-4f1d-837f-08d9cd4a1943 X-MS-TrafficTypeDiagnostic: DM5PR11MB1353:EE_ X-Microsoft-Antispam-PRVS: 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: u75bc41qCRrsgUXxfydyNjobkMDQsRIlqg5cqWiPYI8AKPDN9xO/WIIsRKqREToZgBk3XMJZ6JtKwTJkGKdzKNTOArFcNOreWA7GubvmqzjLIva8kQ2gTu15X1IkDyP11P9o5AYlOSjN0r19FEpkWBMynf7f4apSp5gE/fIX31HVa9OU2xOZD3Mzly81y5oOG0gmyp1tJFjeqz/0dmWjjzDGe/U0FvzC3xkF5mkJ0yCF/npll6IJwE2X8C7h8dW6RyXtISi7eQqcsOMwaFxpnycCWgp6u/Rn8SRTLMv9aqK8VYAWhNBMrV6idq/rqzf7mU25KTscsOQeNsHDPlD8J9rO9zCkZz+QPgahTvcaw0wVzVwB+qfJ8Vkg4b5BtRwvufQ/jSWjnIpD0NmVk68ANBJcHy+1GAtdKRbDp74xStZXI59k7P+Q8HdC8cBHAObrAgEuJ4enuKwhIbLfumXNimw2AfiUf13kSoJfj6QRbm6bms3AA7jeX39a6jUU8SmU0tM0xfQ0fFQJg2/DbgW0xbMMNC7XYq3hlC+2xvOdVLxNPmyogKKPekGIBSF+4h1NKj35p0fJkCvGk7YeackJ35ts/Vkw3XiAau2BMrvjwWMP9gE4UliSWZzzP0VlgGJRmiyvuSqRR6pKMPm16tpo5l1bhmlN9Vm3iW6wHYVoMlUaK7/Vh1lcJDGMlnGEJp0JQfOJlUPqoAXC3nTIBwFCHw== 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)(83380400001)(4326008)(86362001)(186003)(6512007)(36756003)(38350700002)(508600001)(5660300002)(6506007)(26005)(6486002)(66556008)(8936002)(2906002)(54906003)(316002)(66476007)(44832011)(6916009)(6666004)(1076003)(52116002)(2616005)(8676002)(38100700002)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OHTyPECMOzGJ2Ux9YlBpK7YOGZVFVh+VVX8lHvYicfkPk/trQ+ycqoRICO9E?= =?us-ascii?Q?DId7xT2Lg82dQQhSJik3mV4xfLzioxLunrFxr/k43KMdi5YHhJ6os8q6KK+z?= =?us-ascii?Q?dmhUbMlSUSpEztHulg6zr+Yf1xjQA9oFwokjAPTEu5csq0XXAxmOqLUWt8IW?= =?us-ascii?Q?0tkdYOgJFjZlie5O+9ACXt+ZM96TuwFgfgg21g1OVM5V76Co+hzWVvm4/eTG?= =?us-ascii?Q?LPbnHcC1qQMJTB4jUraEUTC4apJC5OspJbfBXM52hW8E3VbzQcHmicLZIfrk?= =?us-ascii?Q?jfJF1ehxFXexzd0WsuPrcm2MY5z+pTxXWuybFBArO80irQsNBy6ALuIMtin2?= =?us-ascii?Q?aTGb/HPZb8LvfCUXk3TXAdy7GsxUgDl3XnFtlAkOUgs6wJHL5dTKSBdDaASj?= =?us-ascii?Q?sI0nO9UPXiuIv2pm1GG71G53UtbHhH0IEopstNDpsGAQR4pW0JRgpgWs67+G?= =?us-ascii?Q?rXzXcJhou38VG+UDgmyu7VOrvcwcLVrKUia1O9/bqBKNmyWnIYAXV7IS7kpd?= =?us-ascii?Q?ZtyhTQgsxASYY9NiOuvZpCcT9buMJAEebAyFTjM1yNAeqLXQNB707k0CHXae?= =?us-ascii?Q?/MHvAZcIuhWXE9/P6U/ncdNZB7y4Tde8XAGgfhLAtcLPWPy2h1A1tSr7WIgp?= =?us-ascii?Q?FKq+Rto8zETG6hD+m5S67H4EP0/f/5xm2ciPXEJuUzNeosl6iEGg8oqiPSRT?= =?us-ascii?Q?kwoVSPp0T+ABEFRvzHfT9hZ5vIbvDPd1iqxtHXuzZ0jazgpiKACLcwjb68xr?= =?us-ascii?Q?RbfiSHNC7EDfYhu1KmWhg9LKYi4nfPncmUH98OW5RtGmmzKaycIN1m458gHQ?= =?us-ascii?Q?+FfWj/Qzb5XSojGwqSUYlG20EVCZkXTzKwnJZL6OkIT5WmpPCGiOdU7LI3kg?= =?us-ascii?Q?ePHj4IeimmsgHumr9pdB52CVUJrztJeLMEo0m5X9Zq27JbbK9L5U6MD2z4fR?= =?us-ascii?Q?IxIO7kv18xwF1NpLpcnx/JySfUbZEKO0QcF9BdHhRLkTxVlCeEtbRgvMLqRR?= =?us-ascii?Q?OrWVDEAIXo2VT9kWHxH+VK49s7M0eBoHLk33wwJxPNMrBlNUch5+DBSSUNlr?= =?us-ascii?Q?Rwre1AIFCFxZrH2a+55dwCTVD/VbqQePspB7oNl065MrHx+08PoGlRjZqxwH?= =?us-ascii?Q?5z9L2HfAH2wn0f7XjThl6iNamFRkQml6ceTVvRYOxVsC1Bax7sfEnObTIOT1?= =?us-ascii?Q?IO2TMPt0hPbsHFAI/W89Dg7oSsqR6VIQpriVU0xppfe6G1+Y5YCzEMHWDeue?= =?us-ascii?Q?NpiclgIuukKLfnU3k95CKElRQ7Uex4WKRYv3S3oc2wGnTflM+Qjbwoz7gAu+?= =?us-ascii?Q?fUB8h9VRjXTK4RwPtkbmPRRk7g++SeJzR41OII+Y07fYVjJ3v0GTLOLpwkfj?= =?us-ascii?Q?Bdc3r+w/JKoNNgFypP0c7XEPbZbrfIe1KOJ1qHYW5sD3nAeZ7pkrXU2HZ6k8?= =?us-ascii?Q?Xo9/BJnsN1Aa/CPVC0IOYv3TduPS753qzXOJLj7bMKlmgn8TKgxcPRq+VBhI?= =?us-ascii?Q?FUWFlpuw8glFdVKoDdnfP/JEPyI7lZJvW6vfCmCIGYqp0P20damg3aVuOvds?= =?us-ascii?Q?MM8WfyH+cvY36brXlVEAB9DEAMbCGDW4OXRhkZ3VQSQcjuTQOH/7jd8yCvrs?= =?us-ascii?Q?wXEssl//iS2zK+4PfoKdHO/Vav8dS+BvMxEvrR47TrQTGhAi19BhhCp4Dj2T?= =?us-ascii?Q?26SbCg=3D=3D?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 213a6def-1d6d-4f1d-837f-08d9cd4a1943 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jan 2022 17:13:58.8357 (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: uAQFU40lVp6sYU+tFgs9Net4icbfRw14X1txcGNbUp9nZ8VtSewOpccclluukDRdgsITG0itXtwugSuA92CUa7+oHLr3d3QztM3U7Kx4FJI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1353 X-Proofpoint-GUID: kOg0tPi_q76QnKXLVA04yl7vdlNhR0bN X-Proofpoint-ORIG-GUID: kOg0tPi_q76QnKXLVA04yl7vdlNhR0bN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-01_02,2022-01-01_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 spamscore=0 phishscore=0 adultscore=0 malwarescore=0 mlxlogscore=830 clxscore=1011 suspectscore=0 bulkscore=0 priorityscore=1501 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201010054 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.2 at phobos.denx.de X-Virus-Status: Clean Factor out armv7m fragment to spl_perform_fixups(), which is an arch/board specific function designed for this purpose. Reviewed-by: Simon Glass Signed-off-by: Ovidiu Panait --- (no changes since v1) arch/arm/cpu/armv7m/cpu.c | 6 ++++++ common/spl/spl.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) 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 #include #include +#include /* * 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 4c101ec5d3..dab0f5fe38 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())); -- 2.25.1