From patchwork Tue Aug 21 09:19:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pramod Kumar X-Patchwork-Id: 960192 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="H+Uix388"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41vnMw0Bnrz9s5b for ; Tue, 21 Aug 2018 20:43:39 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 85CE8C21E3A; Tue, 21 Aug 2018 10:43:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAD_ENC_HEADER, SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 47915C21C6A; Tue, 21 Aug 2018 10:43:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AF4B0C21C6A; Tue, 21 Aug 2018 09:18:55 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0084.outbound.protection.outlook.com [104.47.0.84]) by lists.denx.de (Postfix) with ESMTPS id E6A6FC21C51 for ; Tue, 21 Aug 2018 09:18:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5wbeqVsm6UXNBjX3M1eDGv2Y0Z39Nx/wNE/jzdWhFsw=; b=H+Uix388d2TnJjHkVjyJ4UPyDBGOI/IJMbPt0JfKR/hNpcDvIJA+O/6D/ZlBHQqRdVchCLbIsjgF/bekcc4HnerQW9DoYDOBPJIW7iUb2eIVzi7/AVDw7V9sSQjSIsEfsYjJk+EgrnSFA+TEr+e0tdBaUS2HZ85kYuCyzN2m26E= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=pramod.kumar_1@nxp.com; Received: from pramod.ap.freescale.net (14.142.187.166) by DB7PR04MB5033.eurprd04.prod.outlook.com (2603:10a6:10:1b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1059.21; Tue, 21 Aug 2018 09:18:51 +0000 From: Pramod Kumar To: u-boot@lists.denx.de Date: Tue, 21 Aug 2018 14:49:01 +0530 Message-Id: <20180821091901.19199-1-pramod.kumar_1@nxp.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: PN1PR01CA0111.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00::27) To DB7PR04MB5033.eurprd04.prod.outlook.com (2603:10a6:10:1b::25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c09a624f-e5de-48b0-08ab-08d607471cf0 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR04MB5033; X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB5033; 3:Fs9s1jPLfxZYXBJ/35kTMUt6ig1/PCZrcDIt9FJQXIADCQFaDGHH67obQySZNAWs/EHesofXVP6/1S8qBms7prg5tsRepp5UAKEMqgECdiC8Y7W3iAW51zKrhaEr8UD3Jv4sn5Rjvo91LlMQnpoQKNZqOrLRXnKBU7MxK/tlauzvv454wAtVJUqVvzVuMdlNCf1eIJOulz3t1ObWDZwHemp/ed6QUTXt3sfXLE/1Y7NhpUEaLMB6bQRrfMOEvi15; 25:GHe3AYm8UWB/s/swEaGESaKzvsK8bH8wCUMJjucV251wZlTeiTWabv80qiA7sxbCPMk7vfrWLObpX0xn4HpNPmYFY4MkY9e5DxrcmmFqX5imrosIqRMLsMIyl+Le8ydm0oFixrguZHGyt2xO0yAnLJ4WFfEGoGuZmdObJfrZeZkzVD8SRdbQiIeSp/hoNGVveC8hoYXjy2iGyC/F0IX+UdtHizJgCPpeqYNqfT3GHgBaPiqwJuyT4vyZCH1wKW/WG3WSo0l0Yjrjh5+gLN11QyPmAWh78EfREsRf6dwsoMD6XDJ2sFAExfithP731vU6RxCo8zDu7p82mMGNV0GqzA==; 31:WWT6PA/7wAskTdBa/NbiW+EVOL3WvjF9Ulba/UIsbI5d0L6H1bIrSqVDC0N8rpCEufxdCgshqyFdR5Wj13GmvkltyPJYtSzyZZZRDnRYrl490WTzDIiX+beY17CHyL6hCUUFByNSCTsfWZskcI+SoV0QsEN1cBiKNfcqqoRENf3U2TIIqv4mzCsBHDKTlJhbQDMhZUsWDYYubMBbyZxfwewDPMYmtzlDn6Z2rNicCD4= X-MS-TrafficTypeDiagnostic: DB7PR04MB5033: X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB5033; 20:BMqfwF2AFDOXLE+ht9/y5ISrOdJnGEOQKuVBwAZe9p8zrbahB9ipmzPM8+OqeFH2m4D1BwgCf+aPYEMKRP1BplPVKMNwhfRszPHzL0YbONa9yejBNzSzCAtCkJXauk+9Glcg/scG/Dl/Qkw1SdOOEIdGaBXm9s8TOW++43NeQDZkN9z9ikZCLp6KVWXWgmJE6qZVEal9ogP8toQcPCj10sS9spCE2b3n4I1i7TgoJyWPXnbw+PEvvl3nRok9zbHUHnZqaLi0l0Byb12wpW9mH+T8heEvO1FVV3dLnFCa68/Wv4lo18SSQVwA6F7GlQ63JCCV7M6PZP1Jd9h60r+c9K27bhlU+HVNyyPX5enW/NG52OqqqdEi4EJT9zZbW5uOX1p7eCz4DpRzyhBPySzGcBy19yB/VW/sj5ZovA/TeVudcpSIgLTT018TE8CFSBsD9KqJr1wBHTuPUa+3OfKruHkNl2DEv8nbI0pDEruwub0YLYfRgmo/4iYJLW5e0mvR; 4:j2MEXkHuT9x5ftSXnO1lqKymjUZ3VH6eyJdTGX6Mj/0lyT2ZPBNiwBj8tDMFiziBlnD6YKUWvLcO+YIn0I8L1nExj782mX1f0XD4wklpM7/XWBhGTetEYOTfO5HdOPk9BIb6uzVnI0+TtFx6PKwI150JUwqHsxU+x6KRYLFvMYYNPGZcB5Lgbs+pwEBZ3lyh9wwlZ9n3t49T/s0bmVWrOwQebJ/R99+n5xLNznr3M9EIpVg8X04EtW7tnDHgVfyvFnAYoy24UpIaviyBNU9iEdDKSdCQq5TG7r6LyrIxrjqOspCT5CXBBMHGbMiqArWg X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:DB7PR04MB5033; BCL:0; PCL:0; RULEID:; SRVR:DB7PR04MB5033; X-Forefront-PRVS: 0771670921 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(366004)(376002)(136003)(396003)(346002)(39860400002)(189003)(199004)(8676002)(2906002)(476003)(478600001)(5660300001)(4326008)(575784001)(1076002)(36756003)(26005)(2616005)(86362001)(6116002)(956004)(3846002)(7736002)(486006)(52116002)(51416003)(47776003)(81166006)(16526019)(305945005)(186003)(6666003)(386003)(97736004)(2361001)(66066001)(6506007)(5009440100003)(25786009)(6916009)(81156014)(55236004)(16586007)(6486002)(68736007)(316002)(6512007)(50466002)(48376002)(50226002)(14444005)(8936002)(53936002)(2351001)(105586002)(106356001)(110426005)(139555002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB5033; H:pramod.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB7PR04MB5033; 23:0Vk8Tjcxog4JuLjaPq4KP4fYCRnpqWyKlCZjch7u0?= aqBJlAghcaIqMP7+deR4i4Y8yRriB4wu5FQRJ6pjw9acW2GTle2D1/aUthkYfkEOlxF/1hHx8SUzYs+NT0SrSv4KrZtrXmr9reTc/57jvYlUyVBkz7LRjp1LgjTMG4vBFyCBnA6Z2FNIxdHrmpcbfxks6Pud4MNEa6oNfUs2RVwq+TEVrKSheiyeEZ/ox6ShSc3Jqc7vS6XPBp5pP6txbfiMFfIk8pwT/ceS6XKk51dP3dELsZ7UljKbSVjyX5qdvlkAyHFNQQpsTljqDXmNpP40+D6PEc/JcV0chOt8Uw701fgwu2786ep0s632Cx78NDQsaNoGbbKSC7RGUYUUWQWMTVjsDwwNCBMADXtBDDEku0KtzgKpH5BiRUMkf4MdZD+KOjBSC56GqzmJuBq35+s5+7cnWCp4Dx9uuclCt99+dDfALx14VQ7AmSsyG918pfOAv89cyNsfrPl/q/RlnDTqQ41sScNnVAnP/h1Iy0FNnNv0+5MKd4nJG1+D8Lu/VxnmWCfIR+9tz6ZS0xPQbYiOgHc7k6OiwxaKirkwS87LGd31qDabz1/VvvVhmhy7dSnkl+sCAENwEHSkLd/hp68bv4K4Ab983CyWoj2RANyP2XZr106xx15VsIN+Xxji0zg1NoA/c1iya53Dv8zVK1lWRUkVN7YsG9+R6lQZTg1qQbVItOy4RgLT0MO5nASnR43FlqjB21QZf1uOc6SKDSSuWrIvLZ0jacj+Yb74Hm3zywjhYSTGwe8WySYjIr9Yoc8YYIEn2tnU1FUZBKl/JjP2RqPYiKzbHlrLir4QVaC7zhsYqWF733bvuY3XoMKgQvnTS96F4LOYmeNy9BoMKDzV2GXQf/R2Fi62PDGNsXgR97UT5dTod2VsabEwqNNumM/KxVUtAfTe7+Ekfh4aGWULl7+IztdxzfCFm5zCujVC8cTDdAgEphN89uVLsLfNkD/kv2KP2ncH9j0jC+cxcdrUmqkCOZ7Ag6l6G2LCBMSMRTXK1XcIIMsmAYv3Dhe2z2Xlb88roaZSrXAMBRYJkvgJc79LNt2fhjDfptQBvfOltQTjJZIW9CVrkpynD7KTEnSsLsPLiEXu5Fvvj0+lJhZR1J2Zs0vITa32Wl3sC3JDY1wpZtxreMNGPvz7NyG2+fBvzVIlMfLonlmoDyG8+yAEeaH5UTCXbbM/hMDrUbG82+LQRNEFLeI24Lsb4za8WnDSo0BikZ54i/HjFCoJ6Y0CAbDqivDy3SWtSmeSsB83GJ1M+Mq4jULMHIfk5DAzGMIF2lFrPLIX8fCSFMh1XF1nwFZClxz+WVtFGuAzVf90cBQ6MBPtLxJuES+vMJWtjOUXOvScIGSyzUjHm1/Al6C X-Microsoft-Antispam-Message-Info: 9SwNavRKHiZCcEuQHjlNwxvVYo53Dgze/c1MHHru8WkVMJC9CQTddZ3T7lMDupAmgWN14MZ/R0aP3wqwNnT1/UD3Yy0Z31OH34ke2yRpoPkfdH4WZCQDcs7NYO1rBJyt7rjYF60VOQYNoqlJLC85rdazoPoKtBiJXgIvfezdt2ZxN8EYKOkipguOvI4z/s0g8HKycycd0txoLM7kFWLw8R1B9VQNxs2FGtBdb+f2p6NI7nmywTunYVUPpC06/RhRYce06jcRWzU9Xgiadc741Ege9FtxbpT/dkgcgDZhP2nbncf7wzrcKITr5jcjkFWP3lqYYKKyKXWRX7UJOaiXes8SCuxrjuY/R0A6t/uPUms= X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB5033; 6:STHBHoeDjxjAgNxAKGAjFGRKfaTJcpWVAeS9kOITRsb4VjXDtTPEzp8mgjbMrgduijCl9EP/Esxrs8Lrt+WhkFq6TAm7GZiSmUPAvFZWSkIgB/KT91/ITjWrq8HgTcC4J1nAsG2rdKT2O3EyY5XYZrCHBOhNJ+cdu2EWN1LWgrAFtizgMErH2LP1zeb1BGwROkxAkRxGrbaCoG68JLprxv8YLyJIXE8RYKr8Gt5XfIKBMj+T3EKKwYwy6l/cWc4FS9bRpeje6n2Q80S2HtXOW9pvCOS0TX+YuTP+cRytbhCqEtwOUA444vmmZc0R4xO7XwYjkx1Gnh4k+SkUT5joFZibBceggGBgvaLJ+y9lRj6Jr1Tz6Omja7BgmpZRxSxEpJHhvKDSBhqtQY+eYSvb6G54HLnxqNUubjW+vcSYQf1/dfGVRESU9J9O4YQBV4HOEUtabAYze8q5MkMNhN7C4w==; 5:7h4OQxhcfwlR3O2U4kCFoou9vla++fjsh43GxZPgA9Kcumyyd6uZKF1M1W6rToqG7Z2xtoWInDXbnhomNin+QtfL9/qEEqkSimW6fn6Q4z7XgjZbG/SnBOGwYSr0+63tZPEuH0Jrvtkhw160VMybTo52G+hPioOHZlupMpPMAiQ=; 7:JATdkiNJt8ARLWrIPbRZ/J4GLHtrIAOvsQxgmSfP6TKspqb6T4FJAJlTtUq2hfYF9MIkMQASEhHkGDBaBETZiUYoxYscnZDA59S/UlhEUr7DdyyOgdpv79MkkEOmpRql7aLLzyzoau8xVDotAz0/LrrBqj60EyO27LEcGBNj7prOTtzDbv5tjAxsb7GjB22dfSxBbx8ckShWEZ1tPUuoj+cU7IPSSlQkK6l+TQH/j0ao+acdMwFd/FIkveEMvub9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2018 09:18:51.4418 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c09a624f-e5de-48b0-08ab-08d607471cf0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5033 X-Mailman-Approved-At: Tue, 21 Aug 2018 10:43:31 +0000 Subject: [U-Boot] [PATCH v2] ls1088ardb_pb: Add support for ls1088ardb_pb board. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" ls1088ardb-pb is another varinat of the ls1088ardb. This board support two m.2 x2 gen 3 pcie card slot. There is no support of sata, pcie standard slot, miniPCIE slot and TDM in this board. Signed-off-by: Pramod Kumar --- Changes in v2: - Fix the compilation issue when building u-boot for SD boot. arch/arm/Kconfig | 14 +++ arch/arm/cpu/armv8/Kconfig | 1 + board/freescale/ls1088a/Kconfig | 43 +++++++ board/freescale/ls1088a/MAINTAINERS | 18 +++ board/freescale/ls1088a/Makefile | 1 + board/freescale/ls1088a/ddr.h | 6 +- board/freescale/ls1088a/ls1088a.c | 25 +++- ... ls1088ardb_pb_qspi_SECURE_BOOT_defconfig} | 2 +- ...defconfig => ls1088ardb_pb_qspi_defconfig} | 2 +- ...ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig} | 2 +- ...ig => ls1088ardb_pb_sdcard_qspi_defconfig} | 2 +- include/configs/ls1088ardb_pb.h | 113 ++++++++++++++++++ 12 files changed, 219 insertions(+), 10 deletions(-) copy configs/{ls1088ardb_qspi_SECURE_BOOT_defconfig => ls1088ardb_pb_qspi_SECURE_BOOT_defconfig} (97%) copy configs/{ls1088ardb_qspi_defconfig => ls1088ardb_pb_qspi_defconfig} (97%) copy configs/{ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig => ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig} (98%) copy configs/{ls1088ardb_sdcard_qspi_defconfig => ls1088ardb_pb_sdcard_qspi_defconfig} (98%) create mode 100644 include/configs/ls1088ardb_pb.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 63ec02403a..a653823934 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1120,6 +1120,20 @@ config TARGET_LS1088ARDB development platform that supports the QorIQ LS1088A Layerscape Architecture processor. +config TARGET_LS1088ARDB_PB + bool "Support ls1088ardb_pb" + select ARCH_LS1088A + select ARM64 + select ARMV8_MULTIENTRY + select ARCH_MISC_INIT + select BOARD_LATE_INIT + select SUPPORT_SPL + help + Support for NXP LS1088ARDB_PB platform. + The LS1088A Reference design board (RDB_PB) is a high-performance + development platform that supports the QorIQ LS1088A + Layerscape Architecture processor. + config TARGET_LS1021AQDS bool "Support ls1021aqds" select ARCH_LS1021A diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index c8bebabdf6..8ede276b65 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -100,6 +100,7 @@ config PSCI_RESET !TARGET_LS2080A_SIMU && !TARGET_LS2080AQDS && \ !TARGET_LS2080ARDB && !TARGET_LS2080A_EMU && \ !TARGET_LS1088ARDB && !TARGET_LS1088AQDS && \ + !TARGET_LS1088ARDB_PB && \ !TARGET_LS1012ARDB && !TARGET_LS1012AFRDM && \ !TARGET_LS1012A2G5RDB && !TARGET_LS1012AQDS && \ !TARGET_LS1012AFRWY && \ diff --git a/board/freescale/ls1088a/Kconfig b/board/freescale/ls1088a/Kconfig index 8bb828e3fd..9f20d7247f 100644 --- a/board/freescale/ls1088a/Kconfig +++ b/board/freescale/ls1088a/Kconfig @@ -59,3 +59,46 @@ endif source "board/freescale/common/Kconfig" endif + +if TARGET_LS1088ARDB_PB + +config SYS_BOARD + default "ls1088a" + +config SYS_VENDOR + default "freescale" + +config SYS_SOC + default "fsl-layerscape" + +config SYS_CONFIG_NAME + default "ls1088ardb_pb" + +if SYS_LS_PPA_FW_IN_XIP + +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x20400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 +endif +endif + +if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) + +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif +endif + +source "board/freescale/common/Kconfig" +endif diff --git a/board/freescale/ls1088a/MAINTAINERS b/board/freescale/ls1088a/MAINTAINERS index 4d804d9447..5d841076bc 100644 --- a/board/freescale/ls1088a/MAINTAINERS +++ b/board/freescale/ls1088a/MAINTAINERS @@ -7,6 +7,14 @@ F: include/configs/ls1088ardb.h F: configs/ls1088ardb_qspi_defconfig F: configs/ls1088ardb_sdcard_qspi_defconfig +LS1088ARDB_PB BOARD +M: Pramod Kumar +S: Maintained +F: board/freescale/ls1088a/ +F: include/configs/ls1088ardb_pb.h +F: configs/ls1088ardb_pb_qspi_defconfig +F: configs/ls1088ardb_pb_sdcard_qspi_defconfig + LS1088AQDS BOARD M: Prabhakar Kushwaha M: Ashish Kumar @@ -34,3 +42,13 @@ LS1088ARDB_SD_SECURE_BOOT BOARD M: Sumit Garg S: Maintained F: configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig + +LS1088ARDB_PB_QSPI_SECURE_BOOT BOARD +M: Udit Agarwal +S: Maintained +F: configs/ls1088ardb_pb_qspi_SECURE_BOOT_defconfig + +LS1088ARDB_PB_SD_SECURE_BOOT BOARD +M: Udit Agarwal +S: Maintained +F: configs/ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig diff --git a/board/freescale/ls1088a/Makefile b/board/freescale/ls1088a/Makefile index c2b0e7dc0f..dd5f365378 100644 --- a/board/freescale/ls1088a/Makefile +++ b/board/freescale/ls1088a/Makefile @@ -6,5 +6,6 @@ obj-y += ls1088a.o obj-y += ddr.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_TARGET_LS1088ARDB) += eth_ls1088ardb.o +obj-$(CONFIG_TARGET_LS1088ARDB_PB) += eth_ls1088ardb.o obj-$(CONFIG_TARGET_LS1088AQDS) += eth_ls1088aqds.o endif diff --git a/board/freescale/ls1088a/ddr.h b/board/freescale/ls1088a/ddr.h index b35c4ae2da..7a76f6bd50 100644 --- a/board/freescale/ls1088a/ddr.h +++ b/board/freescale/ls1088a/ddr.h @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2017 NXP + * Copyright 2017-2018 NXP + * + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LS1088A_DDR_H__ @@ -27,7 +29,7 @@ static const struct board_specific_parameters udimm0[] = { * num| hi| rank| clk| wrlvl | wrlvl | wrlvl * ranks| mhz| GB |adjst| start | ctl2 | ctl3 */ -#if defined(CONFIG_TARGET_LS1088ARDB) +#if defined(CONFIG_TARGET_LS1088ARDB) || defined(CONFIG_TARGET_LS1088ARDB_PB) {2, 1666, 0, 8, 8, 0x090A0B0E, 0x0F10110D,}, {2, 1900, 0, 8, 9, 0x0A0B0C10, 0x1112140E,}, diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index a0dab6fc2e..f69d71b1dd 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017 NXP + * Copyright 2017-2018 NXP + * + * SPDX-License-Identifier: GPL-2.0+ */ #include #include @@ -28,6 +30,15 @@ DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_TARGET_LS1088ARDB_PB +int fixup_ls1088ardb_pb_banner(void *fdt) +{ + fdt_setprop_string(fdt, 0, "model", "LS1088ARDB-PB Board"); + + return 0; +} +#endif + int board_early_init_f(void) { #if defined(CONFIG_SYS_I2C_EARLY_INIT) && defined(CONFIG_TARGET_LS1088AQDS) @@ -78,6 +89,9 @@ int checkboard(void) #ifdef CONFIG_TARGET_LS1088AQDS printf("Board: LS1088A-QDS, "); + +#elif CONFIG_TARGET_LS1088ARDB_PB + printf("Board: LS1088ARDB-PB, "); #else printf("Board: LS1088A-RDB, "); #endif @@ -327,7 +341,7 @@ void board_retimer_init(void) #ifdef CONFIG_MISC_INIT_R int misc_init_r(void) { -#ifdef CONFIG_TARGET_LS1088ARDB +#if defined(CONFIG_TARGET_LS1088ARDB) || defined(CONFIG_TARGET_LS1088ARDB_PB) u8 brdcfg5; if (hwconfig("esdhc-force-sd")) { @@ -459,7 +473,7 @@ exit: int board_init(void) { init_final_memctl_regs(); -#if defined(CONFIG_TARGET_LS1088ARDB) && defined(CONFIG_FSL_MC_ENET) +#if defined(CONFIG_TARGET_LS1088ARDB) || defined(CONFIG_TARGET_LS1088ARDB_PB) && defined(CONFIG_FSL_MC_ENET) u32 __iomem *irq_ccsr = (u32 __iomem *)ISC_BASE; #endif @@ -470,7 +484,7 @@ int board_init(void) gd->env_addr = (ulong)&default_environment[0]; #endif -#if defined(CONFIG_TARGET_LS1088ARDB) && defined(CONFIG_FSL_MC_ENET) +#if defined(CONFIG_TARGET_LS1088ARDB) || defined(CONFIG_TARGET_LS1088ARDB_PB) && defined(CONFIG_FSL_MC_ENET) /* invert AQR105 IRQ pins polarity */ out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR105_IRQ_MASK); #endif @@ -584,6 +598,9 @@ int ft_board_setup(void *blob, bd_t *bd) return err; #endif +#ifdef CONFIG_TARGET_LS1088ARDB_PB +fixup_ls1088ardb_pb_banner(blob); +#endif return 0; } #endif diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_pb_qspi_SECURE_BOOT_defconfig similarity index 97% copy from configs/ls1088ardb_qspi_SECURE_BOOT_defconfig copy to configs/ls1088ardb_pb_qspi_SECURE_BOOT_defconfig index d0334a239f..d2faf25f39 100644 --- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_pb_qspi_SECURE_BOOT_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_LS1088ARDB=y +CONFIG_TARGET_LS1088ARDB_PB=y CONFIG_SYS_TEXT_BASE=0x20100000 CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_pb_qspi_defconfig similarity index 97% copy from configs/ls1088ardb_qspi_defconfig copy to configs/ls1088ardb_pb_qspi_defconfig index d806966540..cb9eac88a9 100644 --- a/configs/ls1088ardb_qspi_defconfig +++ b/configs/ls1088ardb_pb_qspi_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_LS1088ARDB=y +CONFIG_TARGET_LS1088ARDB_PB=y CONFIG_SYS_TEXT_BASE=0x20100000 CONFIG_FSL_LS_PPA=y CONFIG_QSPI_AHB_INIT=y diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig similarity index 98% copy from configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig copy to configs/ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig index 08b9caeb34..0216974ca7 100644 --- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_LS1088ARDB=y +CONFIG_TARGET_LS1088ARDB_PB=y CONFIG_SYS_TEXT_BASE=0x80400000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_pb_sdcard_qspi_defconfig similarity index 98% copy from configs/ls1088ardb_sdcard_qspi_defconfig copy to configs/ls1088ardb_pb_sdcard_qspi_defconfig index bf1c0a2d7b..c501795ef0 100644 --- a/configs/ls1088ardb_sdcard_qspi_defconfig +++ b/configs/ls1088ardb_pb_sdcard_qspi_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_LS1088ARDB=y +CONFIG_TARGET_LS1088ARDB_PB=y CONFIG_SYS_TEXT_BASE=0x80400000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/include/configs/ls1088ardb_pb.h b/include/configs/ls1088ardb_pb.h new file mode 100644 index 0000000000..8f4612ae65 --- /dev/null +++ b/include/configs/ls1088ardb_pb.h @@ -0,0 +1,113 @@ +/* + * Copyright 2018 NXP + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __LS1088A_RDB_PB_H +#define __LS1088A_RDB_PB_H + +#include "ls1088ardb.h" + +#ifndef SPL_NO_ENV +/* Initial environment variables */ +#if defined(CONFIG_QSPI_BOOT) +#define MC_INIT_CMD \ + "mcinitcmd=sf probe 0:0;sf read 0x80000000 0xA00000 0x100000;" \ + "sf read 0x80100000 0xE00000 0x100000;" \ + "env exists secureboot && " \ + "sf read 0x80700000 0x700000 0x40000 && " \ + "sf read 0x80740000 0x740000 0x40000 && " \ + "esbc_validate 0x80700000 && " \ + "esbc_validate 0x80740000 ;" \ + "fsl_mc start mc 0x80000000 0x80100000\0" \ + "mcmemsize=0x70000000\0" +#elif defined(CONFIG_SD_BOOT) +#define MC_INIT_CMD \ + "mcinitcmd=mmcinfo;mmc read 0x80000000 0x5000 0x800;" \ + "mmc read 0x80100000 0x7000 0x800;" \ + "env exists secureboot && " \ + "mmc read 0x80700000 0x3800 0x10 && " \ + "mmc read 0x80740000 0x3A00 0x10 && " \ + "esbc_validate 0x80700000 && " \ + "esbc_validate 0x80740000 ;" \ + "fsl_mc start mc 0x80000000 0x80100000\0" \ + "mcmemsize=0x70000000\0" +#endif + +#undef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + "BOARD=ls1088ardb_pb\0" \ + "hwconfig=fsl_ddr:bank_intlv=auto\0" \ + "ramdisk_addr=0x800000\0" \ + "ramdisk_size=0x2000000\0" \ + "fdt_high=0xa0000000\0" \ + "initrd_high=0xffffffffffffffff\0" \ + "fdt_addr=0x64f00000\0" \ + "kernel_addr=0x1000000\0" \ + "kernel_addr_sd=0x8000\0" \ + "kernelhdr_addr_sd=0x4000\0" \ + "kernel_start=0x580100000\0" \ + "kernelheader_start=0x580800000\0" \ + "scriptaddr=0x80000000\0" \ + "scripthdraddr=0x80080000\0" \ + "fdtheader_addr_r=0x80100000\0" \ + "kernelheader_addr=0x800000\0" \ + "kernelheader_addr_r=0x80200000\0" \ + "kernel_addr_r=0x81000000\0" \ + "kernelheader_size=0x40000\0" \ + "fdt_addr_r=0x90000000\0" \ + "load_addr=0xa0000000\0" \ + "kernel_size=0x2800000\0" \ + "kernel_size_sd=0x14000\0" \ + "kernelhdr_size_sd=0x10\0" \ + MC_INIT_CMD \ + BOOTENV \ + "boot_scripts=ls1088ardb_boot.scr\0" \ + "boot_script_hdr=hdr_ls1088ardb_bs.out\0" \ + "scan_dev_for_boot_part=" \ + "part list ${devtype} ${devnum} devplist; " \ + "env exists devplist || setenv devplist 1; " \ + "for distro_bootpart in ${devplist}; do " \ + "if fstype ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "bootfstype; then " \ + "run scan_dev_for_boot; " \ + "fi; " \ + "done\0" \ + "scan_dev_for_boot=" \ + "echo Scanning ${devtype} " \ + "${devnum}:${distro_bootpart}...; " \ + "for prefix in ${boot_prefixes}; do " \ + "run scan_dev_for_scripts; " \ + "done;\0" \ + "boot_a_script=" \ + "load ${devtype} ${devnum}:${distro_bootpart} " \ + "${scriptaddr} ${prefix}${script}; " \ + "env exists secureboot && load ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr} " \ + "&& esbc_validate ${scripthdraddr};" \ + "source ${scriptaddr}\0" \ + "installer=load mmc 0:2 $load_addr " \ + "/flex_installer_arm64.itb; " \ + "env exists mcinitcmd && run mcinitcmd && " \ + "mmc read 0x80001000 0x6800 0x800;" \ + "fsl_mc lazyapply dpl 0x80001000;" \ + "bootm $load_addr#ls1088ardb\0" \ + "qspi_bootcmd=echo Trying load from qspi..;" \ + "sf probe && sf read $load_addr " \ + "$kernel_addr $kernel_size ; env exists secureboot " \ + "&& sf read $kernelheader_addr_r $kernelheader_addr " \ + "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\ + "bootm $load_addr#ls1088ardb\0" \ + "sd_bootcmd=echo Trying load from sd card..;" \ + "mmcinfo; mmc read $load_addr " \ + "$kernel_addr_sd $kernel_size_sd ;" \ + "env exists secureboot && mmc read $kernelheader_addr_r "\ + "$kernelhdr_addr_sd $kernelhdr_size_sd " \ + " && esbc_validate ${kernelheader_addr_r};" \ + "bootm $load_addr#ls1088ardb\0" + +#endif +#endif /* __LS1088A_RDB_H */