smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-arm

Browse Source 
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>
This commit is contained in:
Tom Rini
2014-02-26 16:49:58 -05:00
parent 715b56fe2b 1551df35f2
commit eeb72e6761
121 changed files with 5959 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/Makefile
View File

@@ -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)