From patchwork Fri Oct 12 14:44:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 983130 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="eo5Hv7cw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42WrdL6NTFz9s3Z for ; Sat, 13 Oct 2018 02:01:26 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9278EC21E0B; Fri, 12 Oct 2018 14:52:46 +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 6AE78C21EBD; Fri, 12 Oct 2018 14:46:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5FA74C21DD4; Fri, 12 Oct 2018 14:46:14 +0000 (UTC) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40041.outbound.protection.outlook.com [40.107.4.41]) by lists.denx.de (Postfix) with ESMTPS id 72C89C21DB5 for ; Fri, 12 Oct 2018 14:46:04 +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=wZN8N6j+A0bnQYAzLS0tbmQM96rXsq0zdJRKLw6C5Vo=; b=eo5Hv7cwkttD2W7PCWGgfUnMkWhOCAHpmcEQ1b0XbIWH3ND7VyNz+r6NQb5j0SROuQljLg8SnDMaGtQczAxzyAN5qg3R0KVwcnseSDDfcaYwVrztSjN8cWHqasc+O6kwAMSRe2G3k+uopo6Q/dWK6sQB4kfjABgOWUURTazSGPY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by DB7PR04MB4858.eurprd04.prod.outlook.com (2603:10a6:10:18::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.21; Fri, 12 Oct 2018 14:46:02 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Fri, 12 Oct 2018 20:14:47 +0530 Message-Id: <20181012144454.3707-21-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181012144454.3707-1-rajesh.bhagat@nxp.com> References: <20181012144454.3707-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: PN1PR01CA0109.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00::25) To DB7PR04MB4858.eurprd04.prod.outlook.com (2603:10a6:10:18::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0628a585-9f35-42c9-bc2c-08d630516f45 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:DB7PR04MB4858; X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4858; 3:SrXrDjGGVdhrFsnDRxxzfV5SqqC7NDrFxkdBam3+xzkgKP/B5n4hQ6U2gyvIs8AcRKaigf4psh70cwY4nOwZFHLxDVF+zRw+PmxTPNzI9gZIPc0KLAf0ENWu+s2FMbJERMTdWa7SMd7ojEGGifZbnCDXAisWQsEjWaXTIuc18WnzvjLqs6v7OFvlqV6aa4FBt4/KshbyW2d8XazCj1e1WQQmwVWVD1XtGmtvkfnbspCJ1F2amnwB3lNfSwujVbC/; 25:uVyRUUwpYsokbBROJmyvCbFDXTgxL/7H64rovFbYCWC5MR4sfv5so28+aM1tKRJU5M4CbPicyIw83OptFJA+0DmReNQapj6c52Q5v7NLQgUtGeBBpdkOShK9ByrKGaOmboBu1zXESC7+bH/t+ej+c4K2c5v3iBwDGCqvlTu697nHImEHgQ5Fh+TylG5U9Jpbp3MVE99sE/FWK1hE9XhAUr8VrVygK/RkrDnhqjs9hoISmyzbZ94OjVjQjhOKuKOgG3+YhCBXjwM8ARIMrD9bv7w79CXTccV+wXGo6SuWOuxav8pC9H5MWL099hnOzDLCpIuNK0d2jdnXd/855J47FQ==; 31:JQKu4t/1a2aARWScVsD5xa4gK/aJKhAaUviJD9T/Owc5B3ltgB3OfGyAXaEUbJUqGfY3KhE1uRh+o7axpDSNHUTHv9RQmiK1Zst/xkWij+naMbMw2cheO67k6tk1mbaG08R6gjG8bvZZh0zu5UN9Me3M+/gzgRy1VjehRPbfJOGCmCEkpsRgUFgpwLm8KnAqrOIwSGtpf9iu3g41UyuITbgXS3CK7cLDnM9AofTB760= X-MS-TrafficTypeDiagnostic: DB7PR04MB4858: X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4858; 20:pf6vUTXgBMOS30me97pWvE/Fay1JVNENFPY4HDAwquC+bCkDX377IVrfUAthFoUEtjqK/jjTO8rgW5QnGWnWPr7tktcwi+Z9/6ROX8ogNVThmm/HSHM8FNat4R+ZGOJGQVQxcdkKYgn2A5p7WV5FQy0G6bqd9SZxs2l9I2tKkrmxC9aHNYg5B9J4e2aaHkrUoH5GFyEhAawSBAxGVpMIoeRIQmtA8q2a4ZjE4KSxgNBzrJozuHOYSWJuuEKRRWvP558aftqzmQK7T0glA3nzkoYIe/K2HedLFoibE8VoWRk+y//gNoG2FfaUa4LtvAARNDat8uDH4ZnFLjE0Nx7KWHGThBenIG7wggvB/9ci0drlLRJkop3VyZF9sRw2j0xDppZWJAYps/NHRmUv9N+QlVjlDBH2UQXOubYFKU5q2tDsEnJu4sBPd/chuhjJHYjm130y4xI3OSfnOnSG4Oq4XR5q1W9yj05R+dc1iNOm5xt26EoNJRtdlcoDb/IpYgiI; 4:cIE2EZQvv1a2dWQrTYOYlRRLa0KBeqJ5SBfMUJCeXPhBybXmagzjefns7SaZECYWqSJ6hB9V2Zpr6VarVOOHKPgjhJe1saDucQhnZL7m5AV1b4dPpORZJiwzcem5RY8nVrI84x2q6s0e7vRqNJFsaJXOtVMEtqWl805sVw+cmVW4ipJ5D6VmYbWM568aPGHBOEDfjDPStdvujyYtPjlQG2CQnxi2PowRSDNuHb7Xce+rGUJDc99C1hnTTO1CRBk33ghPW4QQ3/vIPfupoVz5wGrKwGTzVl9gnC5HZRSWxMqsq6O4OgbJNmftCJM1+sPD 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)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699051); SRVR:DB7PR04MB4858; BCL:0; PCL:0; RULEID:; SRVR:DB7PR04MB4858; X-Forefront-PRVS: 0823A5777B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(136003)(396003)(376002)(346002)(366004)(199004)(189003)(11346002)(16586007)(50466002)(446003)(16526019)(186003)(54906003)(305945005)(48376002)(7736002)(86362001)(50226002)(486006)(6506007)(386003)(1006002)(6666004)(55236004)(76176011)(51416003)(52116002)(1076002)(81166006)(6116002)(3846002)(8676002)(2351001)(105586002)(2361001)(8936002)(68736007)(316002)(81156014)(106356001)(25786009)(6486002)(14444005)(97736004)(478600001)(26005)(2906002)(4326008)(66066001)(956004)(2616005)(476003)(44832011)(36756003)(6512007)(53936002)(6916009)(5660300001)(47776003)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB4858; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB7PR04MB4858; 23:PzbpCzGVRQAzZDge8csxs7KEgRQI9tSfcj8JizrBk?= jqCbOG/irPoRS7TYWsVlxBXe/V6v4r6fzBA5cHXYqsSBkmvuRVTO0ILs6lxPwK3Kf/TwAS3LQXmBy/F391HUojSeNGaByfwZQDJs45cFLKFUIuQwExFY8RHzvojZ1qUlTWDcoQfqk4KvdTkOAvQk0VWtaD3DGv2vwPCShGRu+1vxPpR58dfetd3pVbfa6c/fCuLcx6eiQSm3JWkdTJp3dCA0uTunYWZ0SqBAYHwn0PI/YRz6MG8leWi8xyHOT2T7+27dptFXFjvSFCYpiw9u4A4FBgkQzTQ/YSIXeYQ01cnGXnYJOnHYFJSCG/0KDioO2AcVxdR4HSWDnVPJbQLqVwlTh/oL+Ew5ROPaJ2ThV32ceEpUJuySpkPGZSvxIjoFPIJA3gwrnGmF41amw4wLkknqXjEFsci2VWCEgbPZfkDPbFl6CkNyh0IcqPTmv60IkS4la5NKsQRoaLKwPCQ+GotqpE6zzSW0WqUtkxccS+frRSpBs+EqjNqjFxY9gSqW0VfmrMI6jUGxdiBb6VncTOMnaxDZ2QwPQX4FC8zVMwfeQKY+POBb7HCngE5SqMA0t8FqoFwgh3OuKP/U8noI3n9NjwSQf4he5VK0hpKusAznBIE0Z6S74TDPt4LKk1HcLb67RCAzTNFKaNDFJ+2BfL4Ts2gIDp6x7+TfSLhWtlUGN0QHtQbN1eW3BmQ+gvPyYLrcFS0cyEScuF0uCLYHzPq4RxSGuldV+mrDIwc+xHKFipvmbbIU/pIUuXAn35K1yEa1Hmr25S2K33flYaS8Q77yN2BHGduVB+G1rNTVuSFHbRGwevgv3XUhtcED1ziTyDo6IrJYHdmYZrrApE1qAo8OZumBduuwu+x4iunBUzjTBI0d5Jlfp/Td7kso8e5iiwqHPE9AYn8vP3lQWbjsSuKWIpEJIRscUNf5ZXlv0oJJKrwuVgltG/tD6cSLq8tlpcsmpw2wtwWIJILjnE3kuCwVb0nUGrS6y+kFhENVp+lJH/VuOh1HhkbDlYof5B57T/kKYaGNbZOZWjE6wZqbHzqLcd7CNpjqtawD5Dp02ce2DLj5sAFsiDejiuEJaDSLagQGrf0AUqwS+UVYX5bjTpZmBC4rSPi3Lhjo0cvp79cMfo7Zj0daOcg+efbUsAqqd6x4eZloxc4fNz+O94iYJ1wwsOLiMvembUBmidh6RB1mjiphM/RdnY5D7eDI+oIWEK/xYpWDo7zHUPxtf4L0YZccUwqWJzUN1ewP4GTquJ7v/VzQQRSwrIjfzNwfCA7wb1pXXGGT76n66nYF7tsaItZerm1orAWu/Pq8tRRbn0VUA== X-Microsoft-Antispam-Message-Info: 9wn2KeSTIKfQp+RmszmV1ddhmdu8+/AKkEx3Rp7/FJUEysxwLFE7TQA57oGG00jXKnstCJL6gE0z29678/ARxHDAL+I0NUZc8h0E0pEc0e0rpuK6jSl/6SvSCqKVdKFggJO+PJhGKr/CDHO8RI66Xcdmkqf2CpiF/y9eaTFdPmuW2uafsb2wMu9J1hNl07TQGT8jikv1G00lmOoygRwOhrvskujGa1Z2aZzD8q6vmTrHxpItGPaKdxGccy+vyKUladBht3zJZoyD3VjqYK+9WQC1MaT0rL8T0wnTnKhGLgNZIWL8pnRSuXBIWOaIu10VnK53P7GIiHfcUeQ6qrTbDBvwyWj+ZhXlJyJJlIV/soQ= X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB4858; 6:qsccDTGmArvRX3l81+2SZZp+9732+NHYg3NDzXiZTUkGg3j+ZxVwiM73BbQD7TNiwBsNMe2QxHXlHhIC2KHdf7k6+Kd90q191ZyvFE6vLgz5Zjublz/RpOlQBL/wDbbsX5mW61+DQcpSHoroeZd6Joof6GZ1fFMrX3NBpWpV4QH4A+xiDeTkHZ5EyFO0zWGzSHpojPCf5DiEAVtOV5znDpLCHR0NRgxH5CPEU1BcBxabV9Vya1CSCjzVDkQkgHNFaAfKhccCiBy4hIIxg7K4tikhhAPp3j926IkArtwGa65+8qBW8PmVRpdq238h9KeFmSkgwurBRopRmV6YYb27ckZjwJ3bBlcZ2aedAA+VJy5Ej84huj/VhgLH9AwSjJbUfIc1yL91X6mJ9UNP5qfMEHPhnZxMc7VTYVKrWUTppG50Tf854QFzD58R+DDvuzS7AicKmNz5uHboO1S7PU3N0A==; 5:QQq3LHnH/anx8LgEYxJzIcR0uNaJtdwzIHAtRNSc09haVDXEpphaAcF5q/xLvMnJLMj8kGjLx1+97ssHTMWd8HrsNmlAzSaVIVI/X7tmGHjMU/mE5RdijHALNdKa1AT9/oSAlN0lSry0d7HmRKb6F7v35s8T5gvXbQDDiBGSess=; 7:5LdmNdB29oK3G2/noyG/5ybOLs58m0fcsZqDJGz3WFuFn00K7m4mKJJAsne2DROgimedf5S+6s0V8i0soyUSwXmHtfmpyDIePaeLgOP9LTd8pETYLryMFAZkcNkt/9hZQq7NVBrIFJAcM72vJW/f1pYadd1QVXWMaBZblqaaSTKRO/2RVI9bmiWw0zd7kH5eDRnaC0fJrE9INv+mt6VnyHWfcGxgebqwOUkg6TnSbK4LL6nmIRAIfzimFLVp2GdD SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2018 14:46:02.4280 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0628a585-9f35-42c9-bc2c-08d630516f45 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4858 Cc: Pankit Garg , Vinitha V Pillai Subject: [U-Boot] [PATCH v4 20/27] armv8: ls1046ardb: Add TFABOOT support 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" TFABOOT support includes: - ls1046ardb_tfa_defconfig to be loaded by trusted firmware - environment address and size changes for TFABOOT - FMAN address changes for TFABOOT - define BOOTCOMMAND for TFABOOT Signed-off-by: York Sun Signed-off-by: Pankit Garg Signed-off-by: Vinitha V Pillai Signed-off-by: Rajesh Bhagat --- Change in v4: None Change in v3: - Removed TFABOOT generic code - Added ls1046ardb_tfa_SECURE_BOOT_defconfig Change in v2: - Merged ls1046ardb TFA boot support patches - Removed extra CONFIG_TFABOOT flag usage board/freescale/ls1046ardb/ddr.c | 12 +++++ configs/ls1046ardb_tfa_SECURE_BOOT_defconfig | 52 ++++++++++++++++++++ configs/ls1046ardb_tfa_defconfig | 49 ++++++++++++++++++ include/configs/ls1046a_common.h | 12 +++++ include/configs/ls1046ardb.h | 15 ++++++ 5 files changed, 140 insertions(+) create mode 100644 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig create mode 100644 configs/ls1046ardb_tfa_defconfig diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c index 82b1b1d9ea..321222d68d 100644 --- a/board/freescale/ls1046ardb/ddr.c +++ b/board/freescale/ls1046ardb/ddr.c @@ -97,6 +97,17 @@ found: popts->cpo_sample = 0x61; } +#ifdef CONFIG_TFABOOT +int fsl_initdram(void) +{ + gd->ram_size = tfa_get_dram_size(); + + if (!gd->ram_size) + gd->ram_size = fsl_ddr_sdram_size(); + + return 0; +} +#else int fsl_initdram(void) { phys_size_t dram_size; @@ -117,3 +128,4 @@ int fsl_initdram(void) return 0; } +#endif diff --git a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig new file mode 100644 index 0000000000..8102d13d7d --- /dev/null +++ b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig @@ -0,0 +1,52 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1046ARDB=y +CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_SECURE_BOOT=y +CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y +CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y +CONFIG_QSPI_AHB_INIT=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_TFABOOT=y +CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)" +CONFIG_MISC_INIT_R=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_CACHE=y +CONFIG_MP=y +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)" +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_FSL_CAAM=y +CONFIG_FSL_ESDHC=y +CONFIG_SPI_FLASH=y +CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_PHY_GIGE=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_ENV_IS_NOWHERE=y +CONFIG_USB=y +CONFIG_FSL_QSPI=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y +CONFIG_RSA=y diff --git a/configs/ls1046ardb_tfa_defconfig b/configs/ls1046ardb_tfa_defconfig new file mode 100644 index 0000000000..5bc80ed24e --- /dev/null +++ b/configs/ls1046ardb_tfa_defconfig @@ -0,0 +1,49 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1046ARDB=y +CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_QSPI_AHB_INIT=y +CONFIG_TFABOOT=y +CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y +CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)" +CONFIG_MISC_INIT_R=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_CACHE=y +CONFIG_MP=y +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)" +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM=y +CONFIG_FSL_CAAM=y +CONFIG_FSL_ESDHC=y +CONFIG_SPI_FLASH=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_PHYLIB=y +CONFIG_PHY_GIGE=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_FSL_QSPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index cdb73f644a..6e36c9339b 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -33,7 +33,11 @@ #include /* Link Definitions */ +#ifdef CONFIG_TFABOOT +#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE +#else #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0) +#endif #define CONFIG_SKIP_LOWLEVEL_INIT @@ -165,6 +169,13 @@ #define CONFIG_SYS_FM_MURAM_SIZE 0x60000 #endif +#ifdef CONFIG_TFABOOT +#define CONFIG_SYS_FMAN_FW_ADDR 0x900000 +#define CONFIG_ENV_SPI_BUS 0 +#define CONFIG_ENV_SPI_CS 0 +#define CONFIG_ENV_SPI_MAX_HZ 1000000 +#define CONFIG_ENV_SPI_MODE 0x03 +#else #ifdef CONFIG_SD_BOOT /* * PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is @@ -187,6 +198,7 @@ #define CONFIG_SYS_QE_FMAN_FW_IN_NOR #define CONFIG_SYS_FMAN_FW_ADDR 0x60900000 #endif +#endif #define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000 #define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH) #endif diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index ffca410b1a..cc1f5f5f55 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -160,6 +160,13 @@ #define CONFIG_ENV_OVERWRITE #endif +#ifdef CONFIG_TFABOOT +#define CONFIG_SYS_MMC_ENV_DEV 0 + +#define CONFIG_ENV_SIZE 0x2000 /* 8KB */ +#define CONFIG_ENV_OFFSET 0x500000 /* 5MB */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */ +#else #if defined(CONFIG_SD_BOOT) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OFFSET (3 * 1024 * 1024) @@ -169,6 +176,7 @@ #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */ #endif +#endif #define AQR105_IRQ_MASK 0x80000000 /* FMan */ @@ -208,6 +216,12 @@ #ifndef SPL_NO_MISC #undef CONFIG_BOOTCOMMAND +#ifdef CONFIG_TFABOOT +#define QSPI_NOR_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \ + "env exists secureboot && esbc_halt;;" +#define SD_BOOTCOMMAND "run distro_bootcmd;run sd_bootcmd; " \ + "env exists secureboot && esbc_halt;" +#else #if defined(CONFIG_QSPI_BOOT) #define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \ "env exists secureboot && esbc_halt;;" @@ -216,6 +230,7 @@ "env exists secureboot && esbc_halt;" #endif #endif +#endif #include