From patchwork Tue Apr 19 15:19:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 612206 X-Patchwork-Delegate: sbabic@denx.de 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 3qq7xl62hsz9t8R for ; Wed, 20 Apr 2016 01:20:43 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 943ECA7616; Tue, 19 Apr 2016 17:20:41 +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 qZwdxUbHfqO5; Tue, 19 Apr 2016 17:20:41 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2F505A75DC; Tue, 19 Apr 2016 17:20:41 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 36BF2A75DC for ; Tue, 19 Apr 2016 17:20:37 +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 SCJw4d3S-e_p for ; Tue, 19 Apr 2016 17:20:37 +0200 (CEST) X-Greylist: delayed 95020 seconds by postgrey-1.34 at theia; Tue, 19 Apr 2016 17:20:32 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-bn1-obe.outbound.protection.outlook.com (mail-bn1on0062.outbound.protection.outlook.com [157.56.110.62]) by theia.denx.de (Postfix) with ESMTPS id 1DDACA7498 for ; Tue, 19 Apr 2016 17:20:32 +0200 (CEST) Received: from BN3PR0301CA0041.namprd03.prod.outlook.com (10.160.180.179) by DM2PR0301MB1229.namprd03.prod.outlook.com (10.160.219.18) with Microsoft SMTP Server (TLS) id 15.1.453.26; Tue, 19 Apr 2016 15:20:30 +0000 Received: from BN1AFFO11FD007.protection.gbl (2a01:111:f400:7c10::135) by BN3PR0301CA0041.outlook.office365.com (2a01:111:e400:4000::51) with Microsoft SMTP Server (TLS) id 15.1.466.19 via Frontend Transport; Tue, 19 Apr 2016 15:20:30 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD007.mail.protection.outlook.com (10.58.52.67) with Microsoft SMTP Server (TLS) id 15.1.472.8 via Frontend Transport; Tue, 19 Apr 2016 15:20:30 +0000 Received: from fabio-Latitude-E6410.am.freescale.net (fabio-Latitude-E6410.am.freescale.net [10.29.244.192]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u3JFKS9V030345; Tue, 19 Apr 2016 08:20:28 -0700 From: Fabio Estevam To: Date: Tue, 19 Apr 2016 12:19:52 -0300 Message-ID: <1461079192-1468-1-git-send-email-fabio.estevam@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131055528303893433; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(50986999)(5003940100001)(6806005)(50466002)(81166005)(110136002)(36756003)(4326007)(189998001)(11100500001)(48376002)(87936001)(2906002)(1096002)(47776003)(1220700001)(586003)(5008740100001)(19580395003)(19580405001)(86362001)(33646002)(50226001)(77096005)(106466001)(104016004)(105606002)(92566002)(229853001)(575784001)(85426001)(2351001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB1229; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD007; 1:M1/yzK4f9Kwsglv5NZpnORRsKoY/hYYTe40KMTcyvqtiZakhPEbxFUZ4DdPrMd1VRY38o8oX0op4ygv+fpdHhb9ItVYoeXCmy2SW2fiLpgoDjOBbPnTy7uJFahTf1oBkUsD/4Mxg63IlmAMxg22qAUufgIFxwOnvr/+YS7Dkhn4Zy3laFqpl8osHNNqBIZK6TWRs+PbQb+X4i5KdfDsEtMHh6hri+HP+GLaLAK/q23LH/1U8UtgPAjv214KvMjn5HM47JA9qFDqakIvPpduTiqCqCYFEYY+7A+a+SOxgWtWCbY0pBZyTz23zpLMbBRH1ImT21s76Gk+8MPfSHRMjRGSSJtQw75OA8VjB43k5YqpNgs9gpGMZ9PemwyLCPNSKnwyIekp14GhbrcTUDkFz+hylsKNl30hxH34A7tj+rDlA6mZks92JRDkX737uZFSDifSfAz+2NHA3/aHmecg5YKJXa2I3dGwSj+ZsaHEd6/tM8+IUBsuSjjKKhBoRsC+P1wM9p3Sl+epWIQ3yOywwfBlxDuvRC1Nwb/nuh2lGWDUtkbzsp9bLMMp1ooqrWt9iuT51qm6slHpDPfqIEU8OE/6vW3hz9Mb7NqJ8jhejaLFuak64YSFdk9ivrFgypy69nfbiirCOnAa2nvOwLCSFj5aXEF5TRRYjW4d8kETTDZAiWdOI6y4KMZJzWMbNXMTd MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 82e4e336-a375-4f55-9bb9-08d3686624de X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1229; 2:4OhZNcgi932EXcpvksfuDepp8yYTe9wrfSeh8LsPja+1lVbHJsTEkgBsnGd+YmKwR/A+uvDKcGPY4aOquuVzEpxwDL9AzQ7mbsFek2rgeSEAhVCb1r1pFT+LW14B8yTOC8B0KFs+Dd+k/cikbRbM552OAqs3q8U/VaKeMtFvdQWQf2czz+66ZCM30wJBQil7; 3:X5S3j8CEvvG0HyoCopWZx/PGsLYCIgr1bPplMoWHWaeHPRVlIA1JMDJxd8ey5X2zI6OF+G9vbY+LEMcLC5TT0SpA0/5otnTTz+dPYAqSdzEkAKFH1TTkkWTnAFs5SnTV97WKhqTr1yirXn/rj4RhbvYvoRaSSAZIEEJpdA8+UwjQr76uwkq0wxS4+f5bSAH4ovlyrxEfZt9Yix6VdLHt7Vi0AOJ9ONF/zShrfSdVJZ4= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1229; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1229; 25:+hwBfi65BuLF1QgsWbDufoXquTgr9bh+Ywsz+HlF7D3CpLHGLLloBaiNyt2mXJd6uO6o02B8YFm2lqbC/cILisku/M+j1YYu/dVh+DZoNhZl+IAAVeBP5uLGKlHyt0psoMekM/KSC+oDbANWzoCW2d3vKc7bh3XzxlWFKLNYSj5XCc7VwaUPe2h0Yb3DELC8/aTg4Ki/5JEl7knc8GARnOq8dBX9lTXuNZsKdgTyJYURFiTJERwujwCBnKNVM1d00+b6qyoTMuls2136srsfL/E5RZOWWxh1fqukJfPofECyRp+ik25ehuNa0O72ulRTR25zDuUTkudweAQuLS4jjq8OJgHXcdAIslb/g/By0aqTdno8JXl2DgFMr3Nlikjpb+MeQb8LOuPX6XNySyiYCfeUyeU6DxGzQoBTrsN4tg5yCic/0gKDV3rO4YJ8oLKrcpv2Mi7tE3deQyfrohI17gDkNi7ROR020zH3ArMqrv/5DQy/ZyEBPXYEJX89nIXtCr91uTJdb51dLIubon5Dn1EWZYMInI+wT6RCK8uIL0nskZ9CsCEA/VStLAv/9xYvi9t+H3iQdAs0XISiKS0ZwC09ZDVv6aV/P43YhmH6ZAy5KR2yC7JIEN7yYPDiptSFfhA2zlogfokDDCgVQUdVr7QIq9zTk0TgylkP0zpxglM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(5005006)(13015025)(13023025)(13017025)(13024025)(8121501046)(3002001)(10201501046)(6055026); SRVR:DM2PR0301MB1229; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB1229; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1229; 4:rlR5w2yZy8jFMvLAuE6lI7PJhpIAMZZn31s6sUXD3kjocRwV9/513TCn/jv6+2EPfPWSCkWbFcPUUiPtyjU3ewHAqWHK/0O+7t8tcTbl1rbmxi4hh23XKnKBJjzcpUb7qK9F/2mQduhzRbtXMnnOzLhVBnWI3IPlzLU/4SHe4pQ3dhYllQKktJLYzDALFsRLbTHt3j29bYeOExAmJoqYeBRWXkzf7rFM+cjEEslhTuN3q56suGpEfoS2QFbfJdXFDxnMW/h9ObM7ft0Xmn6Z3EnoiV1ytVxwOj/+xHBclJqD2L0VylNFqFBTpw3LRxAMez7yhaLFEkB7Z8Ub4WuQgEegZ7A+q/Urg3xJ1OTLAgCwqGQPYWGSrnsUZPNsO8mx+SdEAwpD8e/ZDzTftGoy6tCdjqYe23oKBdbaeW3V9+bSwymSBVcmqQiNfE6vM/XcV+kISFTttfpsxaEQQ+GvEQ87prs4N78ubBg5c5R/07k= X-Forefront-PRVS: 0917DFAC67 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB1229; 23:efW2XSmxnd2Q8WgN7NfWI7WQG8f5ZsBgcxID5jf?= =?us-ascii?Q?juCKwHHp/vWC3T8KE56d+T0KBuSNQUya63P5h0t7B4zCrg5ay7Z/FXiyj44O?= =?us-ascii?Q?uIeM5JJmrqJcHOD/lTIxSjirDlBAJT2AVtYZe9KMx5Z3U1ViASYcTsT7eNLm?= =?us-ascii?Q?o2YNkkghjJh4D8u1YNp41vK/bFwMG5hSbz26LHEIv/r8qJxXXmCxzg+bEnhh?= =?us-ascii?Q?XNE5hs2wR9EBGGPECFbAsyH7Asr98ALSfD9AzjpoUvQsr683G0GKk+vIcTKO?= =?us-ascii?Q?45vxoWFyF5Ed9fmUI4TvSbZr5dIa33LtM3ewXi32DmvVgvQfo+ggSkPmJhXf?= =?us-ascii?Q?1O6YNjISwia0Yo7R7CGcYdtjpFXR2ZJlF9mty0rX42wpGJu8F03GXGsBTf8Y?= =?us-ascii?Q?3rT2A0BwpmEW1SRzssbp31IJrsl2RENVoA8mUG0Ybt3/PE/BQQlO9R3ExrVa?= =?us-ascii?Q?mBmLpgpIf6CAXmvziCcPBRYjDejX74vIYmdIjKWtft8DQj1cVujipvJNJXgb?= =?us-ascii?Q?EDfB7YqCt2JF8SlOzmvgr9Y/KwDlvR5H0UFRx0KXb00vusSq/e9RiGcVW3BQ?= =?us-ascii?Q?fmsfylEDW7zgoYraNFCBYfsWWkgZgE3lOgsbJzJwZXERcC+P1Hvx04GuHG7C?= =?us-ascii?Q?7Q+HijSAtYnUxAP1uP+ILnXYH7XSySv6r3vTN+5wSRTRHSnxskmO2ghXvpkS?= =?us-ascii?Q?nyfsbG6a37cEeD4DGF4dpeQzEVuxz1yE3wCBG69MIDjsyLkTgHncR1fII5Mh?= =?us-ascii?Q?HtDpd3ARynBB96zcB9N3eM34+yZfyo/KS7lCV7DQdqwBy6oFqiMVEkg4aM+I?= =?us-ascii?Q?jYH8xunAm3Ncn+/acYiiFRvylNE6pr7xXIFl3lnyw2s0cemvKcZ/M9piCvoG?= =?us-ascii?Q?nw8WrPIl+S882rrk0PU+lCh44d8EqCsCvY/SL8bB93+DAZKg9+qIMiLlfzQQ?= =?us-ascii?Q?KJK2omfU080l7KmmN1oScN3DbQRKFfzFoWgQx0Td6zOxd+gZVBQZ0xW6wFCw?= =?us-ascii?Q?9Kr9Cncc2dV3lUq6c0tyv54fJBk2Gsf3M9T1cruIQKVjh5g=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1229; 5:qB8QL71aoF45XCqVaBzZOKTRD5M9gvfcK9iMCEtcES8BuRQr4+nTWAhDt2G1BlIU1Dk/3I7RiwWMVb7QiXTT/ZqkCZSzx36Y6KrfyKfMxdF5VLgs+WwZIBQYrbR5mwDELs3lfi6gqlCuxHlD3zuqwovJFEdtRcyW6qIyRVqOzVc=; 24:AXwgPj5s6fmGn32U+P6XTmr2W9ZKbILJAG3ZpEsPqZvgJB33+49F5ufYwA4nrEsbK32yYGlbkxQkW+eJeIrj6Nc1YU4ArNhlM8f6CEryCm4= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2016 15:20:30.2177 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB1229 Cc: Fabio Estevam , u-boot@lists.denx.de Subject: [U-Boot] [PATCH] mx6ul_evk: Remove SPL support 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" Currently mx6ul evk fails to boot with some SD cards such as SanDisk microSD HC - 8GB: U-Boot SPL 2016.05-rc1-28384-g108f841 (Apr 19 2016 - 11:19:11) Trying to boot from MMC1 spl: mmc block read error SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### As a proper fix for SPL is not available, change to booting via non-SPL mode, so that we can have always have a reliable boot. Signed-off-by: Fabio Estevam --- board/freescale/mx6ul_14x14_evk/imximage.cfg | 88 +++++++++++ board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 172 ---------------------- configs/mx6ul_14x14_evk_defconfig | 3 +- 3 files changed, 89 insertions(+), 174 deletions(-) create mode 100644 board/freescale/mx6ul_14x14_evk/imximage.cfg diff --git a/board/freescale/mx6ul_14x14_evk/imximage.cfg b/board/freescale/mx6ul_14x14_evk/imximage.cfg new file mode 100644 index 0000000..f413753 --- /dev/null +++ b/board/freescale/mx6ul_14x14_evk/imximage.cfg @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * Refer docs/README.imxmage for more details about how-to configure + * and create imximage boot image + * + * The syntax is taken as close as possible with the kwbimage + */ + +#define __ASSEMBLY__ +#include + +/* image version */ + +IMAGE_VERSION 2 + +/* + * Boot Device : one of + * spi/sd/nand/onenand, qspi/nor + */ +BOOT_FROM sd + +/* New DDR type MT41K256M16TW-107 */ + +/* Enable all clocks */ +DATA 4 0x020c4068 0xffffffff +DATA 4 0x020c406c 0xffffffff +DATA 4 0x020c4070 0xffffffff +DATA 4 0x020c4074 0xffffffff +DATA 4 0x020c4078 0xffffffff +DATA 4 0x020c407c 0xffffffff +DATA 4 0x020c4080 0xffffffff + +DATA 4 0x020E04B4 0x000C0000 +DATA 4 0x020E04AC 0x00000000 +DATA 4 0x020E027C 0x00000030 +DATA 4 0x020E0250 0x00000030 +DATA 4 0x020E024C 0x00000030 +DATA 4 0x020E0490 0x00000030 +DATA 4 0x020E0288 0x00000030 +DATA 4 0x020E0270 0x00000000 +DATA 4 0x020E0260 0x00000030 +DATA 4 0x020E0264 0x00000030 +DATA 4 0x020E04A0 0x00000030 +DATA 4 0x020E0494 0x00020000 +DATA 4 0x020E0280 0x00000030 +DATA 4 0x020E0284 0x00000030 +DATA 4 0x020E04B0 0x00020000 +DATA 4 0x020E0498 0x00000030 +DATA 4 0x020E04A4 0x00000030 +DATA 4 0x020E0244 0x00000030 +DATA 4 0x020E0248 0x00000030 +DATA 4 0x021B001C 0x00008000 +DATA 4 0x021B0800 0xA1390003 +DATA 4 0x021B080C 0x00000000 +DATA 4 0x021B083C 0x41570155 +DATA 4 0x021B0848 0x4040474A +DATA 4 0x021B0850 0x40405550 +DATA 4 0x021B081C 0x33333333 +DATA 4 0x021B0820 0x33333333 +DATA 4 0x021B082C 0xf3333333 +DATA 4 0x021B0830 0xf3333333 +DATA 4 0x021B08C0 0x00921012 +DATA 4 0x021B08b8 0x00000800 +DATA 4 0x021B0004 0x0002002D +DATA 4 0x021B0008 0x1B333030 +DATA 4 0x021B000C 0x676B52F3 +DATA 4 0x021B0010 0xB66D0B63 +DATA 4 0x021B0014 0x01FF00DB +DATA 4 0x021B0018 0x00201740 +DATA 4 0x021B001C 0x00008000 +DATA 4 0x021B002C 0x000026D2 +DATA 4 0x021B0030 0x006B1023 +DATA 4 0x021B0040 0x0000004F +DATA 4 0x021B0000 0x84180000 +DATA 4 0x021B0890 0x23400A38 +DATA 4 0x021B001C 0x02008032 +DATA 4 0x021B001C 0x00008033 +DATA 4 0x021B001C 0x00048031 +DATA 4 0x021B001C 0x15208030 +DATA 4 0x021B001C 0x04008040 +DATA 4 0x021B0020 0x00000800 +DATA 4 0x021B0818 0x00000227 +DATA 4 0x021B0004 0x0002552D +DATA 4 0x021B0404 0x00011006 +DATA 4 0x021B001C 0x00000000 diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index 88d3fbd..4de5ece 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -703,175 +703,3 @@ int checkboard(void) return 0; } - -#ifdef CONFIG_SPL_BUILD -#include -#include -#include - - -static struct mx6ul_iomux_grp_regs mx6_grp_ioregs = { - .grp_addds = 0x00000030, - .grp_ddrmode_ctl = 0x00020000, - .grp_b0ds = 0x00000030, - .grp_ctlds = 0x00000030, - .grp_b1ds = 0x00000030, - .grp_ddrpke = 0x00000000, - .grp_ddrmode = 0x00020000, -#ifdef CONFIG_TARGET_MX6UL_9X9_EVK - .grp_ddr_type = 0x00080000, -#else - .grp_ddr_type = 0x000c0000, -#endif -}; - -#ifdef CONFIG_TARGET_MX6UL_9X9_EVK -static struct mx6ul_iomux_ddr_regs mx6_ddr_ioregs = { - .dram_dqm0 = 0x00000030, - .dram_dqm1 = 0x00000030, - .dram_ras = 0x00000030, - .dram_cas = 0x00000030, - .dram_odt0 = 0x00000000, - .dram_odt1 = 0x00000000, - .dram_sdba2 = 0x00000000, - .dram_sdclk_0 = 0x00000030, - .dram_sdqs0 = 0x00003030, - .dram_sdqs1 = 0x00003030, - .dram_reset = 0x00000030, -}; - -static struct mx6_mmdc_calibration mx6_mmcd_calib = { - .p0_mpwldectrl0 = 0x00000000, - .p0_mpdgctrl0 = 0x20000000, - .p0_mprddlctl = 0x4040484f, - .p0_mpwrdlctl = 0x40405247, - .mpzqlp2ctl = 0x1b4700c7, -}; - -static struct mx6_lpddr2_cfg mem_ddr = { - .mem_speed = 800, - .density = 2, - .width = 16, - .banks = 4, - .rowaddr = 14, - .coladdr = 10, - .trcd_lp = 1500, - .trppb_lp = 1500, - .trpab_lp = 2000, - .trasmin = 4250, -}; - -struct mx6_ddr_sysinfo ddr_sysinfo = { - .dsize = 0, - .cs_density = 18, - .ncs = 1, - .cs1_mirror = 0, - .walat = 0, - .ralat = 5, - .mif3_mode = 3, - .bi_on = 1, - .rtt_wr = 0, /* LPDDR2 does not need rtt_wr rtt_nom */ - .rtt_nom = 0, - .sde_to_rst = 0, /* LPDDR2 does not need this field */ - .rst_to_cke = 0x10, /* JEDEC value for LPDDR2: 200us */ - .ddr_type = DDR_TYPE_LPDDR2, -}; - -#else -static struct mx6ul_iomux_ddr_regs mx6_ddr_ioregs = { - .dram_dqm0 = 0x00000030, - .dram_dqm1 = 0x00000030, - .dram_ras = 0x00000030, - .dram_cas = 0x00000030, - .dram_odt0 = 0x00000030, - .dram_odt1 = 0x00000030, - .dram_sdba2 = 0x00000000, - .dram_sdclk_0 = 0x00000008, - .dram_sdqs0 = 0x00000038, - .dram_sdqs1 = 0x00000030, - .dram_reset = 0x00000030, -}; - -static struct mx6_mmdc_calibration mx6_mmcd_calib = { - .p0_mpwldectrl0 = 0x00070007, - .p0_mpdgctrl0 = 0x41490145, - .p0_mprddlctl = 0x40404546, - .p0_mpwrdlctl = 0x4040524D, -}; - -struct mx6_ddr_sysinfo ddr_sysinfo = { - .dsize = 0, - .cs_density = 20, - .ncs = 1, - .cs1_mirror = 0, - .rtt_wr = 2, - .rtt_nom = 1, /* RTT_Nom = RZQ/2 */ - .walat = 1, /* Write additional latency */ - .ralat = 5, /* Read additional latency */ - .mif3_mode = 3, /* Command prediction working mode */ - .bi_on = 1, /* Bank interleaving enabled */ - .sde_to_rst = 0x10, /* 14 cycles, 200us (JEDEC default) */ - .rst_to_cke = 0x23, /* 33 cycles, 500us (JEDEC default) */ - .ddr_type = DDR_TYPE_DDR3, -}; - -static struct mx6_ddr3_cfg mem_ddr = { - .mem_speed = 800, - .density = 4, - .width = 16, - .banks = 8, - .rowaddr = 15, - .coladdr = 10, - .pagesz = 2, - .trcd = 1375, - .trcmin = 4875, - .trasmin = 3500, -}; -#endif - -static void ccgr_init(void) -{ - struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; - - writel(0xFFFFFFFF, &ccm->CCGR0); - writel(0xFFFFFFFF, &ccm->CCGR1); - writel(0xFFFFFFFF, &ccm->CCGR2); - writel(0xFFFFFFFF, &ccm->CCGR3); - writel(0xFFFFFFFF, &ccm->CCGR4); - writel(0xFFFFFFFF, &ccm->CCGR5); - writel(0xFFFFFFFF, &ccm->CCGR6); - writel(0xFFFFFFFF, &ccm->CCGR7); -} - -static void spl_dram_init(void) -{ - mx6ul_dram_iocfg(mem_ddr.width, &mx6_ddr_ioregs, &mx6_grp_ioregs); - mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr); -} - -void board_init_f(ulong dummy) -{ - /* setup AIPS and disable watchdog */ - arch_cpu_init(); - - ccgr_init(); - - /* iomux and setup of i2c */ - board_early_init_f(); - - /* setup GP timer */ - timer_init(); - - /* UART clocks enabled and gd valid - init serial console */ - preloader_console_init(); - - /* DDR initialization */ - spl_dram_init(); - - /* Clear the BSS. */ - memset(__bss_start, 0, __bss_end - __bss_start); - - /* load/boot image from boot device */ - board_init_r(NULL, 0); -} -#endif diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig index 77d78e7..cdd8446 100644 --- a/configs/mx6ul_14x14_evk_defconfig +++ b/configs/mx6ul_14x14_evk_defconfig @@ -1,8 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6UL_14X14_EVK=y -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_14x14_evk/imximage.cfg" CONFIG_CMD_GPIO=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y