From patchwork Tue Mar 28 03:27:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 743886 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vsJdC5wRDz9s7g for ; Tue, 28 Mar 2017 02:59:59 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 81E18C21C37; Mon, 27 Mar 2017 15:59:54 +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=1.9 required=5.0 tests=BAD_ENC_HEADER, DATE_IN_FUTURE_06_12,FUZZY_AMBIEN,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 5594EC21C29; Mon, 27 Mar 2017 15:59:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4E908C21C29; Mon, 27 Mar 2017 15:59:51 +0000 (UTC) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0041.outbound.protection.outlook.com [104.47.33.41]) by lists.denx.de (Postfix) with ESMTPS id 9883CC21BE6 for ; Mon, 27 Mar 2017 15:59:50 +0000 (UTC) Received: from DM5PR03CA0006.namprd03.prod.outlook.com (10.175.104.16) by BL2PR03MB177.namprd03.prod.outlook.com (10.255.230.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14; Mon, 27 Mar 2017 15:59:49 +0000 Received: from BY2FFO11FD017.protection.gbl (2a01:111:f400:7c0c::155) by DM5PR03CA0006.outlook.office365.com (2603:10b6:3:118::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14 via Frontend Transport; Mon, 27 Mar 2017 15:59:48 +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; 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 BY2FFO11FD017.mail.protection.outlook.com (10.1.14.105) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Mon, 27 Mar 2017 15:59:47 +0000 Received: from b49020-OptiPlex-790.ap.freescale.net (b46184-OptiPlex-790.ap.freescale.net [10.232.132.83]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v2RFxh4b012238; Mon, 27 Mar 2017 08:59:44 -0700 From: Sumit Garg To: Date: Tue, 28 Mar 2017 08:57:13 +0530 Message-ID: <1490671633-18099-1-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131351039880573676; (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)(336005)(39400400002)(39410400002)(39380400002)(39450400003)(39850400002)(39840400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(33646002)(2906002)(50466002)(2351001)(106466001)(105606002)(48376002)(77096006)(85426001)(189998001)(104016004)(8656002)(81166006)(6916009)(50986999)(8676002)(54906002)(5003940100001)(50226002)(53936002)(36756003)(5660300001)(86362001)(575784001)(38730400002)(110136004)(4326008)(47776003)(305945005)(8936002)(6666003)(356003); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2PR03MB177; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD017; 1:6BG4uJ66dzJKhyN3Me3NwOghXgs+qH0/5fmubod2EgFvN+iAHNmnSx2VPjXtEtggNNGw2IwP7+VNsnIBCuQp7r5ZvcFyCuPmHuxM/iXsCdNJyQXar5UFQMgLE3GeZDq2hqYuatDhI64sVGRFaBEjYgaUEJFtbxPGVFCeEF6oZArpTKsfcbTCRnHdC8E6812/CUdYTqF95GUijrtNXboru4V4fimsMEPKaSlCbV7V13n8ybUZ8oqRf1J0B1xEbYixyA2A8DL0Nsj5Wyp+fHxqg16lR30bVcIj6/y0NA1B9pW61ysbjZRux4h+M6UiMOVVSGtOwbSoq3roMV3tWJf8iCjVo5R9m6lDDKlXyukAafpLd6zBlPKbtzlG5YCz1XeJryW+D2CvKzjiSQnrfqgLiUJg7D6QHDonIHkYLSWK8hO42by+4WHUgot1/hD/1pad17lYCHmW3SSTrteEpfU+Aa4eczryC5Ya199upAm5QuNo8hbDpMrPqoZ+75HCYFHEgrX2iZPvmsJtSpAJ5Z1m9zIzhSAg0yCevLbJV3oK/iernxdYu/qPFWfxJNROnAFOS6hG4p03eNQNBxrlHnViv7Bz1MS6R44AuLkfDbpgPu+chgiNTFyWcTz9Hjxe+mBlLi278a9xWdBJgG/x8LHJVFGEvy+aKy8g+XrAzQtFHlegO1Ot9UXJrypVwJMsx66cbP5gyOVwlwHTLKazFzKMfA== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: fe02069d-1006-4f6b-b2ec-08d4752a4b6c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430047)(201703131517053); SRVR:BL2PR03MB177; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB177; 3:8cydxcGRiZlYNkunFTV+vQQqaKl/bHcpWnwDGvd87M58tFtIObZW7vTV8z/IlORCx31F7KxcuIE+0/KB1eGQkxUczCUpOOzXcx3lz/zRuTOnrkO5wcoixESxM3Jy4EhljYfKPBEUSGgK/VAfDkZ2Jb3bQyyE7OahAIklFhSifhCdW35ai6eHpesM4Xea1SG7jIFjxLRc9mQshqo48O0s6Wy/lx+EGXwYQ962rckFLj7uMnAq3hn1Zb5XdJUrdE958mO8E8BFcJVYdqzymrw3qlhqEDQzgimqvKw/8L14PJtsPSyJJNqJejvBIwNHKfWJD9QZdy0YDM1QLKWFlk4Hvc1RWIPq7fRhvnwfLalvD0mQ6gShAkhHy7enIbTNYroHXJvkZcVIN8pz30BxiL3JagpEFZPOmYRlQgcPfqXjXCHfR5hUoFLFxWfqPSgbMSwI; 25:SDNzIyabR5zfS53zx2mZuz6nlTynn5cyf28X6HUw6zZ4BqIQeHjX1IgE6OZN1yjsuw+mLf3wKu4170BjovehBDMEETyZ2dat/k5X6LVMPKdi1L0zDr9zDrk1EDdIr1rPyVbHUcn3U9bZ7Tox8Xn0XUn9PylMbv5PHGy0HedA2zAuMvCiSGmmbEIAcZ02k6aZXe+WGuDC2Yira3CRl4i3wwEx6Od4n3lNK2N2l1NYkEJX4dU6bEDuDztE048nXSrePlJF+pCXo8OfN5lyMio8PzOFYYwilDem/M2nC2vs0Wv9NYsZ2Kk9+b1CZFs9/CISu0FX2GrMj4T6uiHyFuDE1z0aiPEaiSj854hIMbJ6zBRSoTvPiaZMu/2Tf6ZLGxpl6FRU69c2Of3eGu7ToLnM6wwpw4DDuylqkujz2V/bxlq+rGEMOYsWKtHWLEmU1o1Rjd21bV3MbfQ10B4/awMTVQ== X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB177; 31:n87uMDkjA7hJn9JsLXMfMKlTm4Ls6q94RpwDvhlTIWPnrjFVzau1lZ4VE8RJnZxWO98BKqGUEumkQrtlW1Lfw8TIw1P6nfviy/1TrmCbdxz/jFwcdLD67VKEZDrooXJBY47Uj6iCXZnZyB7l5bvMgYHZpF5tAt30tNVW7F4rhc5V67bdgwdTWFYcHcV509rUTVkTzZkAwdUrtL6mA2ZAUROhqWu8akQpIYArHYNfo67Js7+Xlrx1dJYT2PcNTJJmRBbN4EbGQb7lhMEfPINETQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095106)(601004)(2401047)(13018025)(13023025)(5005006)(13024025)(8121501046)(13015025)(13017025)(3002001)(10201501046)(6055026)(6096035)(20161123559025)(20161123561025)(20161123563025)(20161123565025)(201703131430046)(201703131433046)(201703131448046)(201703161259046)(201703151042046)(20161123556025); SRVR:BL2PR03MB177; BCL:0; PCL:0; RULEID:(400006); SRVR:BL2PR03MB177; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB177; 4:ghbj3i7aLNYyEzDnIinA9P2HEn5AazFLfAv48o7fWSNSSpjbouZzxEQLCf94HaEj+C2KrCGVzidRzkC4miGRQohrsLbYHaACR1FD8KyXOZljlj1cEISiaZN/+Ql4JQanFlNE1hOLFl/2IrMYXpGLsggUOXZsR4h/G4TDo3pjEn2yNi1mbciiX4Mt32okZAdOndrB5GpTZCLo91lclyk5eBNlkDXrv6nREtiEmim4BupAFyROrgznpk4tvWe8UpmGQUNexVQpRKtPHaHTOOQV+HZofzUMSziLUGAK0jl21Neqzj6j1QnbYDZG78sYqAZ7DzWOp+5R8KftDmavEoxw2h1jEf1QAVROXmN8qbmG/3BaQoNaBknkAxxIwnX5oIluaTLSXMYIgLymSoP2xkqjoWzD+x6bmTeddHb1B83JeFAUqw5qyxiXelTanKo8V23AndBzONa07wGsKwwv7ZGlG+zaV6VSCDWhHiEP5p4U1m7eCARhI5H+9Ga8bv1s1pmLBLxHCeKe9IdSlOOPNjKQVVnG6vQQmUhFP8dMcbLNJGwOYsSp7WjbA9z8ewuz8cSKszXklGuxvw+GeyLXe9z7Nsd4oALHb+2e7gPRHTjVk404YIGlSFDQRt8qse9vceIlbYp2uGGHHrkzOHJtH55yW0Frnfe0XC8v35wlmvxld9tt4Va8RhKvjeBKvgYJProqa4XPBNa1XLuLPPkZivLaTJZoADo+LWLaoyfQkw+J8TeA6ujfdo/9Z2eJuRW8W8rhphw4Xiiwd7I1Hq11Q0h+vpyz0EQOPxb2aEcn4xm7cWBRUe6w6XptmnfUTivy9JGrcO248AiqZyWLq3cWuyr8btPdUpZB8dIonUKmW35L8+cNS+NU9ulLAsUiSjBN4Gvn5qiQr14Ue1w/LqwVUUqjbObxeQkLfRGqt7uRvyqHWyQ= X-Forefront-PRVS: 02596AB7DA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2PR03MB177; 23:5EEnkLdfBisYzgLhuNLwv9fIurc4yc68/USoyGVKST?= =?us-ascii?Q?+J8aSJHOegCbvfTT5DAUdCE8fsUZQgtoXfEM+bhz3eS/CmuwYaXYm9F6X41a?= =?us-ascii?Q?uQxGoQF6nxXCudeUdfRyq4KMrD3Lns+MA3ffBLT9G4wNcr868MEW1I22fVU7?= =?us-ascii?Q?XzplO5ovX3W02w79xLO7ZSEGDlwO7UJ94UY1zZQ5nJraJ+HqtwEg+BTtuqOJ?= =?us-ascii?Q?FP36m5qfmc33F2bKSTHGcOO6XwCS8wgYHTZ7HFoRjlYm7v6w2G11tJCUSvSn?= =?us-ascii?Q?OctXOpo6NrMNEWbwfhwiEujBxc2zwJ6FuShR+wybfyjOQKoxQuurTnHguSUY?= =?us-ascii?Q?zh5+fDjj1SaNR6l0HyrQfwwvytJMObpYbkQPX+GsSZleY3byW4WhD7nOGXhO?= =?us-ascii?Q?yVMHZ782l94jld1mEEu2M0krFO6XbucX2MQ21hyhxdFN7HyeZZhOEL8qVFTQ?= =?us-ascii?Q?QjlccD27BhumRpHVf+t9DNZJHe+J8bIrouS/OJBwyV8mnaPTI/aFDepn54+7?= =?us-ascii?Q?1dkFMrX/qK7MzuDGAHuIFJYAwztk2cbUyYHsg9C7M3yyKcHHSFyAxHHeLdGx?= =?us-ascii?Q?YO7wzBJKaheud2toOcxRBhf5kA6SFNVT66gIOfhiwIogHRqzNP3fstdVdFQL?= =?us-ascii?Q?nOGB3vJTKlO+O9zxgW/TmtH9CyfDulav7/DlPmUf78hjrJs/av0e00pD3pe8?= =?us-ascii?Q?GXJr2x9WiUX/RgvGuQ6tAP8IOOucXWlQTHrfOWPT/O3XKuRu+m8Z/MdiYM2D?= =?us-ascii?Q?RqJ/HnWYz1xAsIpz4dgFUhJow6QtiKgmFTsq9of7oHqu2H10+gMN2OC9Y0Y/?= =?us-ascii?Q?eVAXv9yyBTnCZMet4rI0FoTc6j/82p2+LslyH+C1az4Thrb6/W1Zf5HQ4xeX?= =?us-ascii?Q?XNaJig5qf6UN4bRq+MVlHSojALqEM/+oUXuuL80Fx4bOG7VxEbsZlJkQ+ifQ?= =?us-ascii?Q?ZHLd2ndcV/vL+F1WYgaAXh2exRUKixo7eiwjMUEMg2rEeEjVlqHPq88Rr7eO?= =?us-ascii?Q?sDE2ws4RrbK+yKyF5RBWjQr+MtIClcut5GSdsNBnoQFqhsN3N9/NEm72kSJs?= =?us-ascii?Q?/4nrOxvjsEHw2/7L4NZs8RGWV21W07i5sdzdncHZcyypCq4l2TW4z6yZF2u6?= =?us-ascii?Q?HhzgpcpxUGoVTEvLpzEWR0IVvPqy6claNFEPGhI6X3d/5wFGxYKlGLddbzH7?= =?us-ascii?Q?BbCfHTX/zjssM=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB177; 6:fEtdNbIWVaiVk/olE1bPP9hufPbZi4ptjVRnxVttaVBQAlh427rd6LXq2pC2X8s6jaFoH0TdxczjtJjC5Zw512b4vUPUKwvT4PfIneE/bvv+cReGMr2hIXdxAvMTIaMD38fXiQDEKl9H1Sp3TmAZCaKYezAAdzlyqc/GhzwaasIubarcWhXUGjsVJU7SJI/yIXbUU4bWjnSwpbxl4/VG39Zc2bAfcbB4IJ7BAFPtexcAZWcsDtp3XR4XuGOQoxVhEsrUp4Uhl2luYJYJEoVouJ7z6SVUPQHDK4oJw+r/07TtcV1949qe62vgWZREJpzKoToy6ykYqUvJdLcRNJjyKgKkpFDxTrz93Sh/kPRuHRS1vB/tchyr4ReMfDhzeWdbTQp4ut6+C08ALq7cXOmdfQ==; 5:eSMHDzCgJSPkFW50oXYd5dIrSKKZHplMCE77unDesx+O9R2otUmutz8NhROAECCVML9lTaAJK3pm6xFXNO0CetL3LZi8NYt3Y9VSQ0GbJ95QCk9MHRgt19uAkwlK5ge/Qbd6thUmFnpAxJLWUqOb1IrgZlr9eVU/+2QoLuEnb8iXijrgaikkNDLtMu0Y3F38; 24:3Id4/qeKuRgo8xA7RpDLF7dF4Jfzr6ZNyMUBVqKTMnnwk1C/L3tK3VgoSTRnydO7rfIYy13Q3f2DaO+nwQSBMp/eZYcoyXQ6zZQveF//9q0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB177; 7:5YJpnX8rr6MpsxLTlZkZv0ROS2BVFomb3jRgTeTY2dBiKDLAlNlrL276hTGjX71gL7yDnxYy2Ildhpqu6Awldl5XBZcCSMwDGCH5MoxMkU0rhVASTmmRTo84ie2ivGTzfsVBHasAg66/NAZmHe5oVE4uhXj3NyVlqZsLOjVfxiJ9cy4HmdcjTev39VAR8Wr/inlk3M0tVkr5QBDIA9lpqjpwDjjOhxM9RoVL6srk8kQLB2GZCHoKvXAT5QifCMFc3GnkHibP7cFx/eOZPYViL//YJyNjwkYX5trNfhi7tDchCEWMIRC/TY8mwuHi7eL1Id2Vm944WbfpJnAnUVjAqQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2017 15:59:47.8545 (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: BL2PR03MB177 Cc: Vinitha Pillai , ruchika.gupta@nxp.com, mingkai.hu@nxp.com Subject: [U-Boot] [PATCH v2] ls1046ardb: SPL size reduction in case of non-xip 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" 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 Signed-off-by: Sumit Garg --- Changes in v2: Rebased and fixed compilation warning on ls1046aqds. board/freescale/ls1046aqds/Makefile | 2 ++ board/freescale/ls1046ardb/Makefile | 4 +++- board/freescale/ls1046ardb/ls1046ardb.c | 16 +++++++++------- include/configs/ls1046a_common.h | 10 ++++++++++ include/configs/ls1046ardb.h | 7 ++++++- 5 files changed, 30 insertions(+), 9 deletions(-) diff --git a/board/freescale/ls1046aqds/Makefile b/board/freescale/ls1046aqds/Makefile index df6e546..6267522 100644 --- a/board/freescale/ls1046aqds/Makefile +++ b/board/freescale/ls1046aqds/Makefile @@ -5,5 +5,7 @@ # obj-y += ddr.o +ifndef CONFIG_SPL_BUILD obj-y += eth.o +endif obj-y += ls1046aqds.o 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 02b6c4c..0cc508b 100644 --- a/board/freescale/ls1046ardb/ls1046ardb.c +++ b/board/freescale/ls1046ardb/ls1046ardb.c @@ -24,6 +24,14 @@ DECLARE_GLOBAL_DATA_PTR; +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,13 +64,6 @@ int checkboard(void) 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; @@ -161,3 +162,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 1ed7517..614ab6f 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -108,21 +108,27 @@ #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 +#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 /* @@ -156,6 +162,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" \ @@ -173,13 +180,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 2141b82..67f7273 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -51,13 +51,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 @@ -158,10 +159,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 @@ -175,6 +178,7 @@ #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */ #endif +#ifndef CONFIG_SPL_BUILD /* FMan */ #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_FMAN_ENET @@ -238,5 +242,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__ */