diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-14 22:26:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-14 22:26:38 -0500 |
| commit | 3dde8f20377c3a051dda64497bdf0cdb23e03a2d (patch) | |
| tree | 89d16fac9d2df2931a87e69cae60c757a475dcf7 /common | |
| parent | 18af965798153cea955773633feb05ed1647e9f6 (diff) | |
| parent | db359efd5907edbeaea2e3eb3504729f60208cd8 (diff) | |
Merge git://git.denx.de/u-boot-mmc
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 2 | ||||
| -rw-r--r-- | common/spl/Kconfig | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile index 14166209fe..c7bde239c1 100644 --- a/common/Makefile +++ b/common/Makefile @@ -109,6 +109,7 @@ obj-$(CONFIG_IO_TRACE) += iotrace.o obj-y += memsize.o obj-y += stdio.o +ifndef CONFIG_SPL_BUILD # This option is not just y/n - it can have a numeric value ifdef CONFIG_FASTBOOT_FLASH obj-y += image-sparse.o @@ -119,6 +120,7 @@ ifdef CONFIG_FASTBOOT_FLASH_NAND_DEV obj-y += fb_nand.o endif endif +endif ifdef CONFIG_CMD_EEPROM_LAYOUT obj-y += eeprom/eeprom_field.o eeprom/eeprom_layout.o diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 9d35f41233..d686b1ecbd 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -301,6 +301,7 @@ config SPL_ENV_SUPPORT config SPL_SAVEENV bool "Support save environment" depends on SPL_ENV_SUPPORT + select SPL_MMC_WRITE if ENV_IS_IN_MMC help Enable save environment support in SPL after setenv. By default the saveenv option is not provided in SPL, but some boards need @@ -415,6 +416,14 @@ config SPL_MMC_SUPPORT this option to build the drivers in drivers/mmc as part of an SPL build. +config SPL_MMC_WRITE + bool "MMC/SD/SDIO card support for write operations in SPL" + depends on SPL_MMC_SUPPORT + default n + help + Enable write access to MMC and SD Cards in SPL + + config SPL_MPC8XXX_INIT_DDR_SUPPORT bool "Support MPC8XXX DDR init" help |