From patchwork Tue Sep 6 10:03:24 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: 666449 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 3sT2Np0j7hz9s3v for ; Tue, 6 Sep 2016 20:08:26 +1000 (AEST) 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=j46/wDUJ; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5747B4BB1A; Tue, 6 Sep 2016 12:08:23 +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 r8D0fT8Xu-2e; Tue, 6 Sep 2016 12:08:23 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 68622A7579; Tue, 6 Sep 2016 12:08:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 328364B71E for ; Tue, 6 Sep 2016 12:04:24 +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 9A-O_7olsvO4 for ; Tue, 6 Sep 2016 12:04:24 +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 NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0087.outbound.protection.outlook.com [104.47.41.87]) by theia.denx.de (Postfix) with ESMTPS id 4244D4B951 for ; Tue, 6 Sep 2016 12:04:18 +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=wF9CQaB9A/ZqfbAYQCj9xMHIo5uq5nePyvcAXzrfHNY=; b=j46/wDUJSs/+sYR5DUnI55Bblccj2cP/AwzGZLLOL/fcjhOpzmR8PRcsUIwImTAJefrKiKZ6tWwtKrqk5OUqC2BV5ucvHd05r+t6idtx0EvcI2zaC/JvJh1Amgp6b11kTrN4bmimkKZ0Pq92rBY0TttChueVpS7cSOmsSBlm3T8= Received: from BN3PR0301CA0028.namprd03.prod.outlook.com (10.160.180.166) by DM2PR03MB494.namprd03.prod.outlook.com (10.141.85.143) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9; Tue, 6 Sep 2016 10:04:15 +0000 Received: from BN1AFFO11FD054.protection.gbl (2a01:111:f400:7c10::105) by BN3PR0301CA0028.outlook.office365.com (2a01:111:e400:4000::38) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.9 via Frontend Transport; Tue, 6 Sep 2016 10:04:15 +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 BN1AFFO11FD054.mail.protection.outlook.com (10.58.53.69) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.6 via Frontend Transport; Tue, 6 Sep 2016 10:04:15 +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; Tue, 6 Sep 2016 03:03:39 -0700 Received: from ubuntu.localdomain (pg-clsee-450.altera.priv.altera.com [137.57.103.106]) by sj-mail01.altera.com (8.13.7+Sun/8.13.7) with ESMTP id u86A3exM009127; Tue, 6 Sep 2016 03:04:03 -0700 (PDT) From: Chin Liang See To: Date: Tue, 6 Sep 2016 18:03:24 +0800 Message-ID: <1473156209-5734-7-git-send-email-clsee@altera.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1473156209-5734-1-git-send-email-clsee@altera.com> References: <1473156209-5734-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)(189998001)(8936002)(107886002)(97736004)(68736007)(110136002)(76176999)(7696003)(50986999)(7846002)(305945005)(19580405001)(586003)(19580395003)(50226002)(16796002)(5003940100001)(8676002)(2906002)(81166006)(81156014)(106466001)(33646002)(48376002)(86362001)(4001430100002)(4326007)(11100500001)(36756003)(105596002)(626004)(2950100001)(87936001)(2351001)(5660300001)(47776003)(92566002)(356003)(50466002)(229853001)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR03MB494; H:sj-itexedge03.altera.priv.altera.com; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD054; 1:shu/hKtPvr+fQMqRUnJPOwx1qEqRYVSgjsiCMTSMhsR3go3GojPoKE+Q1GucxTX+pDoQy6FVTWivzfwce0bAkVal0zZ5LZrcJ7hIZ798hW85LyraavWJJalKnt92tf1+sIKCYnbfdFe3Tvf+54kT7xWTXpzxgIlddbEdkQTeJgqhHZSfpdMikM66TLdo/tpfo/pjNUPqAQeGr0gKigBsziyUKSbB3+TZ/FvaVf5YMeW4zOxAaNNmYBF/rqn287IBvWk66q/3dkBvfuBdiH0QejSPCrQQgvvIi18j8/51wFiyiyBiTkEGhCbsT8SqAViXjEXSMfeIf1N99RO7DpSoAxLnK57az8YPbm70spw5+QaFmbZ4MY6wuzcT3q1G2kCXk5hRx06ANPEnt4VCwbjWQ1YT0CkOlly0WAcT48Q0SZb6hglMXWnSP4HAO6klCcwrqM1OtoiJPSHJTqaEt6ImZVBIDqqGvppwQrl8jnG280muxR2bnwrhiRcSljfPK0cgFjhYZKuwuA3yjhPpr5VkI+MqEuBNTJsWBEJSCXj8cLk= X-MS-Office365-Filtering-Correlation-Id: 9d615ce4-efd0-427c-80ad-08d3d63d28b3 X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB494; 2:J6OfpyPEZeLy8J5UT8X5/mMGQ4kpmkU4LZc/gXB+BNtOC0FLeWtziKqJn+94Rw5F5PkBtzxLJwCqshxBdo/y21zQ0oBS60XLGdxOLZn6QxIlWifl/byLQoJe8N9wQJS0IXlVAVoQ15UYOi4RbEqPN1kTbOv0vwn7K1RnmKWQBxTDIP1AE+MFo3W+YcctCyNH; 3:y+hYoxGc8CCSNJRdWbx7mImXVvsOPo0A3Bpi/R0Q4LEIOfd4KPaF9ib7AtR0p/OZmTBmQCVxIJ9AtYGi5eLPH7o5UHyQoLKcutkHZrJighV77ZD0Y7ZEiSBYJgzdtglIl7DqVIYXfHFwIYsWWk3jvwnWeDgFd9UEX+iUZWrtx/NUfK1P7gMN00YLZksFGfagfjWrARLvtS9RcQIsZ/y+nQBHJMNrmjogs0M+No8SmS8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB494; X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB494; 25:MYy3YN+XM0dSgO7LUplIbUqTASjyAe4p8MUqJgQe9sOJGEZ1O7rzXdHEybhTygfeNLeNFpY4gOUg+fWsdTMwQMewyLyvnJZbUPnKVXuxCma8G0Xft+OwDamJaVRTGcU764A5JUPd1oP6DzWXMuLlWvNtXl0UpW9s1Xdtw2M+G6f9O5RxwcYKzrcbV65gzlYvvYyjMmKonY96pTfwNOkQFJETT2N6Bt8AxaYv4/oB/B4F4x4f531xHxrP9J+7dSnkQg2rNV5hWAH1AB75AWLjBQryIESX3E4whx3gi0XYOfvNLrHzrDVqiP9UbXGy9Fjyx3aMzLylnTlaeG7250qRQrdGiSv1CYHOLVY3kxL5oKi0kXEyGMebfnHWRtojDlgZEdEFS58hCrwMVSIaTweGoP5rqUSMfTGJ4hFwG9+KYxS63YvNJy9LrlgxKWn0aww+MKK4Qt/Las2ssvtWlIudBpnPrxNSxZbqtwhhqQWt7esATEIBc2/up9wPksEaVRVNYiFqcoxQXXkWi2iBC7sm0LUiaRmP+Vap4ow7oM503eVc5C5H04lJlMZWzj31rCZoq/EmpUn69Sr5C0xbouwJOj37PS7Yv1G3aiEndCWMRM2yBtf5CoGC9l3q1WRNFxNtUYNiimG1Sp/Swg50NJ0bMBKPEPrsoWUtbmfTDnOXFbLyQ/Njv/ka+cNqorgdQGlM+SckpcJuthwv5OCtBDZFPZXRKhKX7eGxP8R9Iwa4/rXroBB3WYkZgu3VkFlckOAoyOZrilFe7+4wPVUKQD7M6A== X-LD-Processed: fbd72e03-d4a5-4110-adce-614d51f2077a,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB494; 31:Tnse1+AKVBdrQ0upAGyV85zv0SJKoLMMCMV6HJ4z5YXcUWPfmpNu6sMJU955LcGU36um/jRLnA1KwFrytAYsG2sCCn874LXljpLjY+sS0LYuM03nNKZzoPiOWMylxcFqNfuUWhxPNIqr8AqY3M7Ylzg+r+68bUQAPeWUm8vZtK35aMN2fMyM+/yifR6Xf3I/NcC2i/i54HNlteVYkImc6FUioFcYTVn23X7fekxJN4Q=; 20:YMrW5RqWPTFuWnhnZN9GrwOAZ8aYxd5sSLmjKdEFrQImli2YcllTG3rFYcDl3HPS/L2JOcxIcYlYvdSJs13lGbLox4Va4WkFaZGkI8DlDqPr5FdtP1gnRYczcyCtNBvvQ3oEUUPJh2b1lq/LJPR8yOc8B68XT8jCjHg4c8OiVWg=; 4:ez1WAXVYE0pNYcNTezqvadg3uZiziJjdvRz2UrFTS//qx95FqZhs61bm8pdMjDTHfi6OvOyw5HSqdwuFQ+CQe3Ck9123bWc3NRwvD45tKGGr8WItx+I/paPjtAcN1P8xCy2E4vvown80FvHOQxFu1HKtdtlYjqtN31+GyxyFVnGv9aRy6pbVGh02wRKzN2wm12vgAJIwCw3P614JqBJ63O17AJXUfIhGOmhBCBjjGt/3BxOdy+yaXF1Kio4xCdNyz5SDWzPpIOUvcJwHlNHRVvisUcsDjag8gHfseSlGzQGvDu2zOHZACNIEV+tY6ZLCnh7RvAaOZwifP4G5ClcvxmT+N5M3Ud6/G2L0VFjm3kUb12B7vGQkHTAGsKueDPOpGjLxNBLYs5/VXzsMHnz6cYTM2zOYO4wRTG5i20UdZVVTQhKqx77KEDsukB0yJPeK2jnraCrQi8Cdj6AodOxdUNekkouE6cjwHU+Yso5zC51yv2Npunp00X24zYWKG/E9bg7i46NLhMTxg6dzC/UUOMf5owAAad1vCIj90dO1LU8= 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)(13017025)(13023025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:DM2PR03MB494; BCL:0; PCL:0; RULEID:; SRVR:DM2PR03MB494; X-Forefront-PRVS: 0057EE387C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR03MB494; 23:04XWil0D+DUp6dh7vjaxzW9MttIO9QH9R5E1W4vq9W?= =?us-ascii?Q?d6bId5RZNoYN7/2AyXdEGAC0/dJpD8XQvHLNU+ERWUEBwzMKayIn0y2f37lq?= =?us-ascii?Q?ADnbFYgZ7rJHsLQ3wRd+OjOC36vla/GCclSZHFFhJN0WWorRR7+IT0OBwL/P?= =?us-ascii?Q?P8vmse0cdzWvk/shv3bVH6ADIzHh2/DzHq/wmuTy0uWRr59M3zXjMa7QX8iQ?= =?us-ascii?Q?Lfn4r3DinpbBz9zSHaraGRy8uvIp9d9707w1qu6Ctl1w/17f2oJAKatqY0Yo?= =?us-ascii?Q?lKd0JOUX3xqwR5TEPVOOhheCA1qx9IPTqLvvXxT408D+QfkHmrrYoYtzpqeH?= =?us-ascii?Q?F9q/SVYjOZXzc+oWVn/ed+6Y/bhkajuEmXtWZSZMM+4RH5yxmjhokrTmNvUd?= =?us-ascii?Q?L/aeHZPUEvtZ1FCuTFV74Xd6xwGQmGxt1XgH9hkpUpao0zl7JQPtzYkkvtci?= =?us-ascii?Q?m6VBZ8DoEuJ/QSK/bhUTgh/Ct75F1tYkQfGTDK3btsPMTrkY3V+cwbzcm1TS?= =?us-ascii?Q?kbjPvkd6UaWpEbH0lt9q9nJNhG/C6CZCiJyGIMEsEFcv08drHqmVcF2zQ1zI?= =?us-ascii?Q?iUB78PvzhTn6k8CWoquMYV8r0nNCrxXpUa2qNezJHV+Xxq+ptw+jehIhdq2i?= =?us-ascii?Q?AHBEVcIN8PqAR7SybAF1C/NMBlVqlU6LYCJcHvv05G8Dw3LaPvHnRScR0wB7?= =?us-ascii?Q?MvaZGvbuyMlRfRP/d/xlOUKqDrsKUIcEgNVNG5kXB4Z6zTTYt+H2psRYf9RM?= =?us-ascii?Q?QPitZ8xB2oP2g5CINaz0l4oCv3DbI/qo3xG7chzmAN22M7tb9YYQ75ASL6UT?= =?us-ascii?Q?BvmW3cvJX2Upbzt331T7UxnX1xWBpeZYsiViXHQVbA9ITzpUXogL4c8AhHCD?= =?us-ascii?Q?3obzU9XJouRXj8M0mQ7r6U+lTw4AdELWIY0EhbCXiQ8bCh205nskZfQapsud?= =?us-ascii?Q?SppPz4hK7QbTdJCKi7rmlZYFZF1utaTfX4QPQnBWwtmcJLKJbOSUoq8/N/yF?= =?us-ascii?Q?R2MmZgLTRh6jWML/1H3lxi8NpZ5o7EWPlPoJHnmKbgTnGrnHZO9dljUJ9TOq?= =?us-ascii?Q?W0w2qTKIZIM1uf7Tas5iQfKCqQBB1iSqewU7OC4OtfvHZg/n9Pn5iC+F/pv+?= =?us-ascii?Q?hQielO4pY=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB494; 6:Kj+6k2dL0t1k8FGd4ueHM1w13eDlUFi6xr164i4weX+s2xULu6G6jSS3k6ILOWkOB5hnjBAqDoQrc9kmjnITjvbMucs+1PEJrpjLRl7Tgk9iqLAUxKPHqMFxPE8FB0sLUyx/9zl4iARmhvCW07l5F6TEfirA9Yidy0JyJC+EMe2yKrOE5IGT62A1jIYmkS2m/rmJIWTAdhsDot4TYHCecV3qk5/h0s/v6WJXgr2EFeYYAyrxBPpzAIZkXv0Rd9K5u7PHqcH9VB/e3JjLYmSbDAoVq1AIdpPdTk2ahFnjDF2S4+qhh23zmRk2xlzmpCg6Crz+WhjcTg9Zq7m6xafc/w==; 5:14yz2uSODvDqDLGklg9wee0XgxtACetOKqFUR/jWibkQOkUwwfML0KrCbwhmjMKH6XKvxuN6XzewJsYjRrdb0PhUW39HkJ+kQ+hqo2KS3on3CK7MWtmERHcpTecHu6f4fGEyI6fjJTleusTz/n3/ug==; 24:ZtAduX4wJhl2aMhxssWfQlCMJirKXZHmt3so+bPGRfbM426o9tzAHFFd+r6PCdh3/Y8WIwjfkL76yUJN+HYeDNQ6VyxoZXgWIGDVmUXfA+w=; 7:L+9tWXdQc9cTvpKGqJudN1tuCTuUG0r4uoO12aAUH505loDosH4Lsl23Iy5R7T5oBKo3LOZTtmGoNTJ0wFmdB/AACVKM9JeiXdlatA2Fm4MqZtXDddfsE5g78ESeVe8WO5Xm1i0W/fijYidAdW6GwdFbUiXwd/xCshshN5XlLOL2KeLmbBRLVEHZ7X63km2bVfUof7Z88msvABQhmTfH3SIDIZtWV01znUBrIolz2XgVaQNbGl5tT4XShNiTDwl+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2016 10:04:15.0141 (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: DM2PR03MB494 Cc: Marek Vasut , Ley Foon Tan , Chin Liang See Subject: [U-Boot] [PATCH v2 06/11] arm: socfpga: misc: Separate the misc.c for Stratix 10 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" Separate the misc.c to support both GEN5 SoC and Stratix 10 SoC. Signed-off-by: Chin Liang See Cc: Marek Vasut Cc: Dinh Nguyen Cc: Ley Foon Tan --- Changes for v2 - Change segregate to separate --- arch/arm/mach-socfpga/misc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index 5cbd8a4..295121f 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -24,6 +24,8 @@ DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_TARGET_SOCFPGA_GEN5 + static struct pl310_regs *const pl310 = (struct pl310_regs *)CONFIG_SYS_PL310_BASE; static struct socfpga_system_manager *sysmgr_regs = @@ -34,6 +36,7 @@ static struct nic301_registers *nic301_regs = (struct nic301_registers *)SOCFPGA_L3REGS_ADDRESS; static struct scu_registers *scu_regs = (struct scu_registers *)SOCFPGA_MPUSCU_ADDRESS; +#endif int dram_init(void) { @@ -41,6 +44,7 @@ int dram_init(void) return 0; } +#ifdef CONFIG_TARGET_SOCFPGA_GEN5 void enable_caches(void) { #ifndef CONFIG_SYS_ICACHE_OFF @@ -246,6 +250,7 @@ static int socfpga_fpga_id(const bool print_id) socfpga_fpga_model[i].name, version); return i; } +#endif /* CONFIG_TARGET_SOCFPGA_GEN5 */ /* * Print CPU information @@ -253,14 +258,20 @@ static int socfpga_fpga_id(const bool print_id) #if defined(CONFIG_DISPLAY_CPUINFO) int print_cpuinfo(void) { +#ifdef CONFIG_TARGET_SOCFPGA_GEN5 const u32 bsel = readl(&sysmgr_regs->bootinfo) & 0x7; puts("CPU: Altera SoCFPGA Platform\n"); socfpga_fpga_id(1); printf("BOOT: %s\n", bsel_str[bsel].name); +#elif defined(CONFIG_TARGET_SOCFPGA_STRATIX10) + puts("CPU: Altera SoCFPGA Platform\n"); + puts("FPGA: Altera Stratix 10\n"); +#endif /* CONFIG_TARGET_SOCFPGA_GEN5 */ return 0; } #endif +#ifdef CONFIG_TARGET_SOCFPGA_GEN5 #ifdef CONFIG_ARCH_MISC_INIT int arch_misc_init(void) { @@ -469,3 +480,4 @@ U_BOOT_CMD( "bridge disable - Enable HPS-to-FPGA, FPGA-to-HPS, LWHPS-to-FPGA bridges\n" "" ); +#endif /* CONFIG_TARGET_SOCFPGA_GEN5 */