diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2014-10-07 19:14:03 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2014-10-07 19:14:03 +0900 |
| commit | 3cc83f9d08a80fddf4c1e8e766eff8273f30814c (patch) | |
| tree | 831246a1b77d26d0296a84c90684e0fee0368737 /common/Makefile | |
| parent | 64f41212d880f3d00c6994d973aadeec5bda1b65 (diff) | |
| parent | 6dd0e7c00bfa5ce861a72b8e4a3ef9e787306125 (diff) | |
| download | u-boot-imx-3cc83f9d08a80fddf4c1e8e766eff8273f30814c.zip u-boot-imx-3cc83f9d08a80fddf4c1e8e766eff8273f30814c.tar.gz u-boot-imx-3cc83f9d08a80fddf4c1e8e766eff8273f30814c.tar.bz2 | |
Merge branch 'uboot'
Diffstat (limited to 'common/Makefile')
| -rw-r--r-- | common/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/common/Makefile b/common/Makefile index aca0f7f..b19d379 100644 --- a/common/Makefile +++ b/common/Makefile @@ -243,13 +243,8 @@ obj-y += cmd_nvedit.o #environment obj-y += env_common.o #others -ifdef CONFIG_DDR_SPD -SPD := y -endif -ifdef CONFIG_SPD_EEPROM -SPD := y -endif -obj-$(SPD) += ddr_spd.o +obj-$(CONFIG_DDR_SPD) += ddr_spd.o +obj-$(CONFIG_SPD_EEPROM) += ddr_spd.o obj-$(CONFIG_HWCONFIG) += hwconfig.o obj-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o obj-y += console.o @@ -264,4 +259,10 @@ obj-$(CONFIG_IO_TRACE) += iotrace.o obj-y += memsize.o obj-y += stdio.o +# This option is not just y/n - it can have a numeric value +ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +obj-y += aboot.o +obj-y += fb_mmc.o +endif + CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null) |