From: Wolfgang Denk <wd@denx.de>
Date: Mon, 21 Nov 2011 21:11:05 +0000 (+0100)
Subject: Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging
X-Git-Tag: v2011.12-rc1~156
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=f9342e2c3e81d62e42393c0c1a8179c309ef3a20;hp=-c

Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging

* 'sr@denx.de' of git://git.denx.de/u-boot-staging:
  Makefile: Add the missing dependency for spl target
  gpio: Adapt PCA9698 to standard GPIO API
---

f9342e2c3e81d62e42393c0c1a8179c309ef3a20
diff --combined Makefile
index fb658f4e43,c01f08a196..7afd35b98c
--- a/Makefile
+++ b/Makefile
@@@ -290,9 -290,16 +290,9 @@@ LIBS += lib/libfdt/libfdt.
  LIBS += api/libapi.o
  LIBS += post/libpost.o
  
 -ifeq ($(SOC),am33xx)
 +ifneq ($(CONFIG_AM335X)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
  LIBS += $(CPUDIR)/omap-common/libomap-common.o
  endif
 -ifeq ($(SOC),omap3)
 -LIBS += $(CPUDIR)/omap-common/libomap-common.o
 -endif
 -ifeq ($(SOC),omap4)
 -LIBS += $(CPUDIR)/omap-common/libomap-common.o
 -endif
 -
  ifeq ($(SOC),s5pc1xx)
  LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
  endif
@@@ -417,10 -424,6 +417,10 @@@ $(obj)u-boot.ubl:       $(obj)spl/u-boo
  		rm $(obj)u-boot-ubl.bin
  		rm $(obj)spl/u-boot-spl-pad.bin
  
 +$(obj)u-boot.sb:       $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
 +		elftosb -zdf imx28 -c $(TOPDIR)/board/$(BOARDDIR)/u-boot.bd \
 +			-o $(obj)u-boot.sb
 +
  ifeq ($(CONFIG_SANDBOX),y)
  GEN_UBOOT = \
  		cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
@@@ -483,7 -486,7 +483,7 @@@ mmc_spl:	$(TIMESTAMP_FILE) $(VERSION_FI
  
  $(obj)mmc_spl/u-boot-mmc-spl.bin:	mmc_spl
  
- $(obj)spl/u-boot-spl.bin:		depend
+ $(obj)spl/u-boot-spl.bin:	$(SUBDIR_TOOLS) depend
  		$(MAKE) -C spl all
  
  updater:
@@@ -760,7 -763,6 +760,7 @@@ clean
  	       $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]	  \
  	       $(obj)arch/blackfin/cpu/init.{lds,elf}
  	@rm -f $(obj)include/bmp_logo.h
 +	@rm -f $(obj)include/bmp_logo_data.h
  	@rm -f $(obj)lib/asm-offsets.s
  	@rm -f $(obj)include/generated/asm-offsets.h
  	@rm -f $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
@@@ -789,7 -791,6 +789,7 @@@ clobber:	clea
  	@rm -f $(obj)u-boot.imx
  	@rm -f $(obj)u-boot.ubl
  	@rm -f $(obj)u-boot.dtb
 +	@rm -f $(obj)u-boot.sb
  	@rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes}
  	@rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
  	@rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm