From: Wolfgang Denk <wd@denx.de>
Date: Mon, 7 Dec 2009 22:42:33 +0000 (+0100)
Subject: Merge branch 'master' of ../work into next
X-Git-Tag: v2010.03-rc1~200^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35e3717772c8c3534c18d8aac69e4b822777c23b;hp=-c;p=platform%2Fkernel%2Fu-boot.git

Merge branch 'master' of ../work into next
---

35e3717772c8c3534c18d8aac69e4b822777c23b
diff --combined MAKEALL
index 6ee5c49,f9caabd..ab1bb6f
--- a/MAKEALL
+++ b/MAKEALL
@@@ -1,4 -1,4 +1,4 @@@
- #!/bin/sh
+ #!/bin/bash
  
  # Print statistics when we exit
  trap exit 1 2 3 15
@@@ -39,6 -39,7 +39,7 @@@ LIST="
  ERR_CNT=0
  ERR_LIST=""
  TOTAL_CNT=0
+ RC=0
  
  #########################################################################
  ## MPC5xx Systems
@@@ -63,7 -64,6 +64,7 @@@ LIST_5xxx="		
  	icecube_5100	\
  	icecube_5200	\
  	inka4x0		\
 +	ipek01		\
  	lite5200b	\
  	mcc200		\
  	mecp5200	\
@@@ -539,7 -539,6 +540,7 @@@ LIST_ARM7="		
  #########################################################################
  
  LIST_ARM9="			\
 +	a320evb			\
  	ap920t			\
  	ap922_XA10		\
  	ap926ejs		\
@@@ -550,7 -549,6 +551,7 @@@
  	cp926ejs		\
  	cp946es			\
  	cp966			\
 +	da830evm		\
  	imx27lite		\
  	lpd7a400		\
  	mv88f6281gtw_ge		\
@@@ -939,6 -937,12 +940,12 @@@ build_target() 
  
  	${MAKE} ${JOBS} all 2>&1 >${LOG_DIR}/$target.MAKELOG \
  				| tee ${LOG_DIR}/$target.ERR
+ 
+ 	# Check for 'make' errors
+ 	if [ ${PIPESTATUS[0]} -ne 0 ] ; then
+ 		RC=1
+ 	fi
+ 
  	if [ -s ${LOG_DIR}/$target.ERR ] ; then
  		ERR_CNT=$((ERR_CNT + 1))
  		ERR_LIST="${ERR_LIST} $target"
@@@ -962,6 -966,8 +969,8 @@@ print_stats() 
  		echo "Boards with warnings or errors: ${ERR_CNT} (${ERR_LIST} )"
  	fi
  	echo "----------------------------------------------------------"
+ 
+ 	exit $RC
  }
  
  #-----------------------------------------------------------------------
diff --combined Makefile
index f5a55c7,19b5ac0..75b2c1e
--- a/Makefile
+++ b/Makefile
@@@ -24,7 -24,7 +24,7 @@@
  VERSION = 2009
  PATCHLEVEL = 11
  SUBLEVEL =
- EXTRAVERSION = -rc1
+ EXTRAVERSION = -rc2
  ifneq "$(SUBLEVEL)" ""
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  else
@@@ -606,9 -606,6 +606,9 @@@ jupiter_config:	unconfi
  inka4x0_config:	unconfig
  	@$(MKCONFIG) inka4x0 ppc mpc5xxx inka4x0
  
 +ipek01_config: unconfig
 +	@$(MKCONFIG) -a ipek01 ppc mpc5xxx ipek01
 +
  lite5200b_config	\
  lite5200b_PM_config	\
  lite5200b_LOWBOOT_config:	unconfig
@@@ -2696,9 -2693,6 +2696,9 @@@ shannon_config	:	unconfi
  ## ARM92xT Systems
  #########################################################################
  
 +a320evb_config	:	unconfig
 +	@$(MKCONFIG) $(@:_config=) arm arm920t a320evb faraday a320
 +
  #########################################################################
  ## Atmel AT91RM9200 Systems
  #########################################################################
@@@ -2933,9 -2927,6 +2933,9 @@@ cp922_XA10_config	
  cp1026_config: unconfig
  	@board/armltd/integrator/split_by_variant.sh cp $@
  
 +da830evm_config:	unconfig
 +	@$(MKCONFIG) $(@:_config=) arm arm926ejs da830evm davinci davinci
 +
  davinci_dvevm_config :	unconfig
  	@$(MKCONFIG) $(@:_config=) arm arm926ejs dvevm davinci davinci