Message ID | 1487634165-10081-1-git-send-email-sumit.garg@nxp.com |
---|---|
State | Superseded |
Delegated to: | York Sun |
Headers | show |
On 02/20/2017 04:30 AM, Sumit Garg wrote: > 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 <vinitha.pillai@nxp.com> Remove B57223 from the name. > Signed-off-by: Sumit Garg <sumit.garg@nxp.com> > --- > 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(-) > This patch causes compiling warning for board/freescale/ls1046aqds/eth.c. Please fix. York
> -----Original Message----- > From: york sun > Sent: Monday, February 27, 2017 10:34 PM > To: Sumit Garg <sumit.garg@nxp.com>; u-boot@lists.denx.de > Cc: Ruchika Gupta <ruchika.gupta@nxp.com>; Prabhakar Kushwaha > <prabhakar.kushwaha@nxp.com>; Mingkai Hu <mingkai.hu@nxp.com>; Vini > Pillai <vinitha.pillai@nxp.com> > Subject: Re: [PATCH] ls1046ardb: SPL size reduction in case of non-xip boot > > On 02/20/2017 04:30 AM, Sumit Garg wrote: > > 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 <vinitha.pillai@nxp.com> > > Remove B57223 from the name. > Sure, will remove it. > > Signed-off-by: Sumit Garg <sumit.garg@nxp.com> > > --- > > 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(-) > > > > This patch causes compiling warning for board/freescale/ls1046aqds/eth.c. > Please fix. > > York Will fix compilation warning. Sumit
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__ */