Message ID | 20210325093036.3270101-21-peng.fan@oss.nxp.com |
---|---|
State | Accepted |
Commit | c6d5809fe42b08675b99fc6e4651e4cb24a2e391 |
Delegated to: | Stefano Babic |
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: 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>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=coYXgFOB; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4F5g2l5VP2z9s1l for <incoming@patchwork.ozlabs.org>; Thu, 25 Mar 2021 20:35:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4036D8291D; Thu, 25 Mar 2021 10:33:34 +0100 (CET) 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="coYXgFOB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 75C65828EE; Thu, 25 Mar 2021 10:32:48 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on0618.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe05::618]) (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 039668285C for <u-boot@lists.denx.de>; Thu, 25 Mar 2021 10:32:43 +0100 (CET) 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=R7vY9AzRq/niVq5vQ3J5ZpfilVHn2qr3tIEvpqN676l1whZ/989zrw3Gq7sTX5nbfgw/pdaDW8kACJ3uUhjhWvgsfdvuQgQ02CYxiqgo4eOoJsRrMMlENNukllwoVSlrdByA9XQTX70jMfRd+PkNjNJYtwhTr/ZyFMPkCPhJ9qg9wBSg4gC1aqlpWWk2yIqT0ey7EImtw02iGuV36vX4gjEcb08wf37+9G5QuzZ9C8TKrbxs0vh65OHEY1GnFGYLBLdRbUHNlWAWpHCsTAF8w1RW/EeMpOqy4bTJvmgItvkavmswyxmqBhmePaAKhmG66noPmjD1A4hpYVJo5OWBxw== 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=cd8XLiru1v50rUjh8U6IByb5ypu/i+bTwIcF2GaaFvg=; b=B/qgY0Irtd7PMoxoYKTM7Sn/RxHT7tt6kmLFgCFMUSNbPG/dQa+RZnFQ7yTEnK3RgLjhGIs68n9wQRJpF8IfHjzGjsxrbYleqUECZDuTKxt+KtmmzV2YlyqlGJAp1vDBCu8LCnzOCgxWvJ5QIfgXFd3ejhhCdXLmJNU7PxpgtO+q5eN5c4O/JUkfY5q4wRzZkVDeNQPmxXP7HyiXflEeO8VnVPFeWufFodZeXFayhjno3GHz4/lHRzaWsjllJ1K6gR+BbtABpYIdWB3T+xsA9W7FNYUKJ6+iNs0/0/ksxFIpesrsQa0q/ARFu4P0eHv7HLJQB8qkL4AMO2nRbdQvjQ== 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=cd8XLiru1v50rUjh8U6IByb5ypu/i+bTwIcF2GaaFvg=; b=coYXgFOBIXclS/AoCrayyDK+mJAsIpTFtuST6GSnWqBRb3vqHRNiWNAJD2crDY+FqNInhgJ//y3oOU991xLPoItYpbTIJBlDBEI6PIcvmo94ytWP8XDOlrTPIPZRMICgpVUs+TXnWbNiQzDvUjmV0487VEanfF5md3sC0PmV32g= 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 DB9PR04MB8316.eurprd04.prod.outlook.com (2603:10a6:10:246::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.24; Thu, 25 Mar 2021 09:32:42 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0%9]) with mapi id 15.20.3955.025; Thu, 25 Mar 2021 09:32:42 +0000 From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Breno Lima <breno.lima@nxp.com>, Ye Li <ye.li@nxp.com>, Peng Fan <peng.fan@nxp.com> Subject: [PATCH 20/37] mx6dq: hab: Fix chip version in hab.h code Date: Thu, 25 Mar 2021 17:30:19 +0800 Message-Id: <20210325093036.3270101-21-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210325093036.3270101-1-peng.fan@oss.nxp.com> References: <20210325093036.3270101-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: HK2PR0302CA0021.apcprd03.prod.outlook.com (2603:1096:202::31) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by HK2PR0302CA0021.apcprd03.prod.outlook.com (2603:1096:202::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.16 via Frontend Transport; Thu, 25 Mar 2021 09:32:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a5708765-9312-4ace-326e-08d8ef70f092 X-MS-TrafficTypeDiagnostic: DB9PR04MB8316: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <DB9PR04MB831648AF7C77DAC7B2848A03C9629@DB9PR04MB8316.eurprd04.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:415; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6NcbjeNOfbHTbX7ZyG8vLlOLoqdeQ69aLaonhkmCgSI7tOg2p7Qud7cZ/9g8wDDVTq58/pmcZXj8kMkqhg2jjFmLPBdcuNTLsj7TgIifS0R1WHBpULiuUUcKJVTAhXJZnwAWDpSPlGrMejLNfvh3JX553bSVlOy5WQc973d8CfTnFx7K0obzeiIX8LSkvpofUaXhTPZqL74vsXvs46PM0OB2uWYJB31ard9vvJGCUqAU9e5ICFVuaD3lzuOPbOE4esdWcqzmp71dDep834WSW1ePFljF+oAQ2wvFue+0eQ2jWSDifGAcqk02Wv7bdLIY/YOp2PgNeaA74/RNikp4GGls/klwVlBmJRW2Kol6Wh8HJLG2LiValaed2Qic80O3K94Oycc9sPK6QxPtEl/7Ax50K8z0RyCLPPTbc2jHEQ8nECzRw13mIe8xdZ73yQOJJwdttKKebV1fQAitlYJ99NOqgE55LE8GBkPrvD2WZMZeImVJmCM9+loY7jqQJfT/mUviUeVvPXtWuKr0g9flm9k1kS+LRg0O1yIoZKc5ac6b+B+3yimIJ4s2/auS7Z3r91mYPQEt25qane0mHD1KWhfvYcYck2fTXhtmVE735orrWR3xg8vaYpqcTGq27yNfqkgVDrZIxvGPIU+D2u43wFPe80OaBup3WpAJ8MBJDY5uaW/ljp0VKOwISNzR8bTMWl0lJVkXSfZyASFscFQCF2KqHaYQFIC9uLsM9CHnbeM= 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)(346002)(396003)(39860400002)(366004)(376002)(26005)(6512007)(2616005)(186003)(86362001)(1076003)(6486002)(83380400001)(69590400012)(956004)(6666004)(16526019)(38100700001)(5660300002)(8936002)(52116002)(66946007)(478600001)(8676002)(4326008)(316002)(54906003)(66476007)(66556008)(6506007)(2906002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: G0Qg6GzpIw9J8E8E/ZdLZPyqdEerzevw0dH+J0fTJFqk5mmBEg5U8thV4r2NaqHhY7OejP3BZ4yRtOJbqaoVrEB4FFfYbIDGP3n5n3KPyVqp87m3eJan4HagGu0DCtJG8+pZ5+S01U2mHpPyYhhMZ1VRqNxEXsdom7KcRHBj9XWWsZ/FGGYmScRl07Cm2bAUelgm/DVNUBsGvTU4YaBF8jofyEPP3U1mOFsBEbXRW7Q07N2+674v+FZNdFis9lg6Y2l/2KouIzhcRaqaXs3N1RVUo7tKP/WByno2fXcOO4tVnm3F6dcg66TSk2jmaU1pDearfCZKeIuUmKZnwL4Zhsyb8yUVz4hP6Qq4upWNfBibeOFH5C5KPPRjjXh+rllQW56LXScRASBFT6el2i+5pXYIiaoLSJkMqlNeOic2KX04pv3JmG4g0G8HF4G58xVsR7ZGCxWSlp0xemeMihNskg8JxdNNQIvRxLAjmf+c88pZ8a99Id9Rc5JpQraA4XGMyN2/WRMDLFqaH2EldjCfcw2SRppRC/RrbHaLpH9azrP3zKvwBzvClVPOmkZ2DqKTeRC94RaaCM7tbI1uUVpCsaW3nuXBK5o6iZw6dipvWXWLMnjH6oVA8Vw0e7p83SN3ydH6vRGpjc4IBQ4SeCK5BiJg4TlUEYKrngTHPBOXMWCleVmSVrfHT44ww05n4XaQdbYIE8Vf5cPjm5jA1BUOwJNnncosIKvjCKBGskMdQCbHMD6qek3YooL1vZQ/WXu/amQ2QLRZBMHyBJ0VRXBu+XYos4F15xbqDqyECcsmbQgP3gal5DAIeoAlAHtd9OSuJZ9ndN+BSEU+bhE/fFbB07W9h6Ymt5WiT/+/oXaHsTGGTOtbmyBkBTJe+9u18QEuELFuGb+98RCc3IF74UDPc+9YSSxCFyO0GWBxWZ7ldb285hSkT8jUpMmcpkcyYJTytR/Fihq9aGixHKJD8uPFYLkueTZYA9ZSyYWQrabSewJUT4kITZXH5QQIUgpvxr/6ZrZDZjnHWTb+JVNZowkBAMwSB4xN7ONAX+ucObOa2xHD0dEUubu758VBjEDjwXHfm8Iv+q4+1qyyi/vD46CUmkeVcrsBim/2agh4lEQbEZ9IEvVCNxs+mwwQevyYTofPRwMMJnWIOJAqD0/i3dnd29An7C7oHAO5dMUtCfbTK/beewupeCM9Rc6JzNEPsfxZDagviUqoTiemzlWbcXUgc1DJMDDbsvlpIRU8l9wsa4a0Kz7jaykr4mgx0jzbFkt3zVvRuRNgE7UNXPno9la8aj/NIXxmGyG2VV0U8hRCsZRXdCXM5uQ5iHgynlpTnr7RkqnlLQSezV7RwtlZEXeH5g== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5708765-9312-4ace-326e-08d8ef70f092 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2021 09:32:42.7942 (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: EWaQTa4ejZwnXWTOF68R/rvqOkxvctzfivb7xxIrRcxiCAyONdDvA92so/C1LmkmwhFsm8p60MBZmYexfVp3Cw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8316 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.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
imx: hab/caam new feature and update
|
expand
|
diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h index ef090eb2f2..bb13e07b66 100644 --- a/arch/arm/include/asm/arch-imx/cpu.h +++ b/arch/arm/include/asm/arch-imx/cpu.h @@ -62,6 +62,7 @@ #define CHIP_REV_1_0 0x10 #define CHIP_REV_1_1 0x11 #define CHIP_REV_1_2 0x12 +#define CHIP_REV_1_3 0x13 #define CHIP_REV_1_5 0x15 #define CHIP_REV_2_0 0x20 #define CHIP_REV_2_1 0x21 diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h index d63b85378a..2abf28ea45 100644 --- a/arch/arm/include/asm/mach-imx/hab.h +++ b/arch/arm/include/asm/mach-imx/hab.h @@ -195,7 +195,7 @@ typedef void hapi_clock_init_t(void); #define HAB_RVT_BASE_OLD 0x00000094 #define HAB_RVT_BASE ((is_mx6dqp()) ? \ HAB_RVT_BASE_NEW : \ - (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ? \ + (is_mx6dq() && (soc_rev() >= CHIP_REV_1_3)) ? \ HAB_RVT_BASE_NEW : \ (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ? \ HAB_RVT_BASE_NEW : HAB_RVT_BASE_OLD)