From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Fri, 24 May 2013 12:11:01 -0400 Subject: [U-Boot] [PATCH 5/6] spl: Make CONFIG_SPL_BUILD contain more functionality In-Reply-To: <1369030048-26130-5-git-send-email-ying.zhang@freescale.com> References: <1369030048-26130-1-git-send-email-ying.zhang@freescale.com> <1369030048-26130-5-git-send-email-ying.zhang@freescale.com> Message-ID: <20130524161101.GS17119@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Mon, May 20, 2013 at 02:07:27PM +0800, ying.zhang at freescale.com wrote: > From: Ying Zhang > > There was some functionality will be used in the SPL. They > had been excluded by ifndef CONFIG_SPL_BUILD. Now, put it > into the SPL. > > Signed-off-by: Ying Zhang > --- > arch/powerpc/cpu/mpc85xx/tlb.c | 2 +- > arch/powerpc/cpu/mpc8xxx/law.c | 4 ++-- In these cases can we not just always build them, aside from when CONFIG_NAND_SPL is set and rely on link-time discard here? Otherwise: > -#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) > +#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_NAND_MINIMAL) Should become, I believe (and this isn't whitespaced properly): #if !defined(CONFIG_NAND_SPL) && !(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_NAND_MINIMAL)) So that: > diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h [snip] > diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h [snip] > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h Can then all be dropped. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: