From: Tom Rini <trini@ti.com>
Date: Mon, 4 Nov 2013 14:28:08 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-blackfin
X-Git-Tag: v2014.01-rc1~133
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=c0bb110b695130866838518e680bdd5473e47928

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

Easy to resolve conflict on the GPIO change.

Conflicts:
	arch/blackfin/cpu/Makefile

Signed-off-by: Tom Rini <trini@ti.com>
---

c0bb110b695130866838518e680bdd5473e47928
diff --cc arch/blackfin/cpu/Makefile
index 9bf544d800,929fc8b7ce..243dc22a0c
--- a/arch/blackfin/cpu/Makefile
+++ b/arch/blackfin/cpu/Makefile
@@@ -9,21 -9,34 +9,21 @@@
  # Licensed under the GPL-2 or later.
  #
  
 -include $(TOPDIR)/config.mk
 -
 -LIB	= $(obj)lib$(CPU).o
 -
 -EXTRA    := init.elf
 -CEXTRA   := initcode.o
 -SEXTRA   := start.o
 -SOBJS    := interrupt.o cache.o
 -COBJS-y  += cpu.o
 -COBJS-y  += gpio.o
 -COBJS-y  += interrupts.o
 -COBJS-$(CONFIG_JTAG_CONSOLE) += jtag-console.o
 -COBJS-y  += os_log.o
 -COBJS-y  += reset.o
 -COBJS-y  += traps.o
 -
 -SRCS     := $(SEXTRA:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
 -OBJS     := $(addprefix $(obj),$(COBJS-y) $(SOBJS))
 -EXTRA    := $(addprefix $(obj),$(EXTRA))
 -CEXTRA   := $(addprefix $(obj),$(CEXTRA))
 -SEXTRA   := $(addprefix $(obj),$(SEXTRA))
 -
 -all:	$(obj).depend $(LIB) $(obj).depend $(EXTRA) $(CEXTRA) $(SEXTRA) check_initcode
 -
 -$(LIB):	$(OBJS)
 -	$(call cmd_link_o_target, $(OBJS))
 -
 -$(OBJS): $(obj)bootrom-asm-offsets.h
 +extra-y := init.elf
 +extra-y += initcode.o
 +extra-y += start.o
 +obj-y    := interrupt.o cache.o
 +obj-y  += cpu.o
- obj-$(CONFIG_ADI_GPIO1) += gpio.o
++obj-y += gpio.o
 +obj-y  += interrupts.o
 +obj-$(CONFIG_JTAG_CONSOLE) += jtag-console.o
 +obj-y  += os_log.o
 +obj-y  += reset.o
 +obj-y  += traps.o
 +
 +extra-y += check_initcode
 +
 +extra-y += bootrom-asm-offsets.h
  $(obj)bootrom-asm-offsets.c: bootrom-asm-offsets.c.in bootrom-asm-offsets.awk
  	echo '#include <asm/mach-common/bits/bootrom.h>' | $(CPP) $(CPPFLAGS) - | gawk -f ./bootrom-asm-offsets.awk > $@.tmp
  	mv $@.tmp $@