diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-24 09:50:00 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-24 09:50:00 +0200 |
| commit | 33144ea443c298ac9d6f04926a02881a5bae91a3 (patch) | |
| tree | 8d29378ecf90192f3f0f0637db89e0044d9c94cf /arch/arm/cpu/armv7/omap-common/Makefile | |
| parent | 3eb5e198632dcc3e03b5742d1e0ebced0ef2f551 (diff) | |
| parent | 39338a30fab2ce7d80dfe0d457071573727f499f (diff) | |
| download | talos-obmc-uboot-33144ea443c298ac9d6f04926a02881a5bae91a3.tar.gz talos-obmc-uboot-33144ea443c298ac9d6f04926a02881a5bae91a3.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/Makefile')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile index 59f5352b26..5f5132f661 100644 --- a/arch/arm/cpu/armv7/omap-common/Makefile +++ b/arch/arm/cpu/armv7/omap-common/Makefile @@ -27,8 +27,4 @@ obj-y += boot-common.o obj-y += lowlevel_init.o endif -ifndef CONFIG_SPL_BUILD -ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) obj-y += mem-common.o -endif -endif |
