From patchwork Mon Feb 20 23:42:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 729980 X-Patchwork-Delegate: yorksun@freescale.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 3vRkPr5H4gz9s86 for ; Tue, 21 Feb 2017 00:05:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B6C47A7BFA; Mon, 20 Feb 2017 14:05:15 +0100 (CET) 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 4t1lwn014VGJ; Mon, 20 Feb 2017 14:05:15 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5D285A7BF2; Mon, 20 Feb 2017 14:05:14 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6985AA7BF2 for ; Mon, 20 Feb 2017 14:04:50 +0100 (CET) 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 DDyiwh1Td-gh for ; Mon, 20 Feb 2017 14:04:49 +0100 (CET) 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-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0069.outbound.protection.outlook.com [104.47.42.69]) by theia.denx.de (Postfix) with ESMTPS id 983B3A7BDE for ; Mon, 20 Feb 2017 14:04:44 +0100 (CET) Received: from CY1PR03CA0011.namprd03.prod.outlook.com (10.174.128.21) by MWHPR03MB2959.namprd03.prod.outlook.com (10.175.136.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Mon, 20 Feb 2017 12:30:14 +0000 Received: from BN1AFFO11FD036.protection.gbl (2a01:111:f400:7c10::193) by CY1PR03CA0011.outlook.office365.com (2603:10b6:600::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13 via Frontend Transport; Mon, 20 Feb 2017 12:30:14 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD036.mail.protection.outlook.com (10.58.52.240) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.919.10 via Frontend Transport; Mon, 20 Feb 2017 12:30:13 +0000 Received: from b49020-OptiPlex-790.ap.freescale.net (b49020-OptiPlex-790.ap.freescale.net [10.232.134.31]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v1KCU9NY004593; Mon, 20 Feb 2017 05:30:10 -0700 From: Sumit Garg To: Date: Tue, 21 Feb 2017 05:12:45 +0530 Message-ID: <1487634165-10081-1-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131320674140533893; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(336005)(39860400002)(39450400003)(39840400002)(39380400002)(39410400002)(39400400002)(39850400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(38730400002)(110136004)(36756003)(626004)(53936002)(104016004)(81156014)(50226002)(85426001)(54906002)(189998001)(356003)(8936002)(81166006)(8656002)(50466002)(575784001)(68736007)(48376002)(77096006)(305945005)(86362001)(8676002)(33646002)(47776003)(2906002)(50986999)(92566002)(105606002)(106466001)(6666003)(6916009)(97736004)(2351001)(5003940100001)(5660300001)(4326007); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2959; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD036; 1:93KDRPyaDb94kfklGrvMQmMuZWGN/7pOs+KXnkepH9LefxzYX1318cbWHD0TsMSh0MIV6exMTYToE4T4crAaYoU/8wTByQR0mudr70sLVVczJwzge3C9m8jLZS61Y/Amf1gLomG/AaDLgNLeIe47vDKeizqpH4qsoEV6OLcRB3rSYByx9m793UnBN/9yfbD/xwtc2K2ZqNLk4RbMzu5cCk8jplLu5/a4iAtYSzsNLrOpGjudImw6iZmCmSQLy4ipEp0iFTvjoOWlyP6UPi3szfrqbJy1VmNLbS9ias/4MW56DkSKEQMbgiUE5G755I+Oz5Zggb3VuDBK7YoZ4JrEJ+U6IPu5ZjPK/OcMoe9Cfzb5FcxgHkKrGWtGKqhpK7z3/AotyyqZ1aLWOZkWsr7nUHRoQotiqZlxedXOoUiZjayNkluFc+KUxZ1/RK/EPhS/l5rT7bZ7xIIxqYAgBsC3I+XcazzSaq0LEk74shLbUjd5zlQmroXLxOLOxvl7R/jF6aFoKxkgOplzjfGq3Bk+oU8roc2xjHx5RDT6g9VbPjxllJpLBPowiHkClyG5ZGDbnEAx79IPN7vU6Ht+MeHAJ1mZ4zoZycHT9BS3oQ7VKvEUXICoGGVQGb6ZlNh3RYtpjLN/MhMjEDvrasOBkgPYYwBEU5jFwu0KdbcmLhA6NF73FrCjE+FgKKl3bVDRXrEpxi8jv/N2ChBUO1+lXitz7Q== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 3971371d-1241-43f6-5324-08d4598c3844 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:MWHPR03MB2959; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2959; 3:lWJegZfxDwaxSsY2mSXh4btoI/9+iSIGexL/WHpCf6o0Mys07IsQ0/kgy1W+v604Ngwti776tsDohBaffLrSk3KtKPQFsgQl2J0uh0drR/MAHlF+zRqfzcK6XGPAe3L1zStBWncPjdt8QrcqCLACGCC1UMcboc7rWrfNyD5MSjqJxFsQTTr33F4kkkUE35bdV7qp4cbcaqFi45a13oQVzLnILoeUu5LAATdIQv3Wnq8wemEnVeJYhNPKMIYAlMNvcocqlzsrtN1i0h9g4JOh3u+hOxm+O0zzlZ9fY0sX69zy0RjmD0og476H+svtzeYngpquZwIDkA5NYdJZCTQOkkcgtY9BeOsSe2v3ArpqKEJaY90Xnko/r6nGgvzAmk+g; 25:hG/SfWyR0mpPL+CvG8ThSsqjjDoFBuHQslVkMnVpszPYrbrkVgzVAel+LkS6J4io4uBGRxOm2np6mDNtqSpcVPMgvwX70qammD8t174cHzSnCqVLz7OJaC+Lz1VFn8iiyFwKLRxq7o86CJmhdH5VNVH6OVGr8Yms68ACLNlI3yqnkSVfNEHdvnqVJY/Fbjp3MmX4it1p6o5tXLYfaAK2/bzOPZjn+KwDpCkMTJBidK1wfQxBh8JC87PH/LdXmgpYNUmFZJbg9Tm+sGoM+vMAajJuhBrO5GhZxkvIKJgRbQCYu6OAlgNl1WANcPcilaoZxKBfHftFMQSx++oIlYnky4PjxncbyoiFudI60c4VeFoIk4OagciWYIRL2EHttR1OEKZqIPQsHdK0TtF0fHaq7v9O39nr+kxZlLMYeedZjAWQKijuk/LOTWvjrotMlwhwj+2BSD/M18wR6QaEAk8ovQ== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2959; 31:5truk9wvRuBD98vqIoy3rcmoQ+X1IPtPJRlLRRZ9eGu3dHukjzzUsyYeMPzHQKmKhzF3Uy5Y68Gt3jlsQPRhKq/rkTWOLzzkz6uiJMmDsElw9b8ttiujE2IEnXnktqQaO5FUysunOBfRpNFd9uhGo1SGQ37d9GjtblIHswemx5mAxLAFJ/kUKxFZa6Lke4ese//kjXOtokXF6nMIUNPpjegEHwKZCofcO3rqrTva79wHy8KS7Z0EV9JVypco0isQcMqcneqMZRuYgkrxIeWRNxBLvwLHvs+MruAJkM6GCTs= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13015025)(13017025)(13024025)(13023025)(8121501046)(5005006)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123563025)(20161123559025)(20161123561025)(20161123556025); SRVR:MWHPR03MB2959; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2959; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2959; 4:JtpKb2guF/IaOL5rFbvRjyNqEv3hTsPnA4ek+aNKwurBTb0r8QNCYsuw3yxUvoiSlfFk6P+gZP2sZydie3cRqoS+fsosh4osJJLg0c1enuYCt/i4zDAzsKraZc6hIbWe/0KjrfvdI0kPDgKV6gyoB8/Wapt960PUHvtCWTwF9aY0MxyH73RHOBHpNKCbY58uM/DwZpLYVT/SrUznVIZdU+/929s/L9q3338VwloWjK7hiMoHIUkomHkHyacraxeohnX/qq3ejQFKkGK/7rxXCXEVzFoeVuKyREgXwwzipOHbh/m34cJVRLCpysUDBVexQbFB80qZ/Dt6GT9/i2KHrduhWjJtCBRtJzBlrkMBTs2cQ0LUqRVXPaiwDRc7VFekjQ4Lu6dbkyoWGMhN6NvrDEh/bmolUd3aNaIUanWV6yuKx3LrtzOBnXWug8hr+vN4boJ7D4YPNjag4hMhX4nnwvblsgWcL6/1vO9aIBQGRfZrqdwL2PSFD1EkxLFavyKfTbgdXbXnUU9lxg+GGbpZS240nlJcJZPGY7RJDHfThbCcy6mzUfXa+foL60dC2DJX90CZMEQ4qyV8FqW3G5SK7P8NOb1QvX0lJL4Hg9986mTMN80Tvl43F5QSbYyaixLUQzWRJfE0Pm80J87tk0D0Nj0mZsKPrnJFDeQO6Xql/KhQ/WReJ2w3+BoaYPZz5nZyGwYNm5HGUamkglgAWP4E0yI2+M0pQq3ViE26a1yLl2R8SKz1DMw6wOco3PzTXh1w X-Forefront-PRVS: 02243C58C6 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2959; 23:oJPL5iHDljOKUYxaVyPiNcHUIB73+alMV2c6/72ZL?= =?us-ascii?Q?hZWNvOjVZpr/du+jUYZNjYq+QAjKod6kEQGNb4eQ8ULxoVe06zKtyVQnT9Ep?= =?us-ascii?Q?rFwiffqk9pm/DzTXnO6FKbdvktVHzEy1TOMt+K2x0D8HYKFEnPCJ3ACZr6zf?= =?us-ascii?Q?I4vud4+D+ujlKg6X6+HpM0V6IU5PScIT974PiqSXc8biCKHa03c6y6dF0WCo?= =?us-ascii?Q?3o21C9unzEcyHUvrDQFsERWE7eqMjzP7SbPs5hrYGUMzK9WXUAqz81n7aLaL?= =?us-ascii?Q?tpfwygWc9N2zJ4spGZkDQDUpFNF/dvKAWp5EWWe36ONAvKZ2HAMelIvYxntK?= =?us-ascii?Q?QdtVniUUOOFL61424vJQ9CmmGQ3UfS5zq5i8AdB3bQPWr8RzHG0/HEMEaTQv?= =?us-ascii?Q?MfeNq/L4IaLKFANfiggL/2oMcAAsYfEhirnTK4gQDR/vHcPw+nIQb5vGXJh/?= =?us-ascii?Q?dCBWQCPFZDvob+jNGFGkPJkCvCfO+GZhP7m1diUGXbtw3M8IUBizmcC923qa?= =?us-ascii?Q?WSrvCTSmpaQ+iEZAr0nwzJ/lI5RNesvrtYbAweunq5hXgbCBDhi7h//Owsnd?= =?us-ascii?Q?J1H4Q65ou+F3rRg0tH/pw/qJzIJuymhVEaBsOLqnAl2/pgaQkvp0VccqAfx0?= =?us-ascii?Q?bWu5wS19fL/tyddcakISj5PEWu6/YP2Ua43K6NrhJDL6bJ0xP/jdb8l8rxfn?= =?us-ascii?Q?jOnrNNJ04AkT8peTfae7DEZhkaKel1jemJodMopBCC+i+bC+ryPV68lllERL?= =?us-ascii?Q?58+W8Hqrz6g4HElXVUwmqIV2pTzkQlEFOZE20bDu5h0qqsmroDcjI+mb5cIF?= =?us-ascii?Q?p2ydycYwgAR8rCXyPkciR94YavqOZ24oE5Cjc4j70H3wqJlkwY93Rt9lNxj/?= =?us-ascii?Q?TBb+s3jftjZZ8QQNh7f3Jn++or9UZtLQ1U2uRtOxmg+joi3wz4htsijTEfma?= =?us-ascii?Q?VlZo3oielvwdPZzKtbTMHr6DqFCZ6Y1rKOfio9Vu4MSzxrAvrYWcuiuctLvi?= =?us-ascii?Q?VhlIgi/ImJImCmisrAZ9H5t5YEum0llAGwU5eju5B7fwMrhicYwSHU8V0ju9?= =?us-ascii?Q?FjHsxnSqZdrF6IzITJNbn7EtqFhege7R3idWa1fJ+r95oXldWxMRnA4vJ0R7?= =?us-ascii?Q?Va75TL+6Txcb5rPp10scWkm7+aSQ06Gr2ms0ITEGQ6jDZYf0+LcZNkcxickI?= =?us-ascii?Q?o30/wRU7IlnoAdoKS3xq98Gh37+Ge0A6vGe+cAFEXNG9BKPWMyLfGFSC2NFZ?= =?us-ascii?Q?2xAze/ZWzACS3FA7PXFu1pic+kTSlV5vI3c22EE8ZoHgX+z6nJFttY5ML/vC?= =?us-ascii?B?Zz09?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2959; 6:w1EMMRVPAiAIOAf/2EltVkuLr6GsnCN+MonUEsRx73QU/WodYjzFYtAB2gagmHCIOo6b2EOIJe9SYfUTaLxe6fyQX5jmMpTqAQu/+4I/EzqGSopm5QCS0o/sPB6dtXqG+Bn2o6mBUmhhXSC4xS6qc8pPgmDqJSYwKry84H9RAeovtJMHBQgDtP+0q2bW9b/uPUxhcjCqOBc6GkT/6CrWMCXjJU0dsNXsakLdvpXNMoMih0N22vXzQBMljaN3MxaRrH8oQpuIOmhHQuco6+W0Y1Bgq30xibfjoLJoNQxOL/9b3NId5uj9++6a8WF1OKZQvgtWa8J2mB+lIFLdrXZUO+nIuhVLZE4FMfZpQ9wf5euEMCRfPRfWtOmVEbhN3r4CDwy2bCEsa5ovCem59mwPCwIeCmrXLTjjCYkEFFkMwSM=; 5:WtaffB47uVJzt4wAIFawUowV/fs8DhkDtQcwCLyuysD79IhnN3owf2GXmetwue7F6SmJz+rHxLlR7E9SADonCL/RPpjtpUkuZcIeku0k4/VlyoolVdA44zI7Q3uAhH9LxWcgeC3boYisL3ytmf7PQYO3quiYjox6kX+FVigW3WGQwL7dTi7voYA9yInloqtt; 24:bEiCr4Gjd2RiehEHWE1q6eIm8aeiLvQ5pKrOVpxltXDEDP1mSB9HucvGaMHQHoZO0zJLL9nHr9hZuQyuZjMbcVJmcOtu3H9/eGVHjzRBTWw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2959; 7:cWn8l0BoDHFacbWSO8agSZ7K6JN5C3cQK5AU1yjl6t78XKQjFzOAYanxqpitzCLoqnIcQMuWyxl0p1m1PK/ANR/0djyO8jiTiCxeIhvLYEADbYlRhG8cWTuE6FxAVnezSia0cUiIYfGpgwfggi+brxMRMyfjdQcAertIO7YEn7uhRFkIaNL0w0ze6DyImkfcEnYs7kcwS300xss5ZSW98Yoi8lkCq9+Pg5ak3cml9DGAi3uvhqXr0wR4lCpjD/ySLLnfNUeJS43gx8DYTcJTjNtFbp7oJxZHMv4IrfdYV0tUbGfZpcxfPskoRJupHPuXn3eo5RrggRDWnHanpW9zRg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2017 12:30:13.8349 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR03MB2959 Cc: Vinitha Pillai-B57223 , ruchika.gupta@nxp.com, mingkai.hu@nxp.com Subject: [U-Boot] [PATCH] ls1046ardb: SPL size reduction in case of non-xip boot 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" Using changes in this patch we were able to reduce approx 4k size of u-boot-spl.bin image. Following is breif description of changes to reduce SPL size: 1. Changes in board/freescale/ls1046ardb/Makefile to remove compilation of eth.c and cpld.c in case of SPL build. 2. Changes in board/freescale/ls1046ardb/ls1046ardb.c to keep only ddr_init and board_early_init_f funcations in case of SPL build. 3. Changes in ls1046a_common.h & ls1046ardb.h to remove driver specific macros due to which static data was being compiled in case of SPL build. 4. Disable MMC driver from bieng compiled in case of SPL NAND build and NAND driver from bieng compiled in case of SPL MMC build. Signed-off-by: Vinitha Pillai-B57223 Signed-off-by: Sumit Garg --- board/freescale/ls1046ardb/Makefile | 4 +++- board/freescale/ls1046ardb/ls1046ardb.c | 30 ++++++++++++++++-------------- include/configs/ls1046a_common.h | 12 ++++++++++-- include/configs/ls1046ardb.h | 7 ++++++- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/board/freescale/ls1046ardb/Makefile b/board/freescale/ls1046ardb/Makefile index 348eb76..b92ed0b 100644 --- a/board/freescale/ls1046ardb/Makefile +++ b/board/freescale/ls1046ardb/Makefile @@ -4,7 +4,9 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += cpld.o obj-y += ddr.o obj-y += ls1046ardb.o +ifndef CONFIG_SPL_BUILD obj-$(CONFIG_SYS_DPAA_FMAN) += eth.o +obj-y += cpld.o +endif diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c index 33a58cf..bb03479 100644 --- a/board/freescale/ls1046ardb/ls1046ardb.c +++ b/board/freescale/ls1046ardb/ls1046ardb.c @@ -24,6 +24,21 @@ DECLARE_GLOBAL_DATA_PTR; +int dram_init(void) +{ + gd->ram_size = initdram(0); + + return 0; +} + +int board_early_init_f(void) +{ + fsl_lsch2_early_init_f(); + + return 0; +} + +#ifndef CONFIG_SPL_BUILD int checkboard(void) { static const char *freq[2] = {"100.00MHZ", "156.25MHZ"}; @@ -56,20 +71,6 @@ int checkboard(void) return 0; } -int dram_init(void) -{ - gd->ram_size = initdram(0); - - return 0; -} - -int board_early_init_f(void) -{ - fsl_lsch2_early_init_f(); - - return 0; -} - int board_init(void) { struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR; @@ -168,3 +169,4 @@ int ft_board_setup(void *blob, bd_t *bd) return 0; } +#endif diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index be65e4f..c884b95 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -109,24 +109,28 @@ #define CONFIG_SYS_I2C_MXC_I2C3 #define CONFIG_SYS_I2C_MXC_I2C4 +#ifndef CONFIG_SPL_BUILD /* Command line configuration */ #define CONFIG_CMD_ENV +#endif +#if !(defined(CONFIG_SPL_BUILD) && defined(CONFIG_NAND_BOOT)) /* MMC */ #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif +#endif #define CONFIG_FSL_CAAM /* Enable SEC/CAAM */ +#ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_DPAA_QBMAN /* Support Q/Bman */ - /* FMan ucode */ #define CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_SYS_FM_MURAM_SIZE 0x60000 - +#endif #ifdef CONFIG_SD_BOOT /* * PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is @@ -159,6 +163,7 @@ #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 +#ifndef CONFIG_SPL_BUILD /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ @@ -176,13 +181,16 @@ #define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \ "earlycon=uart8250,mmio,0x21c0500 " \ MTDPARTS_DEFAULT +#endif /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ #define CONFIG_SYS_LONGHELP +#ifndef CONFIG_SPL_BUILD #define CONFIG_CMDLINE_EDITING 1 +#endif #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 64 /* max command args */ diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index a96aa65..9bc4cbc 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -49,13 +49,14 @@ #endif #endif +#if !(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SD_BOOT)) /* IFC */ #define CONFIG_FSL_IFC - /* * NAND Flash Definitions */ #define CONFIG_NAND_FSL_IFC +#endif #define CONFIG_SYS_NAND_BASE 0x7e800000 #define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE @@ -156,10 +157,12 @@ #define CONFIG_POWER_I2C #endif +#ifndef CONFIG_SPL_BUILD /* * Environment */ #define CONFIG_ENV_OVERWRITE +#endif #if defined(CONFIG_SD_BOOT) #define CONFIG_ENV_IS_IN_MMC @@ -173,6 +176,7 @@ #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */ #endif +#ifndef CONFIG_SPL_BUILD /* FMan */ #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_FMAN_ENET @@ -236,5 +240,6 @@ "15m(u-boot),48m(kernel.itb);" \ "7e800000.flash:16m(nand_uboot)," \ "48m(nand_kernel),448m(nand_free)" +#endif /* CONFIG_SPL_BUILD */ #endif /* __LS1046ARDB_H__ */