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.8 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 E1BDCC12002 for ; Wed, 21 Jul 2021 13:47:47 +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 69F4B60FF4 for ; Wed, 21 Jul 2021 13:47:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69F4B60FF4 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 EC3C282D8B; Wed, 21 Jul 2021 15:45:35 +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="VXjfkIKj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DEA6682C75; Wed, 21 Jul 2021 15:44:26 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on0627.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0a::627]) (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 54F9E82C70 for ; Wed, 21 Jul 2021 15:44:14 +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=RR3JEQgPL103RCWh0zepMzNMXSynhKdhnkz2NWWiA+Cm8wxf7Us3hIZbg+A4IymNQ1Mi74Wizl6mDQwap5DezisOe8zDbo1txoloxiDDGOIpljJ5xQr4geFWT/C3QsyrsXewGIY21UakJsL2nIlAAJ2Ly7Rkrz1dIRexx55n38kTMQ+xzmU4m3GuoXIYvvxdMn+TJmyFiETOQqMxULkrLSgK15kcdGoe6yeI0aY+Cvkmx6ZHndSRu+GZ4ga4Sq+aB44zs87bWMl3quWJ6mzLcM7jNIPgIS/o4vY8c7DB+dhLvoTx8SjdUsYucr6Y/RMWpdK4c49Cn/PJFgYyyRwtCA== 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=PfBFiWficxs7kAtg1XhGTMAuVb9GudnU55lo4BaJ6C62U+/y4b67K7kJrD470UVlYa0Uwzr2PcIKjLC1pWYtqrzKHqAE1rv9KslMQ6C0UU2wrUJA0i2lwlfhDSFaTAFilLQWf4MSQ6ALU7Yq8jZAqKAcHzFq2qOsfffB4Z0N69yEMeLqZjc5cbOGgWqCqzR2XW2sfoS32Md2tv9OEDzBk1kmza1lNn4jwVwgCbIlX4QB24Q//R0iWCSOVtQD/DhP7GoKYkggEA1TsDkrWisfMt92S1/5NGcW7IyeAjXa1w1Vz8+0jY86u4ZYHow5zhhKSvZEaG3jsjK7p47DqP6yJA== 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=VXjfkIKjPwt8a9NI+INNxKlBbVrMFQXHYBI7fgZc0ClhZgokvo82UlcyMdaOKpwiXF/OfUHlFY+lM8LreVmIQ/qIS5tk33E5RBC8HtUvqf5YJWIRptf+iZyGfwIRLqCEBOBszGzD9Y6rDcvN3XBhFPirclGbNm3TPAy0Wl+WQDg= 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 DB7PR04MB4633.eurprd04.prod.outlook.com (2603:10a6:5:36::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21; Wed, 21 Jul 2021 13:44:10 +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.034; Wed, 21 Jul 2021 13:44:10 +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 V4 21/44] arm: imx8ulp: Update the reset vector in u-boot Date: Wed, 21 Jul 2021 22:17:02 +0800 Message-Id: <20210721141725.23346-22-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210721141725.23346-1-peng.fan@oss.nxp.com> References: <20210721141725.23346-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR0401CA0015.apcprd04.prod.outlook.com (2603:1096:3:1::25) 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 SG2PR0401CA0015.apcprd04.prod.outlook.com (2603:1096:3:1::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21 via Frontend Transport; Wed, 21 Jul 2021 13:44:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d7c77ed0-4235-486b-b008-08d94c4d9e50 X-MS-TrafficTypeDiagnostic: DB7PR04MB4633: 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: LIPxTDxIkQXSeV6cPSHBgw+Xr21meWyUtsJMcQEkkzhCuHGlzfQWfz4bRW475EQstUhM2PEt0n/9ICmb7Affy0ofrJCEp8iwmvYZcEkgJKZPnP9TclyCdf25g7VUDLJPhieQ6zwNmO4ygHlK0s85ud0UtgA6B/J1oi1eVoURmKoi3P3tCXPks8/OQiU8hofaZkDaamykbbrKfW9ixQzyqYOLs31IxsG7LI77EGK0bXZtxkYmOKfpbnWP5Kg2hSRf6ZuzpaUASkhXRKXWalJ7FQiWdubcHB+qgxdZ5m87xj5cGhV5nGeLSWpWGQCo7XhGwKrVIa2a7OffhcBPR/QWruCX843oM1qP6TVej47NV8mr1CyU/dkc5+r+xwswtL5jh7hiC3U9NwkImhcUsmKYWfwXR8Ae3HXX5xQDXUdQJq2yskLdi9b0eIM22b92crxMVbHV/qAF/Qa3/O4iUV/f7QNJyTPZhYVlE544TJFke6UE//CaTsXrRZznPZl7RA4sp14hNc90hHQeuOMMHWoRw4g8FyoS44WNgLo+kUvre8hrspb4U1sf0KorAdICqR1GNN4A769JW111VXsjfbUT5UNgNsekSllwLiPl/h5qR/r6HCYEjvUaI1hYtOKUmTrSoY82y++aDAU4PoxN3bdc2P3GLA+Rli8K9gERFtQqWryLBic5kB4ubceCSTCkQbHMu+evb6YsJDyA4nqwY2nI5ynmJRcgBNsqnQ1N4qRIpN4= 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)(136003)(376002)(366004)(346002)(39860400002)(396003)(2906002)(6486002)(6666004)(6512007)(38100700002)(38350700002)(956004)(15650500001)(5660300002)(83380400001)(86362001)(8676002)(26005)(2616005)(66556008)(66946007)(6506007)(66476007)(54906003)(478600001)(1076003)(316002)(52116002)(8936002)(4326008)(186003)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5PYf3gnVzLVs+qC77JYmiOGKOvw9ozdK989lgaaYkmiIhdFypnEPLtxqptZb?= =?us-ascii?Q?CzsEBpsvQ6EO5uIA0IHUEf3F+gH3Oz+kg0IWKLrN0SyHFPKJCFU9gUov7h6G?= =?us-ascii?Q?auSLUMK0tnsWi4zUUuKqcPvVR52nOc7WmWBuyTWnb/9OzRZXMdTsP/TV8sKm?= =?us-ascii?Q?+KOcprDdfuh+c3lSkbC2Try72bc0cowj95ZXkSgkW73xdmKzU3fIv5USmPgf?= =?us-ascii?Q?sEZQBWtD4e2wjpV2zR54/TPCsNb/1HUPJ/8g5VwdALVXu6j91u6s3kpsYHHP?= =?us-ascii?Q?zLsvtOsLeYByJDnUD+wksZotlytUwjuJeqNJ0ZhvJ+xCLJYATjGSW7iEx/vG?= =?us-ascii?Q?jLG57BIeoBZdjEr3u6Z0cg7Q6H+XcRTwSN9blUsaJdSWFvk+ktjmFarwRj/q?= =?us-ascii?Q?+yA3PsXYkqB+T6Fn2pa8BRbUlXL1yhUlOcueBthtL1c0Ie/uU+S963bR6y9A?= =?us-ascii?Q?wvjLBE1MTdXAMArMxyoN/tFY3m/WhUI5R7p1aQuBG8ekMlSO+IAWbZZtM/LV?= =?us-ascii?Q?XY2cpT8mkZMZyTTC77EFk++AaeqFvNeeVwc/CDVDJA3g8I4fvlvZ6zAGmPbi?= =?us-ascii?Q?Jq77gSS9IxRJYND9mBrNfLGOldvKznVTHp2PKH+OdzqpVWz/4aRg6hY6EurQ?= =?us-ascii?Q?aRurbFoQDwNX0rnefg8Nhk/ScwUIraEAm0ttNqnDlBS2Fp3bcnTU4vhXSEhE?= =?us-ascii?Q?r8rUKBvPjpv2tSoYsXxwS52vHtpM+3IPYntJX8QK6LASTdBU/Bxbyc/up1Fq?= =?us-ascii?Q?bTw9FPeFeVTLGZLtfokAZo8G6bbmP+J4p3G4oPaVEgQCBhOSBtO33OugttSV?= =?us-ascii?Q?Rh0NdGy4jmiL/Gf8zcY92kW6jxU3Ci/2qnWXQGnDuLXCGia/nq/VjEQDUYH4?= =?us-ascii?Q?9unHqzYzqL1vK6oLKzXew6+d2+MurhOPzZGBzRmZn9pyFx/rI01iMydTHEGg?= =?us-ascii?Q?D8bERkHi+5/vvGMNhow2SC1b6ZvpIR0qTRKoET5DwSs1xyMEgAx5BC9zj16t?= =?us-ascii?Q?u0xyyc5wAlHbJuMXuNVATNswXehgirwWvVxARKDiOHSPOy2wjGg0gZ3bFqZe?= =?us-ascii?Q?g3P0Ry3bAfV1XpxZ7QJgm3ZkKvh2KSwaGrKOj8G01EhAUYXJrqLPrp07ax17?= =?us-ascii?Q?sh1IXrIbvvpYkAjnfF0bKbvwWzk5n4BgMbKWMdm25UC2k2MKeD1DllkZ9Qzg?= =?us-ascii?Q?PIAGV4uxmMslQqskBjBbosX7XK/5aHCUoMjfq9Psbu21U0dmMHepRob3LJoR?= =?us-ascii?Q?StG7Kd+EONg5b4vhwXff3nRvF9xOXS/5+1TFozpt9IPX+LXCmJwbPDYIzCa/?= =?us-ascii?Q?mjJtS4EMjQ6WfVqSz3FZUTof?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7c77ed0-4235-486b-b008-08d94c4d9e50 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2021 13:44:10.4195 (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: GAzcY7OltfFU4fgNIyMYUknTUtC0zrLxe3c1khgZWlw9F+85crmwszyQsMBH6gGdb2kimILgT1oAln5qEwm/8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4633 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