From: Wolfgang Denk <wd@denx.de>
Date: Wed, 9 Jan 2008 23:49:59 +0000 (+0100)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
X-Git-Tag: v1.3.2-rc1~102^2~37
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=694976afa5dcc5c4e7eaeaa0612eac35cd5bd8ec;hp=-c

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

694976afa5dcc5c4e7eaeaa0612eac35cd5bd8ec
diff --combined Makefile
index 0e94875122,2f3d72a9c3..1983ca0f13
--- a/Makefile
+++ b/Makefile
@@@ -243,9 -243,6 +243,9 @@@ LIBS += $(shell if [ -d post/board/$(BO
  	"post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi)
  LIBS += common/libcommon.a
  LIBS += libfdt/libfdt.a
 +ifeq ($(CONFIG_API),y)
 +LIBS += api/libapi.a
 +endif
  
  LIBS := $(addprefix $(obj),$(LIBS))
  .PHONY : $(LIBS)
@@@ -258,10 -255,6 +258,10 @@@ PLATFORM_LIBS += -L $(shell dirname `$(
  SUBDIRS	= tools \
  	  examples
  
 +ifeq ($(CONFIG_API),y)
 +SUBDIRS += api_examples
 +endif
 +
  .PHONY : $(SUBDIRS)
  
  ifeq ($(CONFIG_NAND_U_BOOT),y)
@@@ -1950,6 -1943,9 +1950,9 @@@ TQM834x_config:	unconfi
  ## MPC85xx Systems
  #########################################################################
  
+ ATUM8548_config:	unconfig
+ 	@$(MKCONFIG) $(@:_config=) ppc mpc85xx atum8548
+ 
  MPC8540ADS_config:	unconfig
  	@$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8540ads freescale
  
@@@ -2032,6 -2028,9 +2035,9 @@@ sbc8540_66_config:	unconfi
  	fi
  	@$(MKCONFIG) -a SBC8540 ppc mpc85xx sbc8560
  
+ sbc8548_config:		unconfig
+ 	@$(MKCONFIG) $(@:_config=) ppc mpc85xx sbc8548
+ 
  sbc8560_config \
  sbc8560_33_config \
  sbc8560_66_config:      unconfig
@@@ -2756,7 -2755,6 +2762,7 @@@ clean
  	rm -f $(obj)board/bf537-stamp/u-boot.lds $(obj)board/bf561-ezkit/u-boot.lds
  	rm -f $(obj)include/bmp_logo.h
  	rm -f $(obj)nand_spl/u-boot-spl $(obj)nand_spl/u-boot-spl.map
 +	rm -f $(obj)api_examples/demo
  
  clobber:	clean
  	find $(OBJTREE) -type f \( -name .depend \
@@@ -2770,8 -2768,6 +2776,8 @@@
  	rm -f $(obj)tools/inca-swap-bytes $(obj)cpu/mpc824x/bedbug_603e.c
  	rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
  	[ ! -d $(OBJTREE)/nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f
 +	find $(obj)api_examples -lname "*" -print | xargs rm -f
 +	rm -f $(obj)api_examples/demo
  
  ifeq ($(OBJTREE),$(SRCTREE))
  mrproper \