Currently, CONFIG_SPL_LIBGENERIC_SUPPORT must be defined to build under lib/ directory for SPL.

This directory contains very basic functions such as memcpy, memset in lib/string.c, so it should be very useful for all the boards.

Because SPL always enables compiler's garbage collection, this change should not give impact on its memory footprint.

Let's allow SPL to descend into lib/ all the time. As a result, CONFIG_SPL_LIBGENERIC_SUPPORT is no longer necessary.

Four files must be adjusted to avoid multiple definition error.

- arch/powerpc/cpu/mpc85xx/spl_minimal.c udelay() is not a weak function. __udelay() is overridable.

- arch/powerpc/lib/time.c MPC85xx has its own udelay for CONFIG_SPL_INIT_MINIAL. Enclose the definition with ifdefs.

- board/armadeus/apf27/apf27.c - board/vpac270/onenand.c Do not duplicate hang()

Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---

arch/powerpc/cpu/mpc85xx/spl_minimal.c | 2 +- arch/powerpc/lib/time.c | 4 ++++ board/armadeus/apf27/apf27.c | 6 ------ board/vpac270/onenand.c | 6 ------ include/configs/B4860QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/P1010RDB.h | 3 --- include/configs/P1022DS.h | 3 --- include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 1 - include/configs/a3m071.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/bur_am335x_common.h | 1 - include/configs/cam_enc_4xx.h | 1 - include/configs/cm_t35.h | 1 - include/configs/corvus.h | 1 - include/configs/da850evm.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/edminiv2.h | 1 - include/configs/imx6_spl.h | 1 - include/configs/ipam390.h | 1 - include/configs/ks2_evm.h | 1 - include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atwr.h | 1 - include/configs/lwmon5.h | 1 - include/configs/m53evk.h | 1 - include/configs/maxbcm.h | 1 - include/configs/mcx.h | 1 - include/configs/microblaze-generic.h | 1 - include/configs/mx31pdk.h | 1 - include/configs/mxs.h | 1 - include/configs/omap3_evm_common.h | 1 - include/configs/p1_p2_rdb_pc.h | 3 --- include/configs/palmtreo680.h | 1 - include/configs/sama5d3_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h | 1 - include/configs/sama5d4ek.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/sunxi-common.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/taurus.h | 1 - include/configs/tegra-common.h | 1 - include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/tricorder.h | 1 - include/configs/tx25.h | 1 - include/configs/uniphier.h | 1 - include/configs/woodburn_sd.h | 1 - include/configs/work_92105.h | 1 - include/configs/x600.h | 1 - include/configs/zynq-common.h | 1 - scripts/Makefile.spl | 2 +- 64 files changed, 6 insertions(+), 80 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/spl_minimal.c b/arch/powerpc/cpu/mpc85xx/spl_minimal.c index cc45f71..a9c3d9b 100644 --- a/arch/powerpc/cpu/mpc85xx/spl_minimal.c +++ b/arch/powerpc/cpu/mpc85xx/spl_minimal.c @@ -35,7 +35,7 @@ ulong cpu_init_f(void) #define CONFIG_SYS_FSL_TBCLK_DIV 8 #endif

-void udelay(unsigned long usec) +void __udelay(unsigned long usec) { u32 ticks_per_usec = gd->bus_clk / (CONFIG_SYS_FSL_TBCLK_DIV * 1000000); u32 ticks = ticks_per_usec * usec; diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c index 62b6c72..b552862 100644 --- a/arch/powerpc/lib/time.c +++ b/arch/powerpc/lib/time.c @@ -34,11 +34,15 @@ unsigned long usec2ticks(unsigned long usec) * microseconds to wait) into a number of time base ticks; then we * watch the time base until it has incremented by that amount. */ +#if !(defined(CONFIG_MPC85xx) && defined(CONFIG_SPL_BUILD) && \ + defined(CONFIG_SPL_INIT_MINIMAL)) +/* MPC85xx has a dedicated __udelay() for SPL minimal components */ void __udelay(unsigned long usec) { ulong ticks = usec2ticks (usec); wait_ticks (ticks); } +#endif

/* ------------------------------------------------------------------------- */ #ifndef CONFIG_NAND_SPL diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c index 30e720d..3930bc2 100644 --- a/board/armadeus/apf27/apf27.c +++ b/board/armadeus/apf27/apf27.c @@ -227,12 +227,6 @@ int checkboard(void) }

