diff options
| author | Tom Rini <trini@ti.com> | 2014-08-29 13:47:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-29 13:47:42 -0400 |
| commit | 6defdc0b5552ab1af4a66a8abac8196cbb6b9e15 (patch) | |
| tree | a9c7640fc7e771696ac134018e9aebc5b7f6c3e4 /common | |
| parent | 8f005b3918cc16bb3e8f6d7228c27d207f4c606f (diff) | |
| parent | b640b460f54caf74ce21e8797a29379a5267eb4f (diff) | |
| download | u-boot-imx-6defdc0b5552ab1af4a66a8abac8196cbb6b9e15.zip u-boot-imx-6defdc0b5552ab1af4a66a8abac8196cbb6b9e15.tar.gz u-boot-imx-6defdc0b5552ab1af4a66a8abac8196cbb6b9e15.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/common/Makefile b/common/Makefile index de5cce8..aca0f7f 100644 --- a/common/Makefile +++ b/common/Makefile @@ -219,10 +219,6 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o -# environment -obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o -obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o -obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o ifdef CONFIG_SPL_USB_HOST_SUPPORT obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o @@ -230,14 +226,16 @@ endif ifdef CONFIG_SPL_SATA_SUPPORT obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o endif -ifneq ($(CONFIG_SPL_NET_SUPPORT),y) +# environment +ifdef CONFIG_SPL_ENV_SUPPORT +obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o +obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o +obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o -else -obj-y += env_nowhere.o endif endif # core command |