From patchwork Mon Apr 12 12:12:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan \(OSS\)" X-Patchwork-Id: 419538 Delivered-To: patch@linaro.org Received: by 2002:a02:c4d2:0:0:0:0:0 with SMTP id h18csp1659247jaj; Mon, 12 Apr 2021 04:42:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeAfpSBhNXHZ/OY2A8RwhawDpcooxgGqLOTyPTH4Sd9H9SHTIxL7cnLWeDFgo+5EzKMOnP X-Received: by 2002:a17:906:c08f:: with SMTP id f15mr27080408ejz.318.1618227767219; Mon, 12 Apr 2021 04:42:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1618227767; cv=pass; d=google.com; s=arc-20160816; b=scIX/2eCXa6wWFzLF9+VqIwDr1ALUogFc3BKYlJLrOYHegZgbU9mRsmfpAyN732K9W WJ0R0dpcq455Aslj8unmiHtVaD0L0UABbdDtT4yiJk1pC6WffW9EkG+3nISqMG2sB7XC mU13XkCd4BpnCW0VHzUt6An9eWfatzloSLDPXXR1JQAOcUZ/6wYdhURBrTBJ7ShpIv7W +i2WNR05X3khorniC8zkDqKQgis0adUO0rdzqI8NOhSLgX29GHFnKdwwXyNlPaowK2el LIQ8W9bSdwHdWDSeKenqs+IYUTd4nJt5oa0xKnAhB12b0jPltM7kHQfVxe7biNFhNz5s VEuw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=dbbE7zEZXbsnv5pTcxxXWw7UkLlH07d63Q5y9o/DOqY=; b=Plu8hx4Wnb9NqOM5PqCmybI1vdOrN8DPSBW/8R8NE9Vmi7LHpc97GYnflsexLPkphz j/OgdnuLWjkdzPSBXSSF44Wm9r4Y3/u9ZAVNZRx5vRf3dofUOeTId6+oat6gh2V5YcEf VHU+nfOg7XmFLxCRQmnZn49vxqhCSh0g1/FADhA3gwVrqgDIzVHcIgGf07n9iP4y5i1i Jex8hPlL6WqkxXDOsYa1EzXiT7dwQon3uurr8bP7te0LxSmF5dasa4pzpoeKPQZSNm78 MsciXUiKbAwCHS30zwlKjFPZdyscyK6Hk8NVp6GWe8XbpIV5ucwvrNSzZXGLWJfSqHzP 4cAg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b=RRcN63nH; arc=pass (i=1 spf=pass spfdomain=oss.nxp.com dkim=pass dkdomain=oss.nxp.com dmarc=pass fromdomain=oss.nxp.com); spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id z1si7851681edc.76.2021.04.12.04.42.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 04:42:47 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b=RRcN63nH; arc=pass (i=1 spf=pass spfdomain=oss.nxp.com dkim=pass dkdomain=oss.nxp.com dmarc=pass fromdomain=oss.nxp.com); spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2DBCF81F8C; Mon, 12 Apr 2021 13:42:30 +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="RRcN63nH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3054181F95; Mon, 12 Apr 2021 13:41:46 +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=1.0 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 EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0624.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::624]) (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 4A63C81F30 for ; Mon, 12 Apr 2021 13:41: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=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gOWfcj+HvP8eagfMZ3TbXKuFA9ZmlE7311zog9u+uIJ7kAQEtuAW1IrmD21H8TIEu46FT+iSwRG+nsxEUn68d2B8sTn7/tDVeLRJ372bgbv8pFMI2kIBoxKycWmHA/i88fTwKe4yatNxEjy0ylYAKS0qqNi+470iDoCBWgo/bpFAOCcoHaUCuoEaqcdM/TbA5OOik9v4u0RCtT2hvTbzX54YLJZm0YLltdV9gYjujaSGg48zSAmBi/pEKZoRC6QWWLxbjBEeU10/l6UPuE7mfhebOSRFVRMk7DIjevSkpXd9qY0U0Pi8uzeI+gbHeud4MUGegh5AE6b8wYSSmURuyw== 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=dbbE7zEZXbsnv5pTcxxXWw7UkLlH07d63Q5y9o/DOqY=; b=MJh4TS/3VX2WlSXmiNWq/GmRp8vnMj7+MfxCw6Ue+wR/YLCK/G/Gzrhgb4FbliVhR0lFL+ZHm18CU4HzgZIKRve+zUnR6k481Thn9gR2Ih4ZHD0XLl4GYC5ryC2nOyVspzhOUvJhhHBc/brIDZFJiWlu63E1ReVSk7DGZcvsjM3ZjvGERuv6pKcg/oOe/EuoD+4QPQXzPTSUC39HN3Bm79EPB8+IWoe7Bw4L5Jvs0YlZQoCB27hYBgGo08Y+TMPvOZZQAHDUDRIDA4GejEQRWjKlw/WHy8PPRCANkZ0benLjjZW1GeDhT+aUW/K9ZXR2SJenynVVJCEeLOtTUgCSUA== 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=dbbE7zEZXbsnv5pTcxxXWw7UkLlH07d63Q5y9o/DOqY=; b=RRcN63nHqkLWQ6MLOWr2z/N2BOmswUXYSVd9P832pNTxzNMnJvHgLEQTa8Q8WKDpkfX/R096Bv1BBhx0xv0SAq9M+awj14/OcCChmFCqj6ujs0gLQaRx17h5oj4UUlC/aU67NSG6NhpVjqbgAMHhs4fkNccyYZnULg8LP1xx91A= 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 DBAPR04MB7223.eurprd04.prod.outlook.com (2603:10a6:10:1b0::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17; Mon, 12 Apr 2021 11:41:34 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c57a:6964:f72c:21cf]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c57a:6964:f72c:21cf%11]) with mapi id 15.20.3999.032; Mon, 12 Apr 2021 11:41:34 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: u-boot@lists.denx.de, uboot-imx@nxp.com, Peng Fan Subject: [PATCH 03/37] arm: imx: sys_proto: move boot mode define to common header Date: Mon, 12 Apr 2021 20:12:32 +0800 Message-Id: <20210412121306.11484-4-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210412121306.11484-1-peng.fan@oss.nxp.com> References: <20210412121306.11484-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: HK2PR0401CA0009.apcprd04.prod.outlook.com (2603:1096:202:2::19) 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 HK2PR0401CA0009.apcprd04.prod.outlook.com (2603:1096:202:2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16 via Frontend Transport; Mon, 12 Apr 2021 11:41:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e80d5379-18ec-41d5-0b2d-08d8fda7ec59 X-MS-TrafficTypeDiagnostic: DBAPR04MB7223: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:378; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: phP7hiUYUc8ZqiJWJgFze44e0aMptIv8Qd0j1wEUUFL46RXP2fSP6R1htLO0UOzVVWTOBHLwBV0lNFfU+35W7ygHIPAFeRDid5beuThrG68u1cswll2DVHMO2wGTVZ2utoecZQz5dMNriDxY2gFlMh4c39UgwAJwjLqYyRTHnNVIviPI7OTIfNNBzchuh4X0D2anGYUA2oWDTcH0G64GbtTQDV4qGGRhWQwsARrCJYu6m17w4N2zMj+t/JbEs9goB21iL/ZmrcXkG6byrccptitBIhguNeMGfmm2rtENAf2H0xcs5r7OgYIQDr8NABhfECa7tnjvwyiuWH4L3hzQoq+5BStKUJ/cvl6BmVZDnTZjwfaE2kfTJNWShDuGU+cqEkGnJbFcEqL+/n/FZst9BgVHI8SZE2NoJe1coDhASBCLdM0Rn66f09zLK739bQIUI2qr/CQ5FKrcy/ISB+X7RNnDXwDP8oZML6EemJ20/fei/6aRGB/rgL8n1fYTKXU4mSXE+fLrIMKPPD3jpf9u8F6HzPS5aLbdWkq+AdaXHMaC/51d5dwnexeMWNNnvg44UOTQnRV85zSk2K/XSoi3kMM2flGQGnRku9g1VotjfMfQZGK96aoE+RUgAw4l0c3NjKgcfIniuVuR3lSWRUNmFwJ+CWPRRW16UfmzZjywkFY= 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)(346002)(396003)(376002)(136003)(366004)(39860400002)(2616005)(26005)(1076003)(956004)(4326008)(38100700002)(2906002)(5660300002)(8676002)(16526019)(83380400001)(186003)(86362001)(66556008)(478600001)(66946007)(66476007)(8936002)(316002)(6486002)(6512007)(38350700002)(52116002)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: r8ZoyyQPys0JXV6RVgyt+PN7FZ4oHs37zhLf23dowC3fXQLK9pC4BrQC2FCEGHKjkRvmku7+yowG8mOlff2/9HRu8oW2Yrsp6fGDHesKjPJ5xEX6JwQ1ebtZQhOZ2j8j9G05SS5gdTpBBKCGsoRHhD4UatKj6RpPwotn55pYHXxlNadWyeUHU08fvQbWIv5VsTXb3EE19N9BmzVCll6tWT+E+NbpO+C95QVShu4hhYul4dkagCizNWE/5p5RcTpo5HQsfWJIg8YOedIPlmMhza4WGITAMZ7V529OvetieAiDoxdZgIt4HsZ3R0McLUUHTFXzLPdMtKY7rP1G0EQ8SNoKQtkezoJFUPkfgZGn+VFWR5drjjIUhGWNHXXm8Qsb+nqqimsM6jlpR2kd+k/AfnhzPXu36ms3BY436SAFP65kUwft7+WlhX5Oo9M5TFbGwPCASTPjluSwESU6kTyxM3wrU6vAQ6m6Ha3s1BGZanFy7q0IxEHf7pMAy12T7gO3tt5cEsY7iDwlzv7uoQ42/xdqlb+XbvBigx81PMQMahRFT/XtUl5r83ydv32EL2NlW9MvBTD1txsZYgUscTRWzsOV6TamPkgzE2KNL5doq5+s43ScDKS27yB4aZOD49NLolg/CmMmH0+pNKG/Oc+U+/UbgOgVidjdtT7zuo359Jzd6URi3NB6TeIvH6cNFGq7jPYDDUcuBGgzUY6cGjONmMonHWvS6F85wJgTrwLMbldPTH02LGp5h4fizvMIi3MYlGv9agjYuAM9mlV2q/nTI00Ixz6v8XZVIRQGWzPVbEfZHztQ3u1Sq3Uw2PlZfVTSsM+R2MTtQDvqUFSFeKkPQ+AtlJQnvYTDTuMuuX9/QXJHSONrsstTz0sOasg+OD8Em6I0AxWRU6ui+FT/OClWtP73N2VZvxMjJGgAMsFhvzhnWSET2F85I8o4xBPqWr2I9EOn1y8Z1HzOlxdrs5jeWtFPtUxKUdThVT9tjANfNiIH3hm+dqkpb/2JtIFHsbSgmJuAyYylLbGbyGmdnaTcTwIS5IwNlNtxyuxRcPiHcACI9xBwbOPTkByx28KdyZhKlVa59XYlJydWF11V64pWyXa7K7NdqVzh6BKNbBB6LFM4pkiA4upYU2SqEZr1ozbQYUSBJuqH5XlHWnfdB84dsynmyZapx95/TPQZvuVXRxUPUBHkSwa/Unv+7bs+uOMEX241kZI/wJRfrZIrgENAp26/njwqyK7sBMHhhPm8p4M1lwmgqzdmf9RnKhACX8UcxnGt/GzId/Lyth5QQxddvBOupektlEw4OAYfvjunb76JNGqZe+dyWyJnLVf9qKTN X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e80d5379-18ec-41d5-0b2d-08d8fda7ec59 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 11:41:34.1058 (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: lpF9VOlVQwjTQh98+YisNiELUZlwXsR8ERFYQwWDemU+YjSimjwtal3FaORlmyYI+msxrbg7IcIrHjMIrowGKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7223 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.102.4 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan These defines could be reused by i.MX8ULP, so move them to common header. Signed-off-by: Peng Fan --- arch/arm/include/asm/arch-mx7ulp/sys_proto.h | 9 --------- arch/arm/include/asm/mach-imx/sys_proto.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) -- 2.30.0 diff --git a/arch/arm/include/asm/arch-mx7ulp/sys_proto.h b/arch/arm/include/asm/arch-mx7ulp/sys_proto.h index 0e4c8ad15d..0daa922fad 100644 --- a/arch/arm/include/asm/arch-mx7ulp/sys_proto.h +++ b/arch/arm/include/asm/arch-mx7ulp/sys_proto.h @@ -8,14 +8,5 @@ #include -#define BT0CFG_LPBOOT_MASK 0x1 -#define BT0CFG_DUALBOOT_MASK 0x2 - -enum bt_mode { - LOW_POWER_BOOT, /* LP_BT = 1 */ - DUAL_BOOT, /* LP_BT = 0, DUAL_BT = 1 */ - SINGLE_BOOT /* LP_BT = 0, DUAL_BT = 0 */ -}; - enum boot_device get_boot_device(void); #endif diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index ea746ae6ee..ac1ab48a31 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -174,6 +174,16 @@ enum boot_dev_type_e { extern struct rom_api *g_rom_api; #endif +/* For i.MX ULP */ +#define BT0CFG_LPBOOT_MASK 0x1 +#define BT0CFG_DUALBOOT_MASK 0x2 + +enum bt_mode { + LOW_POWER_BOOT, /* LP_BT = 1 */ + DUAL_BOOT, /* LP_BT = 0, DUAL_BT = 1 */ + SINGLE_BOOT /* LP_BT = 0, DUAL_BT = 0 */ +}; + u32 get_nr_cpus(void); u32 get_cpu_rev(void); u32 get_cpu_speed_grade_hz(void);