From patchwork Fri Sep 11 11:07:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gong Qianyu X-Patchwork-Id: 516701 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 6A3C714030C for ; Fri, 11 Sep 2015 21:14:09 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C933E4B786; Fri, 11 Sep 2015 13:14:02 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z6oKqXXvYeFw; Fri, 11 Sep 2015 13:14:02 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A8A934B78B; Fri, 11 Sep 2015 13:13:56 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E06E84B6ED for ; Fri, 11 Sep 2015 13:13:51 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MhvEBsCld2mL for ; Fri, 11 Sep 2015 13:13:51 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0126.outbound.protection.outlook.com [65.55.169.126]) by theia.denx.de (Postfix) with ESMTPS id CC5994B764 for ; Fri, 11 Sep 2015 13:13:43 +0200 (CEST) Received: from BY2PR03CA045.namprd03.prod.outlook.com (10.141.249.18) by BY2PR03MB508.namprd03.prod.outlook.com (10.141.143.27) with Microsoft SMTP Server (TLS) id 15.1.268.17; Fri, 11 Sep 2015 11:13:41 +0000 Received: from BY2FFO11FD009.protection.gbl (2a01:111:f400:7c0c::197) by BY2PR03CA045.outlook.office365.com (2a01:111:e400:2c5d::18) with Microsoft SMTP Server (TLS) id 15.1.268.17 via Frontend Transport; Fri, 11 Sep 2015 11:13:41 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD009.mail.protection.outlook.com (10.1.14.73) with Microsoft SMTP Server (TLS) id 15.1.262.18 via Frontend Transport; Fri, 11 Sep 2015 11:13:40 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t8BBDFC9023385; Fri, 11 Sep 2015 04:13:38 -0700 From: Gong Qianyu To: Date: Fri, 11 Sep 2015 19:07:24 +0800 Message-ID: <1441969648-41485-4-git-send-email-Qianyu.Gong@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1441969648-41485-1-git-send-email-Qianyu.Gong@freescale.com> References: <1441969648-41485-1-git-send-email-Qianyu.Gong@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD009; 1:A/sQDsqvJ6MBSGqmBBNqq3OYHE4m4tJgbW+2qorka6vU47eW5kv8ba9uRygSY/azxP0OeRevx+I0L+Z2P2p55PdWShetPb21Bj9L4RnbvnR3dV6GvpWFBap8MP7ZyLTRPpGVMyDA2hyWwcO0fISTagbInjdb4+ij9HTL7y99krf82IUMg75hAOWYRNaeSvfeaz4Onh6xB4NBBW0FB46bq1jARaL9Zza/V24IjoaUJUwVzXtDvA29uO1OsDfWKWVT+CGgC1U0NYBhGDa7Cj0DTRO5TiynygZx4q7TKVyF7fr8sN/GwUtC2+Ol1RXPKm3488wSyRFbs7C5jpPUMkZQZeXYzPDfh4ERQpUCUOv8Hwh1D23kUf1ISAi9XOjlosaQFspINiRAbsy53EVmaNet7Q== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(64706001)(106466001)(76176999)(4001540100001)(48376002)(81156007)(47776003)(69596002)(86362001)(19580405001)(6806004)(97736004)(50986999)(50466002)(19580395003)(68736005)(5001830100001)(5003940100001)(77096005)(36756003)(46102003)(5007970100001)(11100500001)(5001860100001)(107886002)(110136002)(229853001)(5001960100002)(189998001)(50226001)(77156002)(104016003)(92566002)(87936001)(2950100001)(2351001)(85426001)(62966003)(105606002)(450100001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR03MB508; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB508; 2:/XPPklNCCXCtXFVIs9jpry42x/9bPrW+FHX0oyb6RmeKzU84lAYqMW71+ie57hdXWE0M/meKhdWMgfgEjdQDWK01vRxzwwcyH+gwbyj8QSMCTpP91Q+2ctvnEU6Qg6Tto3hqOEbYC8WgxG+fqvLh7VntrkKRNBbxh1w5u5AOBbc=; 3:vrr8GKo88lGjBvTFTQPfo/rTuPtHGCG74S/jqcK/0F6KuzLAUb1SUI3UMgYnxFOTXve9IJ6Nc+mYbxj0zwAAHwI6FpNdRwMy+v0XDmrxBRgbYcZNXM8THfvGLAPbbFALAhkuaNvt2Ov3rjPq292wUb4ESgC+YxKsLvWiY/fU0ncUehLUuA75umQvs3Kmq1mOUdPVJffruHtzCJ39BVHbbZQ9OCK237rF1XnOjilWql4=; 25:4PvdBnBIwptEWR0Pn2OmrPqwlbVKn0xtTKtqpnE5UGZMtVJ610Une/2eHOTKxQ6hz/hBi6LaqZtpRV2f7lnkAenlbEX26/Bn4R76O59o8P9dXMr093n5AP/Bern0fxDV4lr0DE9vToqmJxYVzNz5m4e/P05biUScnGZDqzeM7NwPm5utdsaTsIisbPYa9KGJzwVHxGOM5uxx4jW/ysWRLofQP0z0M/dWY3+OLWPoJ1A0nrY+x7zRq10pSPb7SB54MBIhw9rT5dtQTwbjtH58yw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB508; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB508; 20:3QtmQXBMB5ZHseMmU0SnWwBVcyxA3PK4RmzAqmDlO6b0F9vzEcHMnF8CnRJkdIUZ/wvGVwwfu5V0/vMD33p6xi7v/nWz0OFTqa4UQweidEHUBleCkFCD2qqSyqHAcCvPeg7+su++G3HOlXabzQPmAmwOkkLcUK0FLZlV6DW+uzr/3UO8wsLhzptxH0JvdH1/JCkn+o82AhdJa90bfbiVbd3DGziMjPJuvwFl2gLhqpTHviWucWtOiVeb8z5fiZC89RUCN4mmnL03UdHAcQ9QvaBPnQwCfWfz/+z8ciAUqr+QPA2J/OGF0pDWgyF1GZMUHDTewx3yzuSDEA9nq9SxkBA1KvU7nPMTtJE0ZuHZU5M=; 4:IP56SHVnFll0XYLCL8/CdXTbqxr87eCXmRFcqja3JL4RDAzjBpvCuLSPhLEVtSS6u5DeRMELYrYcGz79kuN0LmF+rzT/c9zReAvfP6VldDu8+iYJ4pu+2gBovklei+mNOKvmYAyh7bg7XOxS4Hcb5MWDBJMxxvLG1PtunvVh5mkorTRW8VZuWle/PazP+814Pqabu/Z4TZMhDC3v4moSSjZWxDTOwCuWPglDNLwPLuK9wPJnKRBThwS/TBGPPtOo+dUye0kLQwbef5GrEtN5TvAsBYg1+09nKG7uV9wVnuGZhqXj3Mntu/+y4DwtMUiR X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(5005006)(3002001); SRVR:BY2PR03MB508; BCL:0; PCL:0; RULEID:; SRVR:BY2PR03MB508; X-Forefront-PRVS: 06968FD8C4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB508; 23:POTO4f6sV0VkLdWsO0sl17b2aNWfP3eXMFDJwLFsFi?= =?us-ascii?Q?K7ivN00/Qcm7ajRf6kMHl8/1KT3OpgNI7QRm3kVUSk1VZB0Ty5dTjZ4LhYhh?= =?us-ascii?Q?H3v+IEVvZlLUFM+6q8swbm6GFxL5jHuTyTLFvsPaILMO01MnJ5ntptNjKHf1?= =?us-ascii?Q?5F2xuIzHU/GAstlBxe+17pdXqo65pzJzm3chpcKZlyqB3R3ZGrrP8RCq3DYh?= =?us-ascii?Q?SiW9XzH72sqT5XZjZGp3iwFQf2//wMgOLEbdxJWlsjQWn2tqfaZ/Rs2QPst2?= =?us-ascii?Q?Hm9OwCTklvrLFrPSSELTNepMYkUCsZ8G1EzQTdvlsKIytq4MPpMdbgDvx/3I?= =?us-ascii?Q?HoUg47qvWI1ACL0rOQDJOE4i3v5If0+hQknIB0jRi96xoH1ZngHUOqsyYhwf?= =?us-ascii?Q?1bXIkLBmdKX4vdBc+wtA8XZEfgmLKb2QWKxEiI3e316XlFV0rLNpLoeM3Lco?= =?us-ascii?Q?tQrZDLCKkSHLqcHcP2hUEXYSGlQFEtiGZ2geWPGMZDqsAT0nJfYWOshYmmNy?= =?us-ascii?Q?1AyHiFcyLDTBXvtB2NfsBoFy+k3y1Euiv05bI9EVEuicSt7L+UDk0Sjju04e?= =?us-ascii?Q?6Vkjd1jrJUhcwyJrcU/Nc3XqdGuRM8v2Kf/v0D2Z57DvzQg3IXcMevy7OZJS?= =?us-ascii?Q?zuPU97hqbWcXRCWgyoXGc3n4F/UPs2MbDU5C+HCH/afmufvV45Auz+H+TVfF?= =?us-ascii?Q?S+oLJGnlbuez2O515R1vuy9zJ7BOxLAnSOqV9wJogAp75g1p8Js9L9jVdPVQ?= =?us-ascii?Q?3tPqeDGhj5+0VI5jqWIkbEDqzDmU7i+Zsd2gDlSofgPm+JnxPumpqOKPD52G?= =?us-ascii?Q?Hl3bsEYmjb4ff/wWDectrFnq4BjfXZqrXan6QTx9DxbTYg1nVjRPNwvpkG1m?= =?us-ascii?Q?0CvAa7orGRAevvpV/+vezhcq0oB8gyvD3zSmImzwQ75cNmaT6XPc9trFpqyp?= =?us-ascii?Q?NjVqD0gIAmmKSTW+/1PsCILiovNRyscbExIC47BVEAXCJ5zAqXvb2K8/km6m?= =?us-ascii?Q?oiWkeIRxi7Wb71QkaXfmQtUp6OifDdpTNDE587Hl6Anp/8fVXwd7mY+XNRoT?= =?us-ascii?Q?YeWnxEE9DeESDkQgkQcXPZLSfssS3qx0OPuP/ZhZ5Y48/Y7El8UXYTDq0Ep8?= =?us-ascii?Q?My6ZenR56O7xLx7GgkFnZ3guswW9q0ZvfajBp7d4EwR1vebMm6e44LHai1vj?= =?us-ascii?Q?OFdlVk4fkTnLpLOzgl+vJTkhmBoGD6sNcLHpqInW9F6JVPIGzKggvRUnO+DL?= =?us-ascii?Q?4llWF4o25rQbOBiuPmryAuKJ2QlSccJzGgC4uxj+KzcXacrUiw58HWBhYuIw?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB508; 5:kXTbOoOV4lYdAskL9dx+Hk/NQR9LCDws0+ob3X8Qy7+Hc/bKVv3xS6IElsxLo9jgqG7nTkmZl60BfS/9eVlU3uKMoBvEGZpDJCRusv/IFkrWBLxIs3WP/nbq0btjFzXVNqUzSeofT5yIjnF1ITmt3w==; 24:FTJ7VbwtRp2oA9TtDjg4RsBxZaFHfVlokbspiirHrLgD115Qfsc/WO3cI3k7xqEBuUU/LLOLvl+Kno6jVRSxCM0VTssvDzMqHAysYI/cBvc=; 20:sWTMMnvv1ysyihc//RhgWhx5pVSkdu+xlWqWclQOSpaPcuz/k1JwVosIWxNi/AX9TIwcHthl59kqAvxRrWjozA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2015 11:13:40.3915 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB508 Cc: Gong Qianyu , b48286@freescale.com, b21284@freescale.com, b53747@freescale.com Subject: [U-Boot] [PATCH 10/14] armv8/ls1043ardb: Add cpld command to boot from nand X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Signed-off-by: Gong Qianyu --- board/freescale/ls1043ardb/cpld.c | 18 ++++++++++++++++++ board/freescale/ls1043ardb/cpld.h | 1 + 2 files changed, 19 insertions(+) diff --git a/board/freescale/ls1043ardb/cpld.c b/board/freescale/ls1043ardb/cpld.c index 3f1101e..5acb97d 100644 --- a/board/freescale/ls1043ardb/cpld.c +++ b/board/freescale/ls1043ardb/cpld.c @@ -45,6 +45,21 @@ void cpld_set_defbank(void) CPLD_WRITE(global_rst, 1); } +void cpld_set_nand(void) +{ + u16 reg = CPLD_CFG_RCW_SRC_NAND; + u8 reg5 = (u8)(reg >> 1); + u8 reg6 = (u8)(reg & 1); + cpld_rev_bit(®5); + + CPLD_WRITE(soft_mux_on, 1); + + CPLD_WRITE(cfg_rcw_src1, reg5); + CPLD_WRITE(cfg_rcw_src2, reg6); + + CPLD_WRITE(system_rst, 1); +} + #ifdef DEBUG static void cpld_dump_regs(void) { @@ -91,6 +106,8 @@ int do_cpld(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (strcmp(argv[1], "reset") == 0) { if (strcmp(argv[2], "altbank") == 0) cpld_set_altbank(); + else if (strcmp(argv[2], "nand") == 0) + cpld_set_nand(); else cpld_set_defbank(); #ifdef DEBUG @@ -109,6 +126,7 @@ U_BOOT_CMD( "Reset the board or alternate bank", "reset: reset to default bank\n" "cpld reset altbank: reset to alternate bank\n" + "cpld reset nand: reset to boot from NAND flash\n" #ifdef DEBUG "cpld dump - display the CPLD registers\n" #endif diff --git a/board/freescale/ls1043ardb/cpld.h b/board/freescale/ls1043ardb/cpld.h index ea4efd8..5f43a8a 100644 --- a/board/freescale/ls1043ardb/cpld.h +++ b/board/freescale/ls1043ardb/cpld.h @@ -40,4 +40,5 @@ void cpld_rev_bit(unsigned char *value); #define CPLD_SW_MUX_BANK_SEL 0x40 #define CPLD_BANK_SEL_MASK 0x07 #define CPLD_BANK_SEL_ALTBANK 0x04 +#define CPLD_CFG_RCW_SRC_NAND 0x106 #endif