From patchwork Thu Oct 13 08:33:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chin Liang See X-Patchwork-Id: 681669 X-Patchwork-Delegate: marek.vasut@gmail.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 3svkZn179Mz9sBR for ; Thu, 13 Oct 2016 19:35:45 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=altera.onmicrosoft.com header.i=@altera.onmicrosoft.com header.b=M+T6cCsg; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 65C3DA75CF; Thu, 13 Oct 2016 10:35:01 +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 Qkf9NUWgiSt6; Thu, 13 Oct 2016 10:35:01 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2989DA75D2; Thu, 13 Oct 2016 10:34:36 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 95623A75C2 for ; Thu, 13 Oct 2016 10:34:22 +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 kbY26J0ifxnM for ; Thu, 13 Oct 2016 10:34:22 +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 NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0057.outbound.protection.outlook.com [104.47.32.57]) by theia.denx.de (Postfix) with ESMTPS id 39DFCA756F for ; Thu, 13 Oct 2016 10:34:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=altera.onmicrosoft.com; s=selector1-altera-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=h8yscsbiUSjDqu0E14gbuq0+pci6J3E3U7J5leFlEsI=; b=M+T6cCsgWxlKoetpiKNloZt0pFfVXTz2AOojjpBfvoUzx/KXIOxKKndrGrj8VavGa49LBJklzYER8HGtMw3Ou87AgZKiWmD4035nBGe37QBVPZgeBf20pRXPJeqbyYZCgybxpZZtRFChP2oGWcuFNAAoe1RiMOlmvlhpibSF54k= Received: from BN6PR03CA0003.namprd03.prod.outlook.com (10.168.230.141) by BLUPR03MB263.namprd03.prod.outlook.com (10.255.213.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.659.11; Thu, 13 Oct 2016 08:34:06 +0000 Received: from BL2FFO11FD041.protection.gbl (2a01:111:f400:7c09::198) by BN6PR03CA0003.outlook.office365.com (2603:10b6:404:23::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.12 via Frontend Transport; Thu, 13 Oct 2016 08:34:07 +0000 Authentication-Results: spf=softfail (sender IP is 66.35.236.227) smtp.mailfrom=altera.com; lists.denx.de; dkim=none (message not signed) header.d=none; lists.denx.de; dmarc=none action=none header.from=altera.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning altera.com discourages use of 66.35.236.227 as permitted sender) Received: from sj-itexedge03.altera.priv.altera.com (66.35.236.227) by BL2FFO11FD041.mail.protection.outlook.com (10.173.161.137) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.629.5 via Frontend Transport; Thu, 13 Oct 2016 08:34:06 +0000 Received: from sj-mail01.altera.com (137.57.1.6) by webmail.altera.com (66.35.236.227) with Microsoft SMTP Server (TLS) id 14.3.174.1; Thu, 13 Oct 2016 01:33:18 -0700 Received: from ubuntu.localdomain (pg-clsee-450.altera.priv.altera.com [137.57.88.243]) by sj-mail01.altera.com (8.13.7+Sun/8.13.7) with ESMTP id u9D8XHiB028108; Thu, 13 Oct 2016 01:33:51 -0700 (PDT) From: Chin Liang See To: Date: Thu, 13 Oct 2016 16:33:08 +0800 Message-ID: <1476347589-5578-12-git-send-email-clsee@altera.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1476347589-5578-1-git-send-email-clsee@altera.com> References: <1476347589-5578-1-git-send-email-clsee@altera.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:66.35.236.227; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(189002)(199003)(50986999)(48376002)(19580405001)(19580395003)(68736007)(5660300001)(586003)(8676002)(7846002)(626004)(229853001)(76176999)(2906002)(5003940100001)(6666003)(81156014)(50226002)(2950100002)(105596002)(4326007)(81166006)(2351001)(8936002)(106466001)(305945005)(6916009)(189998001)(50466002)(4001430100002)(110136003)(107886002)(87936001)(36756003)(86362001)(92566002)(356003)(97736004)(47776003)(33646002)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR03MB263; H:sj-itexedge03.altera.priv.altera.com; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD041; 1:ce4Uu36wgbFbfbUkDE+D21vHKeLsOtQFt+heWuQSjrmiJYbmgBWXQgFy1o04aRs9yovjRTwZ414xR1vJFB58hQfs2X5WjByxQb5CqcJEZpJ1SziBc4qsrL+vQZR4Jpus6swPP6E3CpRiHLhilCCV/nfVd1oDeUDLw9Fr5FhFUF4VYxlvs75D3jJDAUC/X7GzqgQz1UR/4Fur5+y9go5eHguxIM9JDnLyGLwqmVDHX1hyfvLvbUuV0PMfWAN1M2oEn6zjx6fN+c0abkZEzv3zQSnYzrNQzMSzDG3w1MMqgg8QnVfepJ+xXGte1V3J4uygFhMV8lnuVO3m1DGOdn1opo9GG8zZwVKv4giuvGa6jeZc7vuWGS5/bt6q3mrCYJ4A5ufiCKGUeDeD5UXOmyBfPx1/5MD3vpf8KAZBkfc2Dp3Mi7WrKouMCuUDl2qZtM22xwM/sP9i0iqLsEMWkIFwuRLigFKeiaVSZX8eigaiZBuYsEC6k8jvo0Zo8TNF4nKUY9K+SwQa7ALr7H6HiaX27KIKZmZUkxIYmRyPVbCzh7A= X-MS-Office365-Filtering-Correlation-Id: 8b28a818-020a-44a3-e49e-08d3f343b269 X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB263; 2:YB9sj+SnO/ht09JaqsDiyuGyaZ8W7yQeSKcGaUyi1ONEct9Avg+T1Uot4kJdomSi45wkWrx9mUNuvTy5eatfl/m8F36VkF6BKRtMGCoEHX/d+Ki8ERtACIXZ6jPxpekoZd0EzR4/Vzwx6Reh8IAp3ekZKbgskil1ZymigbSDVvH1/nHzBqAwOdS/6gdjOch0jMtuR84JH/5dtejkZQgUIg==; 3:NilvGR48O1b+megL49iGGY7cvTeIJ+CMKRLn+O9BNh6MhMX+CIeeVXiF6hHartg+DG+I49qGXeqo7i9bWjwAchZO63ea5E+aCVRIDMJXKK1btdKI0cfakCQx4QGz+2tYyN7qMNtGRdheZqkORUbAjzClPNwz+OaIPdrfTaAz4mt/rClhwxeerfhlDRUK3JMy2NrBB8fZuPCczj93jUWyq15A9Zeh7EKHC8gqgCCIWNdUWRh6hAugrSUMSiX0sNuR X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB263; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB263; 25:1pSLQnh1l5USRVhP9SsHTTiy/OacauA3TULUK8P8Ay4nQdSD85Vma0hB1wOUGIDiVOPSnj7MF3TLJQ3eNea/ahjU/PNIG8gf8kGWo4ppoEoBx24tCbdKQOa7/3IgbaQr5K1iwtoXqlHdSATqTKEQQ183EjRBcrVeIptgVO3tjt6Kb/OKMXP0reSX5lhrNc58IKlxXKB6xvk9lSVKE4VF+g9PPw+CTi8GjykTHHfbGr2+az21utp0GT7e0VSDiKhjQQYTqmWgusv1ol1d5UkCJuLVnOG0gaXjZD1e9EKNFZWkRYuDuknYv8ZGupoZn5e0z2OlAusJdFSfKzieEtag80nuJx+0rH6CCB6T3KAvmCuAHYkh7CX4hTfkRLZqphIqDxnTwhfGOHGSzhErBpwUqOdiMqgQomiNGUEekVSxA9uqThpB3L1PTzZBlCWOw24mSo6EPMoYh8Xmvz+nDeD2GpHjWxjAW3rLGK3BBMt9uInkNh9EY6pdHcCkasgpxGYfUbQefoosH89YiMQWRcLKzsykUGELYOAMxYQXO+FZsUQew1gLGE5nGyQBiYM571D9FjWY3RtlDFr4axGX9ajiszZq0hoe5+vELOaz531oCU/gSSn+5NQJZFqPdY0H7+mL2atx7/tDpQre5tJvK5J8ahJgZOL3HxTIdT40IDV02joOO/v7fiWAfudxDsTPm7ZiOjepRcVN4lfj1P7y0gCoNs4LA3kmL6EG0iswIPqf0aRyrb12XIq8vKqyxNp2qoI8W/+7BLCi+rIrN5muk84HLF81V/vf7CbETfWC0nOrbBsxkxRBw2Oa2VKJF17a6HB/ X-LD-Processed: fbd72e03-d4a5-4110-adce-614d51f2077a,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB263; 31:xNpWETK28Kr15J9MBoSogJ4stbtH7vquNyZKxHLHSxqK1TQl7hJ7qSo37asw5gYYDYT8ZexnjJ5M0EqS9AMzxXL1ly3iBCINB4cwX8Gz5OtoeSVDKelysG89nqy9JXjBh23MDTig7TP59WuApP5DL3w0gPj6V37t7sYDN/HHpxtpdnsVSZGgGpxxgwMDkVpqOiCfd6I1qUmz4Qtcl4PIhioh3lpDcSGurZA85RrgQ2zPu0cOfl77ieFs2Ckn4hTQnESAtBXYsG6laXgje+EHWQ==; 20:Nf3iqtRE/+qhLoff2E+jsvSV4ApctQ1tWlV90gzdK4bHIO5ubtZ6BAGr7vS8cu8+kINS78C8kqDaYpWe+QTEOgn5feDauCw/qRTVD/BkQ8WpGU6D6bj7GEz2GdMvoNLrqnHTGhS4yukm0BDnVr7i76jGYk6Z+DgvYFBjSfFZ5Dk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(80048183373757); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13015025)(8121501046)(5005006)(13018025)(13023025)(13017025)(13024025)(10201501046)(3002001)(6055026); SRVR:BLUPR03MB263; BCL:0; PCL:0; RULEID:; SRVR:BLUPR03MB263; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB263; 4:pIkrz2SBH7Us6uFumHuuKThFxVfsnNXgr3M1mpOV6lZyFccSM2RMcaTcg33Ac1uVlhbzAxRc6ERE9mff/ladWhZJGDzpNhk5UNhbjeBco4PPqcUi99Y7EaPvlwbK70i26Mw10ZWv0eA6BoiQC3ka9OZP849QgaJlftiTWENkkAJS3iUU2eEUVi40lMl2TWV90c94LfL/XsBO5g/WwvdhQEuwTKsdVX34R5g8sGt1cA8EGbpqEBPlx5y6AlPTY5PioINyPvE40M56dJz7voZXWTHZYHBnkWYzRI4H1C5mcc6dMSKNzsTkiDxlnbJX7sda7yihv+Rxvn/NgnqcSY21hb+pAi9wEPmqhMfroYOycA3GOxE71BfBfPSFX5DoA9OE4cNkoEEmNtcfICVaqfYzMjYOkDB3UDGQX1troY34q9G2v2ZYuNFOV0OuWH3Tvm6mJTtoHBtoNG02M2U/zGHnWs5VwxmDJcl0VsstOsrIdXtXEUhHXGHsjj74dUyHe/y3cMYkrUwFIL789ubPU2kmoprore91MyF/QN39j6ZxKMHEcXRNk3qIDM+c9bugZzO+ X-Forefront-PRVS: 0094E3478A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB263; 23:fPvvS78hmOkKSyIIyB5Lu0x5FfHR4+8trD55K9IbJB?= =?us-ascii?Q?3S/k2PX0f9KcAxKmGLPI+Kfi7Rx5jDSQctc6tzxI/RIFe/GHdPUslkhxAGHX?= =?us-ascii?Q?P2gRBOUB2jZiFwPcjLQ4qp88PFDK7aJmyt1WmJyaHLTfD4IcgM7KEhN+Luar?= =?us-ascii?Q?qJdU8nwFThxRgn7vXXmciRspy1UF8y0VIwiYk8AFy/rUMg9Ll3oEXbNKJ85T?= =?us-ascii?Q?EmTKCSLzLzd6FqpWiSlmeu8n7rsRjkzC37G0Yp9oMBFR9MEfCtM9wqtn1Oae?= =?us-ascii?Q?1z8ePgxnuCxwSsoiV7lhcyJ9tGS4qHcWEnO8T7zpMo7WgMPMkYEntAq0QisN?= =?us-ascii?Q?HHXDK7YhqQDHblzMw5Sfy0Wdbb9VJZG+g9W53PMhYXqC70Ztv8YO5G/q/DT8?= =?us-ascii?Q?w7PAmr5w8IN02QjUEttbMdKBhEuGFI0yj8am0I5YW+RIk5BPLFoMUnfjyAPd?= =?us-ascii?Q?Z0H4UeAb3S1goYbRf6rtBznW3pHxLGnnK3F+3qrc8bA5yl8CQP/uyJfpEHve?= =?us-ascii?Q?45/nT4fAo+2us0jbTuDOF8JTT97OwlVvavq9MdBGLu0ed8AhCxY+ooMo+hy2?= =?us-ascii?Q?X0x7Yw42ieNVrHGNX1OHaHT8EF3luTQVE5VAqA8ZicXLPDJCq7j3Gy0ofIq/?= =?us-ascii?Q?kxhdBMHSy93bxM6bI2yz6+kPKYUNwBiCWb1kDJG+Q6XB1QJwd1mYpn7Q/dVP?= =?us-ascii?Q?1N6AqMpIctk6btEQjD1cWkQ1Am7r3xOl4NPO2Ef4jh9DGofWUfjseseOobX6?= =?us-ascii?Q?cL+bQdXM+0GHRq5eWZLLuvqwgs/o1WFMcST35ImVjH96jORHM5d0/RcJ4WFg?= =?us-ascii?Q?lxv/dGp8iW6Vk/Zhe2/OoABIBKeiJs6t7wlcCE9IPRzLGISnEm2MOGQScpgW?= =?us-ascii?Q?o03coHLvVJf3yTJAiDm9bQ+AWQ+nt7E9EBkCjDnMQNtK4wZ9wuodPrVC0ziT?= =?us-ascii?Q?tXfQUMZs46VPkxqtblrGb9/bzaQwdjCySaOEGBj+gHNxqdiL+KGBA0HSzIFS?= =?us-ascii?Q?PCxcarNoMhuSwDmLLuLkiv6lmgIioiUl2xgsqyMl/SFr6ELQ5TA63AsmZdmB?= =?us-ascii?Q?Utt6SKdPFpi7PpHI4adHQ1KCanCYJ6PtZ2D098h+eHfxgvAw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB263; 6:giTBy/0okC+0DD0gO+mDT0KpvIUa7IlJIcI3bDbMJemIXJSEjf/g7wEuryN/8Oh5l8MqFsrM51xvOM5WC6TCD0/tcexslxdVwItalsFcMPNswh0BQO/G2ARMqN/XhyZBVHsRUOWpjKUaYzqhnA4ctio+lxcrHKJXQmnybKpkE5rhXxFuEs0jC8tSb3zGu9N9X2r7vAnaqJnRmnpMHA6/Lbp9020KJZnneg7c+jRWD6BPk8KXobNwMBPYe9Ucvj/mc6WeWjmBdfSxELxDXtSs+vZwHX48kP0evyc8gBpOaloYIhPPhhhBWmZxh6i63mbUFrnBrxNm7TpsRyypncyByOsAsCp0u6BgG1TScCLYWX4=; 5:LO3Su0K6QgmEdjNbCMVEvrU8ubp0CG0avC1ZnZ7M1XdiRdI6F19mlEhE1M6GgcF1+5I59uVgzJ0yf7jpD5wQ+IglniGqq6rb4C44QBWyc3keTD7cTxnvqyoXLZtxAMSmtcgd9p629Hv1180mbqq0KQ==; 24:G1ZKwuW+M9rq6qhkX7WHtziG8CSCUlynPnwKNp9DSq82BgmuyZYz/ntfKB4boS88nHYGrDE1LZhc8dzAe6vQT06SIsHTdxAej+Xh32iEkuo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB263; 7:afYrt92AfrMhdnZExSWmR1RoBl7R5vK6+Y3OcKtiuo9E5bjzYCBNCO0YtERSzC6jx3ah0m93S6H3VyczmiOjEt3SgzI1/wxPDZPZTLTpWcBeK6stzyajd6Es45UMD8wMki/P27uQ8XnzgJeF5fileH7tt2NEfUsksOu1KChXniFrqozceLFGF0txSysvb6WRXLWmKSIbXNgtrc6t3ZHEu3xMVJ0sF/sNUxkXhYo7hLXcvj9pAtFyXdeNMGSR9cEF81vcVCJcwVk2e/h/eQEcpi2MmpnN4hxc/MajP1OLLr6evCt0Ula9GzoqypkOdf5y6SQ/k2ybbhoJ57FzIIK0iMYM419WiLYoPg3qoFgVS0M= X-OriginatorOrg: altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2016 08:34:06.6178 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a; Ip=[66.35.236.227]; Helo=[sj-itexedge03.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB263 Cc: Marek Vasut , Ley Foon Tan , Tien Fong Chee , Chin Liang See Subject: [U-Boot] [PATCH v3 11/12] arm: socfpga: Add SPL support for Stratix 10 SoC 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" Add SPL support for Stratix 10 SoC development kit Signed-off-by: Chin Liang See Cc: Marek Vasut Cc: Dinh Nguyen Cc: Ley Foon Tan Cc: Tien Fong Chee --- arch/arm/mach-socfpga/Makefile | 13 ++++++++----- arch/arm/mach-socfpga/spl.c | 13 ++++++++++++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile index 5038919..2b00c8c 100644 --- a/arch/arm/mach-socfpga/Makefile +++ b/arch/arm/mach-socfpga/Makefile @@ -8,17 +8,20 @@ # obj-y += misc.o timer.o reset_manager.o clock_manager.o board.o - -obj-$(CONFIG_SPL_BUILD) += spl.o freeze_controller.o - obj-$(CONFIG_TARGET_SOCFPGA_STRATIX10) += mmu-arm64.o +ifdef CONFIG_SPL_BUILD +obj-y += spl.o +obj-$(CONFIG_TARGET_SOCFPGA_GEN5) += freeze_controller.o +endif + +ifdef CONFIG_TARGET_SOCFPGA_GEN5 # QTS-generated config file wrappers -obj-$(CONFIG_TARGET_SOCFPGA_GEN5) += scan_manager.o wrap_pll_config.o \ - fpga_manager.o system_manager.o +obj-y += scan_manager.o wrap_pll_config.o fpga_manager.o system_manager.o obj-$(CONFIG_SPL_BUILD) += wrap_iocsr_config.o wrap_pinmux_config.o \ wrap_sdram_config.o CFLAGS_wrap_iocsr_config.o += -I$(srctree)/board/$(BOARDDIR) CFLAGS_wrap_pinmux_config.o += -I$(srctree)/board/$(BOARDDIR) CFLAGS_wrap_pll_config.o += -I$(srctree)/board/$(BOARDDIR) CFLAGS_wrap_sdram_config.o += -I$(srctree)/board/$(BOARDDIR) +endif diff --git a/arch/arm/mach-socfpga/spl.c b/arch/arm/mach-socfpga/spl.c index fec4c7a..b514a01 100644 --- a/arch/arm/mach-socfpga/spl.c +++ b/arch/arm/mach-socfpga/spl.c @@ -22,6 +22,7 @@ DECLARE_GLOBAL_DATA_PTR; +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) static struct pl310_regs *const pl310 = (struct pl310_regs *)CONFIG_SYS_PL310_BASE; static struct scu_registers *scu_regs = @@ -30,9 +31,11 @@ static struct nic301_registers *nic301_regs = (struct nic301_registers *)SOCFPGA_L3REGS_ADDRESS; static struct socfpga_system_manager *sysmgr_regs = (struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS; +#endif u32 spl_boot_device(void) { +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) const u32 bsel = readl(&sysmgr_regs->bootinfo); switch (bsel & 0x7) { @@ -55,6 +58,9 @@ u32 spl_boot_device(void) printf("Invalid boot device (bsel=%08x)!\n", bsel); hang(); } +#elif defined(CONFIG_TARGET_SOCFPGA_STRATIX10) + return BOOT_DEVICE_MMC1; +#endif } #ifdef CONFIG_SPL_MMC_SUPPORT @@ -68,6 +74,7 @@ u32 spl_boot_mode(const u32 boot_device) } #endif +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) static void socfpga_nic301_slave_ns(void) { writel(0x1, &nic301_regs->lwhps2fpgaregs); @@ -77,9 +84,11 @@ static void socfpga_nic301_slave_ns(void) writel(0x1, &nic301_regs->ocram); writel(0x1, &nic301_regs->sdrdata); } +#endif void board_init_f(ulong dummy) { +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) #ifndef CONFIG_SOCFPGA_VIRTUAL_TARGET const struct cm_config *cm_default_cfg = cm_get_default_config(); #endif @@ -152,10 +161,11 @@ void board_init_f(ulong dummy) debug("Unfreezing/Thaw all I/O banks\n"); /* unfreeze / thaw all IO banks */ sys_mgr_frzctrl_thaw_req(); - +#endif /* enable console uart printing */ preloader_console_init(); +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) if (sdram_mmr_init_full(0xffffffff) != 0) { puts("SDRAM init failed.\n"); hang(); @@ -181,4 +191,5 @@ void board_init_f(ulong dummy) /* Configure simple malloc base pointer into RAM. */ gd->malloc_base = CONFIG_SYS_TEXT_BASE + (1024 * 1024); +#endif }