diff options
author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-10-22 09:53:44 +0200 |
---|---|---|
committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-10-22 09:53:44 +0200 |
commit | 8eae61fe5292db29b5bd61cadc1613851dea0765 (patch) | |
tree | 813a8bdb4a1a82025975d7a26496983e64d25daa /common/Makefile | |
parent | eb3f0f68ba384f179bb57ad8d5b0cd095eb4d7a4 (diff) | |
parent | f67066b6b0740b826ed862615c5ab022aaf4779a (diff) |
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'common/Makefile')
-rwxr-xr-x | common/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/common/Makefile b/common/Makefile index 7ba449505..f85b6d319 100755 --- a/common/Makefile +++ b/common/Makefile @@ -52,9 +52,6 @@ COBJS-y += env_common.o COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o COBJS-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o -COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o -COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o -COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o COBJS-$(CONFIG_ENV_IS_IN_MG_DISK) += env_mgdisk.o COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o |