#ifdef CONFIG_SPL_BUILD -inline void hang(void) -{ - for (;;) - ; -} - void board_init_f(ulong bootflag) { /* diff --git a/board/vpac270/onenand.c b/board/vpac270/onenand.c index a749b31..21f3dce 100644 --- a/board/vpac270/onenand.c +++ b/board/vpac270/onenand.c @@ -38,9 +38,3 @@ void board_init_f(unsigned long unused) for (;;) ; } - -void __attribute__((noreturn)) hang(void) -{ - for (;;) - ; -} diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index dca1ca5..299dc14 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -28,7 +28,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 7c45c36..0e614af 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -32,7 +32,6 @@ #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NAND_INIT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index ccf3ce3..3201bf2 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -31,7 +31,6 @@ #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ @@ -66,7 +65,6 @@ #define CONFIG_SPL_SPI_FLASH_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ @@ -113,7 +111,6 @@ #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NAND_INIT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 795e3b5..e269d32 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -26,7 +26,6 @@ #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ @@ -55,7 +54,6 @@ #define CONFIG_SPL_SPI_FLASH_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ @@ -86,7 +84,6 @@ #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NAND_INIT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 2927043..d459524 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -48,7 +48,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 84e8336..64f6eaa 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -49,7 +49,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 6cc95ef..4a7eb63 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -35,7 +35,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 046aa48..58376bd 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -61,7 +61,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index faaf22c..047bb63 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -50,7 +50,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index cfe6557..f67975a 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -31,7 +31,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index d23d2c4..2fcb3ce 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -419,7 +419,6 @@ #define CONFIG_SPL_NOR_SUPPORT #define CONFIG_SPL_TEXT_BASE 0xfc000000 #define CONFIG_SPL_LIBCOMMON_SUPPORT /* image.c */ -#define CONFIG_SPL_LIBGENERIC_SUPPORT /* string.c */ #define CONFIG_SPL_SERIAL_SUPPORT

/* Place BSS for SPL near end of SDRAM */ diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index c3c9169..3d29a36 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -313,7 +313,6 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 31e758d..f6fb5ee 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -322,7 +322,6 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index e4c49f4..d09f4a1 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -210,7 +210,6 @@ #define CONFIG_SPL_STACK 0x310000

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT

diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index c44da1c..3f30188 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -252,7 +252,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 1a481b3..23035d1 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -255,7 +255,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 240fc46..4521b93 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -215,7 +215,6 @@ /* General parts of the framework, required. */ #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_YMODEM_SUPPORT diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h index f8785db..3b5a0ee 100644 --- a/include/configs/cam_enc_4xx.h +++ b/include/configs/cam_enc_4xx.h @@ -200,7 +200,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_BOARD_INIT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 3eb7886..f9c7b99 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -334,7 +334,6 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT diff --git a/include/configs/corvus.h b/include/configs/corvus.h index f5b8f9b..dde3ecf 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -165,7 +165,6 @@ #define CONFIG_SPL_BSS_MAX_SIZE (2 * 1024)

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT

#define CONFIG_SPL_BOARD_INIT diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index e5a612c..b1b8ba3 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -377,7 +377,6 @@ #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LDSCRIPT "board/$(BOARDDIR)/u-boot-spl-da850evm.lds" #define CONFIG_SPL_STACK 0x8001ff00 #define CONFIG_SPL_TEXT_BASE 0x80000000 diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 4dd7b11..fab18a2 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -97,7 +97,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_LDSCRIPT "arch/arm/mvebu-common/u-boot-spl.lds" diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index bd08740..2b92b11 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -20,7 +20,6 @@ */

#define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NOR_SUPPORT diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 21c5dce..058c82a 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -30,7 +30,6 @@ #define CONFIG_SPL_MAX_SIZE 0x10000 #define CONFIG_SPL_STACK 0x0091FFB8 #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 664a2b2..f856459 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -305,7 +305,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LDSCRIPT "board/$(BOARDDIR)/u-boot-spl-ipam390.lds" #define CONFIG_SPL_STACK 0x8001ff00 #define CONFIG_SPL_TEXT_BASE 0x80000000 diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index 42280ca..c57e0ea 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -50,7 +50,6 @@ CONFIG_SYS_SPL_MALLOC_SIZE + \ CONFIG_SPL_STACK_SIZE - 4) #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_SUPPORT diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 5de416d..34d1de3 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -60,7 +60,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LDSCRIPT "arch/$(ARCH)/cpu/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_I2C_SUPPORT @@ -95,7 +94,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LDSCRIPT "arch/$(ARCH)/cpu/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_I2C_SUPPORT diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index a13876b..729f667 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -44,7 +44,6 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LDSCRIPT "arch/$(ARCH)/cpu/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_I2C_SUPPORT diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index d43db52..1967c4b 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -672,7 +672,6 @@ #define CONFIG_SYS_SPL_MAX_LEN (64 << 10) #define CONFIG_UBOOT_PAD_TO 458752 /* decimal for 'dd' */ #define CONFIG_SPL_LIBCOMMON_SUPPORT /* image.c */ -#define CONFIG_SPL_LIBGENERIC_SUPPORT /* string.c */ #define CONFIG_SPL_SERIAL_SUPPORT

/* Place BSS for SPL near end of SDRAM */ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index c133ba9..d7346f3 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -261,7 +261,6 @@ #define CONFIG_SPL_STACK 0x70004000 #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index e909623..78e3b08 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -97,7 +97,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_LDSCRIPT "arch/arm/mvebu-common/u-boot-spl.lds" diff --git a/include/configs/mcx.h b/include/configs/mcx.h index de7792a..3a3d4f5 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -355,7 +355,6 @@ #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 166ab4f..673bb71 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -405,7 +405,6 @@ #define CONFIG_CMD_SPL #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_BOARD_INIT

diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 1282a6e..cd0ac87 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -34,7 +34,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/$(ARCH)/cpu/u-boot-spl.lds" #define CONFIG_SPL_MAX_SIZE 2048 #define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT

#define CONFIG_SPL_TEXT_BASE 0x87dc0000 #define CONFIG_SYS_TEXT_BASE 0x87e00000 diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 38b1e93..935d7e6 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -54,7 +54,6 @@ #define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs" #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT

/* Memory sizes */ diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index 370f21e..d069923 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -271,7 +271,6 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_OMAP3_ID_NAND diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index a5f9717..890f2af 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -199,7 +199,6 @@ #define CONFIG_SPL_MMC_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ @@ -228,7 +227,6 @@ #define CONFIG_SPL_SPI_FLASH_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ @@ -255,7 +253,6 @@ #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_NAND_INIT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h index bd0f44b..6ead036 100644 --- a/include/configs/palmtreo680.h +++ b/include/configs/palmtreo680.h @@ -208,7 +208,6 @@ #define CONFIG_SPL_STACK 0x5c040000 /* end of internal SRAM */ #define CONFIG_SPL_NAND_SUPPORT /* build libnand for spl */ #define CONFIG_SPL_NAND_DOCG4 /* use lean docg4 nand spl driver */ -#define CONFIG_SPL_LIBGENERIC_SUPPORT /* spl uses memcpy */

/* * NAND diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index bfd8aa7..8ca323c 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -148,7 +148,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index d933a9e..8be5da2 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -196,7 +196,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 5fb621e..fd37040 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -168,7 +168,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 546d7a3..44df5df 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -164,7 +164,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index c7affd6..7b7fb98 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -156,7 +156,6 @@

#define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 1ecd56f..f528874 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -300,7 +300,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/socfpga/u-boot-spl.lds"

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 365d9a5..b2f3717 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -154,7 +154,6 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT

#define CONFIG_SPL_BOARD_LOAD_IMAGE

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 2d12e86..3cfcaba 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -229,7 +229,6 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_POWER_SUPPORT diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 49ed79f..232caa6 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -315,7 +315,6 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 2cf4558..f30ebd2 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -202,7 +202,6 @@ #define CONFIG_SPL_BSS_MAX_SIZE (3 * 1024)

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT

#define CONFIG_SPL_BOARD_INIT diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 2cf1f68..5519ec9 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -145,7 +145,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00010000

#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT

diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index dcc2bdc..e74b737 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -184,7 +184,6 @@

#define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 27a3dd1..510d716 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -149,7 +149,6 @@

#define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 110a4f8..8f2814f 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -264,7 +264,6 @@ /* General parts of the framework, required. */ #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_BOARD_INIT diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 7426bde..4a0f387 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -342,7 +342,6 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/tx25.h b/include/configs/tx25.h index 118f5ba..d767a04 100644 --- a/include/configs/tx25.h +++ b/include/configs/tx25.h @@ -25,7 +25,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/$(ARCH)/cpu/u-boot-spl.lds" #define CONFIG_SPL_MAX_SIZE 2048 #define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT

#define CONFIG_SPL_TEXT_BASE 0x810c0000 #define CONFIG_SYS_TEXT_BASE 0x81200000 diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index d4688c5..94e0502 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -286,7 +286,6 @@ #define CONFIG_SPL_NAND_SUPPORT

#define CONFIG_SPL_LIBCOMMON_SUPPORT /* for mem_malloc_init */ -#define CONFIG_SPL_LIBGENERIC_SUPPORT

#define CONFIG_SPL_BOARD_INIT

diff --git a/include/configs/woodburn_sd.h b/include/configs/woodburn_sd.h index 25bfeef..bc68e11 100644 --- a/include/configs/woodburn_sd.h +++ b/include/configs/woodburn_sd.h @@ -23,7 +23,6 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm1136/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_MMC_SUPPORT diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index dc8e99f..b98fcc7 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -217,7 +217,6 @@ #define CONFIG_SPL_BOARD_INIT /* Use the framework and generic lib */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT /* SPL will use serial */ #define CONFIG_SPL_SERIAL_SUPPORT diff --git a/include/configs/x600.h b/include/configs/x600.h index 27a66a5..692ea9d 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -279,7 +279,6 @@

#define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT /* image.c */ -#define CONFIG_SPL_LIBGENERIC_SUPPORT /* string.c */ #define CONFIG_SPL_NO_PRINTF

/* diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 485babd..789be1c 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -305,7 +305,6 @@ #define CONFIG_CMD_SPL #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_BOARD_INIT

diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index ea67137..d581b2d 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -64,7 +64,7 @@ libs-$(CONFIG_SPL_SERIAL_SUPPORT) += drivers/serial/ libs-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += drivers/mtd/spi/ libs-$(CONFIG_SPL_SPI_SUPPORT) += drivers/spi/ libs-y += fs/ -libs-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/ +libs-y += lib/ libs-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/ drivers/power/pmic/ libs-$(CONFIG_SPL_MTD_SUPPORT) += drivers/mtd/ libs-$(CONFIG_SPL_NAND_SUPPORT) += drivers/mtd/nand/