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>

diff --combined arch/blackfin/cpu/Makefile
index 9bf544d8006aed80c6702e60d537da3c03820073,929fc8b7cece8c9e869a7857765c13ead9ecfff7..243dc22a0c61470e9c01ca8542f0884168eafc89
--- 1/arch/blackfin/cpu/Makefile
--- 2/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 $@
@@@ -37,7 -50,7 +37,7 @@@ $(obj)bootrom-asm-offsets.h: $(obj)boot
  # have relocs or external references
  $(obj)initcode.o: CFLAGS += -fno-function-sections -fno-data-sections
  READINIT = env LC_ALL=C $(CROSS_COMPILE)readelf -s $<
 -check_initcode: $(obj)initcode.o
 +$(obj)check_initcode: $(obj)initcode.o
  ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
        @if $(READINIT) | grep '\<GLOBAL\>.*\<UND\>' ; then \
                echo "$< contains external references!" 1>&2 ; \
@@@ -49,3 -62,12 +49,3 @@@ $(obj)init.lds: init.lds.
        $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P $^ -o $@
  $(obj)init.elf: $(obj)init.lds $(obj)init.o $(obj)initcode.o
        $(LD) $(LDFLAGS) -T $^ -o $@
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -#########################################################################