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 X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E23D0C12002 for ; Mon, 19 Jul 2021 07:17:44 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 3E27C61019 for ; Mon, 19 Jul 2021 07:17:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E27C61019 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 989A482C8B; Mon, 19 Jul 2021 09:15:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="J14gYlvC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0A17782C64; Mon, 19 Jul 2021 09:14:36 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on060b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::60b]) (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 C67E382BF5 for ; Mon, 19 Jul 2021 09:14:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Oi6R4Ubru0ketUE6MW/rxnlgL6WoMXi5/RrPJZljoOWZK4HD2ROk5xGRf1lCOiPVuXrd/C3/aVvALQ/ggEyzINzCzRPAsPGPiOYrJtdjDHkIswQmmyNRp2lrYK6dE+RqZlNjMCKdrT5MyFCkJ41RylIHQoyBU3DgT0wzZVJGcVouH8Ae2Ap93dv4N+ZgKicZ4fnysg4jUED/9BLMWyVKbCYcQ8ib98NoPCmgJtEqcyRIJOl4NwX7f22VPpS1FPfxlGSOwZBZeiC1ZmNMiWr7JBN5NYa3ntU6fkeJ0c9C7FvitMLLEtgT9Xy+Yhr+e3PPQy/2bJ2s7AtGK1Dq8kATSw== 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-SenderADCheck; bh=HpMx7AFmPsI+DxbIaaDCh+CQvxZrlCF5WVVSlFU/LhY=; b=TvU4nBJEUor5yI10vVEFtrDxcQ4tkzKNVul+AcJHgbC9olUS8D1JCfuUpc+Rbwu5FEtVkqo7eJnoADSJ7e6QFeBBjtQodvnLmkLcGBiL16HEC3yJAdBzLFzflrFoWI+ocJGMTH6y4SrFrxrZBp8YnEdSYpw1uu7+d43gmzXbqIOKx9O/OgOkm4i8yi/ihtkL/HoqtIcz+rKshNl0trirBI7eX9es457NJWAyccb7ZvAu993fmma/HO1xXuK4bCtS1qMh1+QrKXXGqU3A3brTYvzuaZaiIN4a5qI6YoSDIrSEZbzQA2LvRVdrLtb0SlxduQZFtIl0COO0aEwsBASjgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HpMx7AFmPsI+DxbIaaDCh+CQvxZrlCF5WVVSlFU/LhY=; b=J14gYlvC4pa4wi+7H4iWj9cwUnGXR8P6Wm7wMRFy4+UfoPCaJRdDlJvRyVVe6/4m8si82eWA9Ram0ZRUkJ9kw45ML7vwTKOXB0ecveEZCIBw6Hlbo+OA9o7lxsAyvn/rhCay0Xhz2FRg190hOMo3kr+ZLjcMlqHOHO2qROAsB1Q= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB6PR0402MB2933.eurprd04.prod.outlook.com (2603:10a6:4:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21; Mon, 19 Jul 2021 07:14:26 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c445:d742:eb76:86dd]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c445:d742:eb76:86dd%9]) with mapi id 15.20.4331.032; Mon, 19 Jul 2021 07:14:26 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [Patch V3 21/44] arm: imx8ulp: Update the reset vector in u-boot Date: Mon, 19 Jul 2021 15:47:11 +0800 Message-Id: <20210719074734.29170-22-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210719074734.29170-1-peng.fan@oss.nxp.com> References: <20210719074734.29170-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SGAP274CA0006.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::18) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from linux-1xn6.ap.freescale.net (119.31.174.71) by SGAP274CA0006.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21 via Frontend Transport; Mon, 19 Jul 2021 07:14:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6e4a890-57f7-4858-5850-08d94a84d7aa X-MS-TrafficTypeDiagnostic: DB6PR0402MB2933: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YUiyEI0g7wX9tgogDxrkcdtfZ0bVkj0tnRamdv1yIcQPBxhdZCloj4Dfi+tBpKhwQkoaw/ARpjDhQrNn/4EqOJXW79s72TrT2RXXQtvbwqB+mehMzWTdBOKDukTG1j8Uh3DwI6xaGJiaiBSaWkjmDBDMGXrtQWzEnoTf32Bfpqat3DWA84H9hXUurz7n1K7bWAskJ5uLcGQWj0fTW5/gLf9/tF3E3EHJG9sKcKDzvjU0FQHgEf4CmG6T87B+kIGgLXlhcg34cWey5olh7QxUZR1dUQ9nsF5/Q8yWeTFYXM1gdGIr4KD5amjBezsGikeFsvbsHEQ5ciLao25BzRjnnSw5D7lUA7efL5mzQ12NkLg1nlcQ6BPGpVqihRH9rHMGmUxfrXoQoHcO/G3DzdPpoafUfQEMslyO/VkVKSRHcGrWeAzZeeRl10Xc+XYOp/Ryev6o9Oz4nTitBhr/9ELcPDTWvcUlKVRtS+2YdHlDkg9PrKoM//PNzf1Z/mEAx7qpa0DKV+K5md75jv1ooYxBBMWyKEXaINkGazjGLy5j0R78IW/nmcAjLhPnpQgtEpudZh5GS5+yy50jx618kY5TvzZL0Isgdf9PrhDLaHlBwKUQdTktUAn9etp6/bQKOXSMNFKSAuioEluy/bGvRcHSEESdiZI13f7qzWiwIOaFZ3GzqfGhOVItT6C6BI5JXDSW/7EZQ9aFfez2VotBdCUo8AySEBAFXIJWPpgwUO4r8/k= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(5660300002)(508600001)(6666004)(316002)(956004)(83380400001)(8676002)(66946007)(6486002)(6512007)(66476007)(66556008)(15650500001)(8936002)(2616005)(1076003)(26005)(52116002)(4326008)(186003)(86362001)(38100700002)(6506007)(38350700002)(54906003)(2906002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AW4raew4WVoda2ic9cdv1Hd6rxvQrsw/lgUfLH2/b8+cST8rB3KtSRIZOTy3?= =?us-ascii?Q?5IbvvXMtV7LGOZKXj2DGovX+ngyZGvZwSrPGdLyJsAjWCPbhDRihl9jndPHF?= =?us-ascii?Q?QTDfBLEK07Lp1iGv3qHMdVLRiobUKWZs6oVH+2BFwVw2zmifRrpaXdJ/h1dF?= =?us-ascii?Q?5QCjm2fD5HmtFkmVvPAfB5YTtUscFxFHAPh0LRwcsTPZT3Z72hLaoxJMXHG4?= =?us-ascii?Q?8QCMd13v3XGBLt+oKEOiEkF5ksYzs9s0rDR53BFr8J/lVo0LxA7oBBhF6qui?= =?us-ascii?Q?kITE4GLsLq4zgh+vI8hoRS+pYSyuQBMYrcWzrcU4hCZ1E6VesizpenQyp1by?= =?us-ascii?Q?3Ldj/upNkDPOsvYQvwG5Bt6N0R4uGuem71QPezcbb6CugDbIEsda44j7rpEl?= =?us-ascii?Q?tP4Ammtej4sri2Y8LHahhc4LcMZQoRQScStz/0s+IsNyicJH53uVeO0R1oDv?= =?us-ascii?Q?6mJd83RsShyQ9+cqZ5cl203S2zBKG3w1yrcMLmXw5TLGgYOEGhmq+qhbVOOM?= =?us-ascii?Q?ZmT3Jz8tc0QAdLBruZtR2VzoJ7pH3AvMJbNB5lplAwlBWT9m5djuETQ5CufM?= =?us-ascii?Q?8DmwjndBpYc/+8QzXtg51qHs03c9KqawoMeCjAb34GasKrwC5k6wDr6Mtdo6?= =?us-ascii?Q?jdHdPJMQ4uJOMFNXhgjdYZ0eLyx8lgisK+Tr9foIrTpyvQTPqOD9Z0qysoca?= =?us-ascii?Q?E0hDywwBr8xUNSM6tnh8LuzABeoVkfuvE8eBe8YAhyJb2RyWE+Z1H3MUoJsM?= =?us-ascii?Q?jyONLKuDSnfD9Zv62pmiQ029CDunGAoRhb6OIcH7PVWWNKJAWOdtAl/m1aTG?= =?us-ascii?Q?xWH0pRY0dcb0TpAyhoXT+LKPT9LVYfgvhuYwKUYku4gZwXgk+d/Ovp1tYc8f?= =?us-ascii?Q?7T9GyLVOodjwb+tf20ofL3Xm+S1m1pH9obK3kurqs/fig/HexJJWC0Tz1ArR?= =?us-ascii?Q?vMwVhN/nMw19hjFdSGvSi5rZ9ayP03Wjy3RniS13HjAACaUJpGu9yjLu0iFu?= =?us-ascii?Q?XmQOeBKbd1IJYZzHVreOQkSyN+pIf4i5QnyxTu/SewJYtmmFHbPhVjupVJ7K?= =?us-ascii?Q?yicMcP5BHbkKgZJ9oMpEh6iXidBGWyJtS0s0tEwGrlzJVEZ96ncMCmjO9xqB?= =?us-ascii?Q?aQTq1ab7hLjfLtkHHVI9eq9903YPsK+cof19sAnosy6kUHnoM01SaphW0/PK?= =?us-ascii?Q?527xrUtY5W/4hJTfnWBuSHbTDKJx//CgFItaaHbjtsaKCi+1wfYAtkylgHqU?= =?us-ascii?Q?XJNiCs2/nFWxjBVF/GPSHSymEeyC3azAVk1V0++k4zC2ww87SbKNdZwlSikA?= =?us-ascii?Q?kILbnb2rptYvNOH9bg3tCwSX?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6e4a890-57f7-4858-5850-08d94a84d7aa X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2021 07:14:26.6318 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HZ/26qbj3WZAzgJri7Kl1LAxTJBmhW89SmhvJIYvqYNQndauRqQQmLUSq1snhnESm3o3iVlSrJ33FBrQgrQUkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2933 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 From: Ye Li Because we have set reset vector to ATF in SPL, have to set it back to ROM for any reset in u-boot Signed-off-by: Ye Li Signed-off-by: Peng Fan --- arch/arm/mach-imx/imx8ulp/soc.c | 35 +++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c index 051dec1a5a..5e7bf57a62 100644 --- a/arch/arm/mach-imx/imx8ulp/soc.c +++ b/arch/arm/mach-imx/imx8ulp/soc.c @@ -321,21 +321,10 @@ void get_board_serial(struct tag_serialnr *serialnr) } #endif -int arch_cpu_init(void) +static void set_core0_reset_vector(u32 entry) { - if (IS_ENABLED(CONFIG_SPL_BUILD)) - clock_init(); - - return 0; -} - -#if defined(CONFIG_SPL_BUILD) -__weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) -{ - debug("image entry point: 0x%lx\n", spl_image->entry_point); - /* Update SIM1 DGO8 for reset vector base */ - writel((u32)spl_image->entry_point, SIM1_BASE_ADDR + 0x5c); + writel(entry, SIM1_BASE_ADDR + 0x5c); /* set update bit */ setbits_le32(SIM1_BASE_ADDR + 0x8, 0x1 << 24); @@ -349,6 +338,26 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) /* clear the ack by set 1 */ setbits_le32(SIM1_BASE_ADDR + 0x8, (0x1 << 26)); +} + +int arch_cpu_init(void) +{ + if (IS_ENABLED(CONFIG_SPL_BUILD)) { + clock_init(); + } else { + /* reconfigure core0 reset vector to ROM */ + set_core0_reset_vector(0x1000); + } + + return 0; +} + +#if defined(CONFIG_SPL_BUILD) +__weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +{ + debug("image entry point: 0x%lx\n", spl_image->entry_point); + + set_core0_reset_vector((u32)spl_image->entry_point); /* Enable the 512KB cache */ setbits_le32(SIM1_BASE_ADDR + 0x30, (0x1 << 4)); -- 2.30.0