From patchwork Tue Jun 26 21:48:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 935107 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="ey2+3Eow"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41Ffpb5YRfz9rx7 for ; Wed, 27 Jun 2018 07:49:59 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6A4A6C21E02; Tue, 26 Jun 2018 21:49:43 +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 08DC1C21E15; Tue, 26 Jun 2018 21:49:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 30731C21DFD; Tue, 26 Jun 2018 21:49:28 +0000 (UTC) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10066.outbound.protection.outlook.com [40.107.1.66]) by lists.denx.de (Postfix) with ESMTPS id D6F14C21D65 for ; Tue, 26 Jun 2018 21:49:24 +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=RnvCV4UMsQpp4UH9XXVRacWYmnRCac8Uyxo+6hG4UII=; b=ey2+3EowGoBRljnL0GDdeEnArXQ4qF9fTD/metypGzw1gxPmrSLvVC8StkV9ZcYVnPxF9cTi0rEYsVHQ4MEhgTXJiST3tT1ab81wXUROKhm3UQc05/CtGlQQ5gU+ZW0Zcb4e5qsGqyRhD5NZV2ridM0odjF1BDNd4dJI0YsK45U= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=york.sun@nxp.com; Received: from oslab-l16.am.freescale.net (192.88.158.246) by VI1PR04MB2079.eurprd04.prod.outlook.com (2a01:111:e400:7bde::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.24; Tue, 26 Jun 2018 21:49:15 +0000 From: York Sun To: u-boot@lists.denx.de Date: Tue, 26 Jun 2018 14:48:29 -0700 Message-Id: <1530049710-18039-2-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530049710-18039-1-git-send-email-york.sun@nxp.com> References: <1530049710-18039-1-git-send-email-york.sun@nxp.com> MIME-Version: 1.0 X-Originating-IP: [192.88.158.246] X-ClientProxiedBy: CO2PR06CA0053.namprd06.prod.outlook.com (2603:10b6:104:3::11) To VI1PR04MB2079.eurprd04.prod.outlook.com (2a01:111:e400:7bde::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85e8ba4e-0a98-4a2e-6a58-08d5dbaead3f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB2079; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB2079; 3:5rNyzE0exUUBEVGSJnYv7NgcSqSAz11TCY3sVX0jeU5zlt9f8WFPrR5+zJfpeM7/NLN1t78IjrPNaCv8sm8Bcny2XZ4LP0JrgUnJWfadOfgkhM/G3eQzrXV2IuaZmHUxzZlIFcQnUCGUu+m9FBIPP7Ri+uo/SfPOiXLACjvi3eROuhBlvIR9uFw4jOUaupFnQsnaJcGIafCsVhOx2kqrh/WF/zQwiXMV/uKEb2wymMxFLWZ0xWKdCZydculoro+Q; 25:3eM+SKn73qLNVNBLx3N+JOV/MJd8E+n4dQEA/Ipa3/ksept0ICG1ce5AXl+4UcfS6Yvrg4CglqINqoukRp8q+6mT64CaR9tGOn6S1NEOdHkczAG0pf44vy/eW0hb42VZ1qrd4hX+Zl0zp0BdWfPL9y0qjrFPsA/yZMj9Vkrbw3yRBvnPFxS5VI/IBCVrk2u8elaURkHWZJsDP+zUbqHzvQbgDxHTYf397qi1Sn0pttdm4jCXxdpgS1B6znEuR3qV+IkYWALrKVfxF3INt2kOx1LIvDkfFb2v/41pNHeBC5KNcFgFrsT8ATcSMpz4O2i6Y1ck2WoEo5oImwi6s/8V4A==; 31:QaW71qjLDNWe1aSgTHF0CF7kUyEOeAy7njPjGVTVcB7rexD8+P8WU3fbep0ENd16mzDYRq7EFNcZmUD+6tO+RUmV+vMLb2RBz/IKHKITVfOKxaGWT4uXTw1A9AsHGwuT7VzapijMdQjr9qwzGdKawUAtli+r7pd8/dIyg8F/ZL6BPFDH0ayK5Crd4NMyuXfZaMT6I76fZc+W7q5Mf3OyOaARtAQCjk7NtDw3gATaH2o= X-MS-TrafficTypeDiagnostic: VI1PR04MB2079: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB2079; 20:HDtVklR9hQTWXFYGZxWZrdAnBHXWweBF/bpjRwSjUtRYGZhbOSP5h3BMRn1ae/5t/9CmcNmUHJz+IRFyjer42tlRYnJLV8j+Hnh0dkLuIYDow0tupSlO3GZzATe2hBFzKn8i8Bgprz4PW+8Vxj4F06K6a5zVYrFdejuceYAOAL1ARAoxr6UQjcMjMKC/j4sbCkkKivD9i8Y4Et9kTY61JKVd2rxcRhReBKxSc7k33KjG4VH+7NJfQD5Rv/GVtOC8jpB2rCq1kdMK8uMLyNkMLwoI5wykX0kRjr+ErprN+s2KXmtS5BKbkhbPu4WJZ4oSw8wpb87hsHIxE6HXJlIcMleD58cmBMA8WZxkjwfdhM7TMkrG5zjWNcI9zHweIgw8SdsbPZCiG2P8lZ7/SnO+syRFSSmvgZ6WVKE1SRe6zeCHEUA1AutRuEnj0c9zzxqd6bw/xFdq89JVCEnLLWJhentPDPZ8Km5fxCguUx3dlo0va7Yf1c9cW0yJ6JQxZLdn; 4:p5GCRTCwnDr0/K8L8/qF+PQnRmWgD05Ai6Onif3SnqDODjywBOlSiyzNCOYusucNl8/1vXUWC5EO7ny6ClfFi52RfJd25Ly7VahfSjjXNky6HMBLgOEKWIgDyAFPy3ThzaWTosQY1VZvzxImosZLEBmPqEPtwT6Cc1/7ysbNMM3auRNSG0HVgO7AKuNO+wmm3nghj0E0ZKVJROS4fEnZmmbpFDUtNxo0CcnIzCzyjfE6Lg5TYIkJ7yFpzIZXYXmZNNu2HdgvDSvl4RkIgFPMYiprEB2H8NEp+YAI7s0ZCNRzO8irZFRHMLwDSWTm7GEd 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)(5005006)(8121501046)(3002001)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:VI1PR04MB2079; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB2079; X-Forefront-PRVS: 071518EF63 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(136003)(396003)(376002)(39860400002)(366004)(189003)(199004)(39060400002)(50226002)(105586002)(478600001)(97736004)(25786009)(4326008)(186003)(53936002)(106356001)(2906002)(36756003)(16526019)(47776003)(66066001)(26005)(50466002)(51416003)(52116002)(6506007)(54906003)(16586007)(48376002)(68736007)(386003)(44832011)(6666003)(2361001)(2351001)(6486002)(316002)(6916009)(6512007)(76176011)(446003)(486006)(3846002)(6116002)(11346002)(476003)(2616005)(7416002)(7736002)(305945005)(5660300001)(956004)(14444005)(86362001)(81166006)(8936002)(81156014)(8676002)(575784001)(208894002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB2079; H:oslab-l16.am.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; VI1PR04MB2079; 23:jgELLuto7K1v6ZTGy4zpAmW0QS3vGOGsJbKSOT0pZ?= cjxqyvCQ/LUFUFZiIa3a0YtpHqn6Xm916vJUMdanbdUH8Vk0huU6YWUDQUJxioY2Rsb14Jowc+VmClCvKhxxhalJUziiL0/jVIq5fxbwICYyQEEajxcYFue/2B8Q0jQwWuGM5kge4k88knpypeH6G9e9+bYBGGElo9MHGeWY2cI4SBWiQXsL5PQz4H1OzO909RArzB+/anWRsGoNCjDVcQTu1vIMGRM+WIqsUe8FUFj2tckMuIxYAV26qSdrHw8NPxZZNY1D+Vo2MvqYKQIXthcI6aGKSQfoaVHezh6C9bEnd9FpODFQc4HGD2Lpdhk2rhSKdZzGJgltVhKAtSz02R6U4ZKw1Bf19sSoFs28Yg2juEcEwtF4y4pvFBHWqoKiT7AVAx6f13+1k2CFsm9pqw+2l3NOOWHqrw50dVc8vZLhfKRaOgQpa0VsVGsUXPw72LPh2Vs7HgYM56PwOeXqKflLPX9e673GaX7yW3ylvoj6o9VzvL+Vr4Aa8EL5pvKrWSSefEqcYpkENL3+Cp7Q1uh+CaHnxkLZE3/jrxjYEInhZ5T8XlJ9AD63Jmk0Mrf2GuFtPg5q1ToeWsy1EUggZqlgFsWa8xzCWisRdgwTv4JyyleqJx17ax1jz9T5Qbjt9wclpr7XiLDjKHKnO6bQ0vhk1FokvhKMW1gy3Mo9R6XId0JgcnEqOqgVg2XXgwM0UI5Qi1O/2ST5ODneGxlnNDWjRrJ4u7P97Ii8sx8lJVDQbRkrpCjb2xO4nM6pyDS5ghcu5kdI01ZsGuUZQJZ4oxDOWJeQ4lNCT3mSSjZgXLl41abpDXxEwSHr74uSGZW8l3CIY6Ncs51GSSSG7JNE6NvaleirK0My2/oeyqnWHF8ig1CL34q32p5F/oZvfgA93DEKyPVHxWJNkLO3qhKohydf8i5AafMMzgVMyl6RF07UvyJR2vXgkPkaEcOkvllIZWhzHymYCbMd+pgx6FZ5BH3p01gTkoeLiFhEAdA9dHYdBDle0+3ovlVrCUQcQM/n1o5dMy0qgLIPFGiOzaLP9TeV0xH0faKrkcJ2gAnDKhsjsHaAuoNBjjAbCsFDWPvgolzIh5waU8OctrNrPPQJtPgyX6ywSBWuc2+CqNTNmy/8XiQJyqgoRCSO/sqtIA13Tx6AtMLjiUtHVSEMEnAbinpzYO9TcAaUFCjakPPHZjJ+ZmTi48YMz3qbW24L1jXHZy1YOlFQAr4jbxQ5p8J1+5uMo9WTQ+tNkdg9vTAQIAevskcnBbagA6mYz64N3vgCfutTiv/RjJr4SkfgYrT4LlxBKddqQ2XG+0tprU/9u5fwg== X-Microsoft-Antispam-Message-Info: UDtF3rKRo8KrI3rfBytAFX1MVVGCNkCKNsURyZgv8wtFKa4xXYp9DCz5eYcWfhHWsAPk3sstor9/GPAoRqifGAi/uIbQPDjwltenFsLKQgGuI77Sr8NjgY8H5i/til2Pkz8g/LsA5Wp9378dzlOBaj6O7YlPz/NNNP5hOhqHr5pLLxzPy5fHGDwcbmYpZVugndiF0k08Q9qZnk70srynofdu5WdXAwNwQfJIz/6AoTZNEhB8tEvQdk/2SGYlpH7rfm7MamW4I76wp/5wH8rMGHZtAYsHGxOapE+AL1M0GFxC6zOftjzYStDY9Ru3TBcCzvVSGos0XxeTXqoJxjS+arO93/j5z8DFE/hDp3n2Y30= X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB2079; 6:aa3VN6fMw6xTWt+4Dlw0+YrghLf7x5zbRnaib92I3n0PjNrPxnENNz92w+VCKnae5ga2Ha8bomk5q+y1gw/PMLANVQnBxcNi8DO2+B4ZWokm1LuPKYsXabjlNevvjE0ZodJzLWYlxT55OLQPN7W9dhN4ni0Rk/BGmzJLK76XxYg0hbequdTtXsQ/vgKoi+rmbuZavob7E2KtlGYrhTCT5DhLnnNuVFPFD+7jroXkB0M2Z9Wk9AtwhVN8Jw59JipLIDMk5Zvbw0aifjSzwwmPtU48Vc0PiKBXGFNMSt6c6NxNNR++oWtn0Pf5RYEL0VY1WT7czJF950YrCcUEYzLfASSr5ky3SdikdV6pJLitTxSlGuMQ48+j5/x5tdPr5151xq7FRCoR6OBaYSeD7ycjy5Mm8KyFp9f+mWbAxd0QAdregzOdY/SZSAmk+KnRpszZsTxWUBLuHmk4b044mosWpA==; 5:4s+tw5V9+ta5PZU62M0LqhFdelPyX5Zq5bRPbr6UpSNPdtvausizxFXWLenUB4TkDnCXkVqOl2ci3JBeWowBguJ0ZxoWgudwR4uBCddtfXaHKYsms2K3Cjqpu5k0W7Q0+OC76jJf0EJvHz8K8LrZRLQ9Uvgpla9vWTdyr3U4TSo=; 24:FwoxyW8K6ts3lpUxz2JIR8qeQauY+x/Drq9lCmn6ALqY9xMcqtt206qvvNhSaDF/2rMFMiUTHDC6Lbw/FMEQ56/MO3HFws6G8m9Tv7oIJ68= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB2079; 7:Zp7okEcCruZlQ98TW70yxNKaJjoQWnV/bzkn3d0Co1Q+xZYra5OobrW/kkLPp6k6W1CpFzRGTRjHTzD0jcjcQtgUD1JYYclGABCPyv3ZD/Nv7iPAeGkM4bV2fGF2fbtTpf0JI7m8tJAueQIaJRsbQS39rNoBKNTXriTQbbwGNYGPSj1t5GuSOEvangif5AZfiTa+1dfz+lxr+/Nlhe5FgBbOqKa3CzSP8NuFsnkGWgc/c4T9LP3uQ8GPfrcgfL21 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2018 21:49:15.8649 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 85e8ba4e-0a98-4a2e-6a58-08d5dbaead3f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2079 Cc: Marek Vasut , Yuantian Tang , Thomas Petazzoni , Andre Przywara , Michal Simek , Joe Hershberger , Vinitha Pillai-B57223 , Mingkai Hu Subject: [U-Boot] [PATCH 2/2] armv8: ls1046ardb: Add falcon mode for for QSPI boot 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" A new defconfig is introduced to support SPL boot from QSPI NOR flash. This is to support falcon mode for faster booting into Linux. Signed-off-by: York Sun --- .../arm/cpu/armv8/fsl-layerscape/doc/README.falcon | 10 ++++ arch/arm/cpu/armv8/fsl-layerscape/spl.c | 3 + board/freescale/ls1046ardb/ls1046ardb_qspi_pbi.cfg | 26 +++++++++ board/freescale/ls1046ardb/ls1046ardb_rcw_qspi.cfg | 7 +++ configs/ls1046ardb_qspi_spl_defconfig | 64 ++++++++++++++++++++++ include/configs/ls1046a_common.h | 19 ++++++- include/configs/ls1046ardb.h | 12 ++-- 7 files changed, 135 insertions(+), 6 deletions(-) create mode 100644 board/freescale/ls1046ardb/ls1046ardb_qspi_pbi.cfg create mode 100644 board/freescale/ls1046ardb/ls1046ardb_rcw_qspi.cfg create mode 100644 configs/ls1046ardb_qspi_spl_defconfig diff --git a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon index a00b5bc..7dae9f0 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon +++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon @@ -129,6 +129,16 @@ Example: The "loadables" is not optional. It tells SPL which images to load into memory. +Falcon mode with QSPI boot +-------------------------- +To use falcon mode with QSPI boot, SPL needs to be enabled. Similar to SD or +NAND boot, a RAM version full feature U-Boot is needed. Unlike SD or NAND boot, +SPL with QSPI doesn't need to combine SPL image with RAM version image. Two +separated images are used, u-boot-spl.pbl and u-boot.img. The former is SPL +image with RCW and PBI commands to load the SPL payload into On-Chip RAM. The +latter is RAM version U-Boot in FIT format (or legacy format if FIT is not +used). + Other things to consider ----------------------- Falcon boot skips a lot of initialization in U-Boot. If Linux expects the diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index 3bb6e5b..3e53084 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -23,6 +23,9 @@ u32 spl_boot_device(void) #ifdef CONFIG_SPL_NAND_SUPPORT return BOOT_DEVICE_NAND; #endif +#ifdef CONFIG_QSPI_BOOT + return BOOT_DEVICE_NOR; +#endif return 0; } diff --git a/board/freescale/ls1046ardb/ls1046ardb_qspi_pbi.cfg b/board/freescale/ls1046ardb/ls1046ardb_qspi_pbi.cfg new file mode 100644 index 0000000..735d46c --- /dev/null +++ b/board/freescale/ls1046ardb/ls1046ardb_qspi_pbi.cfg @@ -0,0 +1,26 @@ +#QSPI clk +0957015c 40100000 +#Configure Scratch register +09570600 00000000 +09570604 10000000 +#Disable CCI barrier tranaction +09570178 0000e010 +09180000 00000008 +#USB PHY frequency sel +09570418 0000009e +0957041c 0000009e +09570420 0000009e +#Serdes SATA +09eb1300 80104e20 +09eb08dc 00502880 +#PEX gen3 link +09570158 00000300 +89400890 01048000 +89500890 01048000 +89600890 01048000 +#Alt base register +09570158 00001000 +#flush PBI data +096100c0 000fffff +#Change endianness +09550000 000f400c diff --git a/board/freescale/ls1046ardb/ls1046ardb_rcw_qspi.cfg b/board/freescale/ls1046ardb/ls1046ardb_rcw_qspi.cfg new file mode 100644 index 0000000..7b9be0a --- /dev/null +++ b/board/freescale/ls1046ardb/ls1046ardb_rcw_qspi.cfg @@ -0,0 +1,7 @@ +#PBL preamble and RCW header +aa55aa55 01ee0100 +# RCW +0c150010 0e000000 00000000 00000000 +11335559 40005012 40025000 c1000000 +00000000 00000000 00000000 00238800 +20124000 00003101 00000096 00000001 diff --git a/configs/ls1046ardb_qspi_spl_defconfig b/configs/ls1046ardb_qspi_spl_defconfig new file mode 100644 index 0000000..57e8a6b --- /dev/null +++ b/configs/ls1046ardb_qspi_spl_defconfig @@ -0,0 +1,64 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1046ARDB=y +CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_FSL_LS_PPA=y +CONFIG_SPL_FSL_LS_PPA=y +CONFIG_QSPI_AHB_INIT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" +CONFIG_DISTRO_DEFAULTS=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_QSPI_BOOT=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_SPL_BOARD_INIT=y +CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y +CONFIG_SPL_NOR_SUPPORT=y +CONFIG_SPL_OS_BOOT=y +CONFIG_SYS_OS_BASE=0x40980000 +CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_CMD_SPL=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_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_SPL_EFI_PARTITION is not set +CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SPL_ENV_IS_NOWHERE=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_FSL_QSPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y +CONFIG_SPL_GZIP=y diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index ac47ba6..14d8c92 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -16,11 +16,11 @@ #define SPL_NO_USB #define SPL_NO_SATA #endif -#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_NAND_BOOT)) +#if (defined(CONFIG_SPL_BUILD) && \ + defined(CONFIG_NAND_BOOT) || defined(CONFIG_QSPI_BOOT)) #define SPL_NO_MMC #endif #if defined(CONFIG_SPL_BUILD) && \ - defined(CONFIG_SD_BOOT) && \ !defined(CONFIG_SPL_FSL_LS_PPA) #define SPL_NO_IFC #endif @@ -85,6 +85,21 @@ #endif /* ifdef CONFIG_SECURE_BOOT */ #endif +#if defined(CONFIG_QSPI_BOOT) && defined(CONFIG_SPL) +#define CONFIG_SPL_TARGET "spl/u-boot-spl.pbl" +#define CONFIG_SPL_TEXT_BASE 0x10000000 +#define CONFIG_SPL_MAX_SIZE 0x1f000 +#define CONFIG_SPL_STACK 0x10020000 +#define CONFIG_SPL_PAD_TO 0x20000 +#define CONFIG_SPL_BSS_START_ADDR 0x8f000000 +#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 +#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SPL_BSS_START_ADDR + \ + CONFIG_SPL_BSS_MAX_SIZE) +#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 +#define CONFIG_SYS_MONITOR_LEN 0x100000 +#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#endif + /* NAND SPL */ #ifdef CONFIG_NAND_BOOT #define CONFIG_SPL_PBL_PAD diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 2d45bbc..87d8cf5 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -31,17 +31,21 @@ #define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */ #endif -#ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_SYS_FSL_PBL_PBI board/freescale/ls1046ardb/ls1046ardb_pbi.cfg -#endif - #ifdef CONFIG_SD_BOOT +#define CONFIG_SYS_FSL_PBL_PBI board/freescale/ls1046ardb/ls1046ardb_pbi.cfg #ifdef CONFIG_EMMC_BOOT #define CONFIG_SYS_FSL_PBL_RCW \ board/freescale/ls1046ardb/ls1046ardb_rcw_emmc.cfg #else #define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1046ardb/ls1046ardb_rcw_sd.cfg #endif +#elif defined(CONFIG_QSPI_BOOT) +#define CONFIG_SYS_FSL_PBL_RCW \ + board/freescale/ls1046ardb/ls1046ardb_rcw_qspi.cfg +#define CONFIG_SYS_FSL_PBL_PBI \ + board/freescale/ls1046ardb/ls1046ardb_qspi_pbi.cfg +#define CONFIG_SYS_UBOOT_BASE 0x40100000 +#define CONFIG_SYS_SPL_ARGS_ADDR 0x90000000 #endif #ifndef SPL_NO_IFC