From patchwork Thu Sep 17 07:06:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gong Qianyu X-Patchwork-Id: 518742 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 CBBF2140213 for ; Thu, 17 Sep 2015 17:20:51 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 981624B7EF; Thu, 17 Sep 2015 09:20:49 +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 6b5n-YkqS_cD; Thu, 17 Sep 2015 09:20:49 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C5EC94B6F5; Thu, 17 Sep 2015 09:20:23 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A3E204B7E8 for ; Thu, 17 Sep 2015 09:15:09 +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 inJpqPYaOOMu for ; Thu, 17 Sep 2015 09:15:09 +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-bl2on0141.outbound.protection.outlook.com [65.55.169.141]) by theia.denx.de (Postfix) with ESMTPS id 5D4514B7EC for ; Thu, 17 Sep 2015 09:14:54 +0200 (CEST) Received: from BN3PR0301CA0054.namprd03.prod.outlook.com (10.160.152.150) by CY1PR0301MB1260.namprd03.prod.outlook.com (10.161.213.12) with Microsoft SMTP Server (TLS) id 15.1.274.16; Thu, 17 Sep 2015 07:14:52 +0000 Received: from BL2FFO11FD017.protection.gbl (2a01:111:f400:7c09::100) by BN3PR0301CA0054.outlook.office365.com (2a01:111:e400:401e::22) with Microsoft SMTP Server (TLS) id 15.1.274.16 via Frontend Transport; Thu, 17 Sep 2015 07:14:51 +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 BL2FFO11FD017.mail.protection.outlook.com (10.173.161.35) with Microsoft SMTP Server (TLS) id 15.1.274.4 via Frontend Transport; Thu, 17 Sep 2015 07:14:51 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t8H7CrMk002378; Thu, 17 Sep 2015 00:14:48 -0700 From: Gong Qianyu To: Date: Thu, 17 Sep 2015 15:06:53 +0800 Message-ID: <1442473613-17374-13-git-send-email-Qianyu.Gong@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1442473613-17374-1-git-send-email-Qianyu.Gong@freescale.com> References: <1442473613-17374-1-git-send-email-Qianyu.Gong@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD017; 1:hJRXJQr4xs4tcJkarEDgyREANRQaCU2iqSOegUbvb/0q4/ShQp4veVHU+2ZdwTtmh05WVrSgcd/KAN8DtQ8ijSEQmMqMeLi8nmzadtHpLtyLI7UyWso71Ud60T0MSjGLgc6zCNZXuP/yRD/KfPe4bMkNy08VqsNyWCDpt5mkyX1ZB0WoDvRS2gMbRiwEsycQbb+kA4BFojOeNcxlfSQENd3geKnc3rS8KjUX7JWsQDdhNoPJYIetvRKwIAuFXG5Lmdn8RO8rP1pFwZ2P0yVuidDb2S8lcElrr0n+Ux+1TJ9wXrXKaZoqPGKeGmLiEKqGN829Ic1N0v7s3DS/sqB7LXiZV7eYTzb8+NhElZPOxJFx0oX1OQeEnKYtW7vZ/9z4nvsG0YA6VICeb/PqVMHSNg== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(48376002)(2351001)(575784001)(104016003)(50466002)(6806004)(64706001)(229853001)(19580405001)(50986999)(19580395003)(76176999)(50226001)(47776003)(106466001)(5003940100001)(105606002)(69596002)(85426001)(87936001)(46102003)(86362001)(11100500001)(77156002)(62966003)(450100001)(97736004)(4001540100001)(5007970100001)(36756003)(81156007)(5001830100001)(77096005)(107886002)(92566002)(5001960100002)(110136002)(5001860100001)(189998001)(2950100001)(68736005)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1260; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1260; 2:obBqn79J3Ntd77wKMcJe7hMxDx1ZpBm5GNqyPdZ3Cpdj7z9/6sU3xK9z38LhiB1wbekxPmHO9tc8q/8ufXlm5+wUkpwDR+/0kBgHJLHKUTROEpHNCT0Pb1PX7V6Kxf9bnSI7hiM+4SgRetXRKOH2VfskOA7pNMvHVp9I9IJ0Ms4=; 3:eFfhl/P2z6U2B4HpcFQgCM5llqvUfvsqzyIIb5DkARHpTFAPFHkcFlEthdvKE+zsKodcpMfI0u3UjGS2a/ven8m8CHkNTEgsW0rgZwWO0DrZJEO9h6U6MU3j6k2WQlXMVcgPpcn0fYSKlzbBmrA5WsTWUZkKPGTQ2OazAK6UdcHgf8nqONFst3nARipNO58Pl+jodI/0Re2S5YFvB4Bbz1/S20Kz945nKbNbhFy/jyE=; 25:0fVha6Tp21ZJccd2CawpyfgY5kN/ebmr+8hn2Ys9yHQOz0Dd1MunjJF0Cys8py+lqoFbSCyQp2DQqYWX9EgvUefwZ5/WhaYh0H7MscW5ibINC6X880TzOu1jS4zBKSGo9726kLi+K57bQwI2NtAVxzW/U57s8d//IEME2BbAuDg0mYj0NXEg62Wis7RZ6yndFWa+P70ZdBnwp+NLw+mwtTRLbPzBOpFcOAFDrHSWMy2bSHdmB0rOipISOnkAXlleVGXDXx46Yls4x5hyAKWyIw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1260; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1260; 20:qZGjwUwDhM2tbPLDZ9nTXYepTyH+O4zPKb1OdUOoUMzjveagh6OMe/VOiI1bZHtF9kj44PrQM55HhugH47WvHDcchZga+ZXQQdQ0ZesDiA8i1OFs+QpHLhZYzngeSK6hTKAzcBE5qXhliBgf16s9Zmb5VQ4+Eq3iC9ajmm/fFwBS0UURdF1IuIG56ipMsCjGcAWwWDmIIaopCOF8KtB79hEpXhEeqYnPbetBsR5JEwNvo9XNYxvI3RQMC1NFN0mGqo0Unsi+WOTv0NL4JglXh9nH2RdtKc8hs4ik1tFmHVMSM6FD3EFBjzpihQF0x8Z4rwRsphUOsLX+cfF2Vckq2jGtGyWSHOazNmRoFjryf4U=; 4:4UlipZ/TVnqDcj0NuxEVHIwJ5bybMmtTftf5gw6gtsm+9SkEVkIat9ORLhOodOwYOByZ2yK68dtzFQyGSCogf+esLZZt8G58I1wjmC6TmrxxiY7KNoOu3s9QVYK+dXhnMoFCSJbpAww+8x28CLxyy99KI6Bd+p7qFfEWzltQoKvt9Vz/WUFnJKQ7oJz97dxxW+ZMyjD+hdyov5BEfZ+nAX+kfE5R9QxV7JuThFOittcajWX6llqdkdf4yWs8uqFRgSdTPbf4uniuNEGR6vqfZB/ir1w9720F7GikfX0EA8tYU3q368Tjx644sGBiS7G59yDPoOUpMRAJEnszbjelxw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520078)(8121501046)(5005006)(3002001); SRVR:CY1PR0301MB1260; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1260; X-Forefront-PRVS: 07025866F6 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1260; 23:x56YUAC5anXxmI2s7x3tQYZQiwWkTIcDV10F3vT?= =?us-ascii?Q?J45IbDwMB6dG7wnEaEPX5r1k9uiy/XTaOF+luAblsGIMQA3nAcHOJ/oKoQwA?= =?us-ascii?Q?rj8OVnaYbKNbH58OVCG5d/7fTj4OXTfXm24N8cCwb8JkwhTiCj7tyebSLZRC?= =?us-ascii?Q?uCTfVOC7iZloEkBPGvTSz1LLUDQcst4qSe2TCYr5aBK2ks1TpFe2eQWaJp9K?= =?us-ascii?Q?xyA2NaoPkLD0Var2iroRkm3v2pUmP+LOE+S2kouNOmEgQmWEpdVJg0eCywcw?= =?us-ascii?Q?xTa6h6V0rcKXvo+nNJ64AHc4+2c7ScnZYVJyr2YmXLShzygcQ1RLIrUUFW+X?= =?us-ascii?Q?1qBSbzi65cGRUUpz2OUvO057HnIDi0PvEbOlYfowMBbtZGwFGYTJMEBmF6iP?= =?us-ascii?Q?ej1hRhkk+hAeI6klTtPBhMeeT86UtobZ73pY4lWeDF+lIENnIYFWAg3r3hR9?= =?us-ascii?Q?VaEbM1YaTQSJCI3WLc1xM1TTXhfc0OMSYpCxKMYMbygEERQkIHtR7brbgFwx?= =?us-ascii?Q?z4KJHMIjAJpPXmrgSStgDOHU4/TcvcaXep9zCpYxt+ksmuWM9WlpOcxCVEez?= =?us-ascii?Q?ShBM4nL1Q4eKcUhYNbHRF3Bzw69YotCujlzxprFUePVvKk564DBVWodJmKfg?= =?us-ascii?Q?arPPentyV30FkvkQauMCALsJCNoSfbiQWFJhRrZCTPTbz3L9jbuevwXewAne?= =?us-ascii?Q?7JaFZx4mTS6Ln7aFh6LJUw1G+/sI+6rl//vy7whcMHHNA6heCYrj74dEPw5x?= =?us-ascii?Q?wh6K4C+kez5o/NAH2oNgDxYu36IVlDZe04PZi/1Y2+ObYI0B/SQ8BrjGflOR?= =?us-ascii?Q?0zDK2WFCwFZxg1SDNisAeRSGm+HOBz3ojECl4FA/GtpMc8utTPHhnsDYfSca?= =?us-ascii?Q?GUQ9XMY/VOY9KpTrIyWF3mD7chnm9D5cN/ups7yiq0n67kcHVyhmO2TIywri?= =?us-ascii?Q?Rz02plfwAKavzaPLtDtQIuUL1p6rN0Hz0+LQLlUwTFOZZIxLuj8WhDrhTj53?= =?us-ascii?Q?KsfJbhpXJc0hO4fwFv5TstgoYAoN71mPiXmGoCNsk63xt3B/ykb4hBWwEW08?= =?us-ascii?Q?Jqe3KqqRhrXEV5R846CCFsZ+252JE976KQeHrr2gj0pRdq0xiJM6I7xMqNw9?= =?us-ascii?Q?Si9IK9Rm6WiCuVub12h+GJ6wYUn1HbzIkBrSxSLO24oMajY7PLH6nanSITm9?= =?us-ascii?Q?mPfIqmotPdhz2OF57A1WmAEslIQZa0ZYKuU6OKDk4yQW7yzJbo4ZprlQQgjg?= =?us-ascii?Q?96BdAvQxeSsfDsGtU6hKRAxnCU8wnbkztmjCUjrFw8ONDJoXkVjDnTMOrPcK?= =?us-ascii?Q?WFffWBDT9zRgl1wnonRvXRz8=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1260; 5:buXXxU6q2gAmBZpRNU5Lb56SW0W/rGbxapDHYWgwThfJFSQdfKMXm+PDxa/dkjWKu2du9iojbWJJQrIA23LqUUDwzL4IMM0UDIC8zGRQ0WDo+UPUsAEWyp63v4x606LjFju5ytbMpOvikO11Bh4+YA==; 24:2ZpWcJMUw7Rc3+OuWF44Yhb6h2U9tx0R7qSAO0zJ+Fya7WdIVdNEmVmP13jXVherbz0XZj6xhB3ABHXoWxvE16jBz7gyTg4KpKDkUyCirs8=; 20:vVJS1TkjDHN2nXmHFhHHE4MsYmIbFVVOYw1d5weyaiRdAIreeJ/OAZ2xqiV/yu4SvoOCbmn89JuHEMZrDSkMQA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2015 07:14:51.4254 (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: CY1PR0301MB1260 Cc: B07421@freescale.com, Gong Qianyu , Shaohui.Xie@freescale.com, B48286@freescale.com, B53747@freescale.com Subject: [U-Boot] [Patch v2 16/16] armv8/ls1043ardb: Add cpld command to boot from sd 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 | 17 +++++++++++++++++ board/freescale/ls1043ardb/cpld.h | 1 + 2 files changed, 18 insertions(+) diff --git a/board/freescale/ls1043ardb/cpld.c b/board/freescale/ls1043ardb/cpld.c index 5acb97d..faa0de8 100644 --- a/board/freescale/ls1043ardb/cpld.c +++ b/board/freescale/ls1043ardb/cpld.c @@ -60,6 +60,20 @@ void cpld_set_nand(void) CPLD_WRITE(system_rst, 1); } +void cpld_set_sd(void) +{ + u16 reg = CPLD_CFG_RCW_SRC_SD; + 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) { @@ -108,6 +122,8 @@ int do_cpld(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) cpld_set_altbank(); else if (strcmp(argv[2], "nand") == 0) cpld_set_nand(); + else if (strcmp(argv[2], "sd") == 0) + cpld_set_sd(); else cpld_set_defbank(); #ifdef DEBUG @@ -127,6 +143,7 @@ U_BOOT_CMD( "reset: reset to default bank\n" "cpld reset altbank: reset to alternate bank\n" "cpld reset nand: reset to boot from NAND flash\n" + "cpld reset sd: reset to boot from SD card\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 5f43a8a..bd59c0e 100644 --- a/board/freescale/ls1043ardb/cpld.h +++ b/board/freescale/ls1043ardb/cpld.h @@ -41,4 +41,5 @@ void cpld_rev_bit(unsigned char *value); #define CPLD_BANK_SEL_MASK 0x07 #define CPLD_BANK_SEL_ALTBANK 0x04 #define CPLD_CFG_RCW_SRC_NAND 0x106 +#define CPLD_CFG_RCW_SRC_SD 0x040 #endif