diff options
| author | Tom Rini <trini@ti.com> | 2014-02-26 16:49:58 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-26 16:49:58 -0500 |
| commit | eeb72e67619b98d2502fe634a3a5d9953de92ad0 (patch) | |
| tree | edea4b04062ec956158c163b13c9a31fcfdccde8 /common/Makefile | |
| parent | 715b56fe2b47e073e6f2425e0cedba0e92a4014d (diff) | |
| parent | 1551df35f296f0a8df32f4f2054254f46e8be252 (diff) | |
| download | u-boot-imx-eeb72e67619b98d2502fe634a3a5d9953de92ad0.zip u-boot-imx-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.gz u-boot-imx-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
arch/arm/cpu/armv7/config.mk
board/ti/am43xx/mux.c
include/configs/am43xx_evm.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common/Makefile')
| -rw-r--r-- | common/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/common/Makefile b/common/Makefile index 6652ad4..ca9af13 100644 --- a/common/Makefile +++ b/common/Makefile @@ -238,5 +238,3 @@ obj-y += memsize.o obj-y += stdio.o CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null) -CFLAGS_hush.o := $(PLATFORM_NO_UNALIGNED) -CFLAGS_fdt_support.o := $(PLATFORM_NO_UNALIGNED) |