Merge branch 'master' of ../work into next
This commit is contained in:
commit
35e3717772
11
MAKEALL
11
MAKEALL
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
|
|
||||||
# Print statistics when we exit
|
# Print statistics when we exit
|
||||||
trap exit 1 2 3 15
|
trap exit 1 2 3 15
|
||||||
|
@ -39,6 +39,7 @@ LIST=""
|
||||||
ERR_CNT=0
|
ERR_CNT=0
|
||||||
ERR_LIST=""
|
ERR_LIST=""
|
||||||
TOTAL_CNT=0
|
TOTAL_CNT=0
|
||||||
|
RC=0
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
## MPC5xx Systems
|
## MPC5xx Systems
|
||||||
|
@ -939,6 +940,12 @@ build_target() {
|
||||||
|
|
||||||
${MAKE} ${JOBS} all 2>&1 >${LOG_DIR}/$target.MAKELOG \
|
${MAKE} ${JOBS} all 2>&1 >${LOG_DIR}/$target.MAKELOG \
|
||||||
| tee ${LOG_DIR}/$target.ERR
|
| 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
|
if [ -s ${LOG_DIR}/$target.ERR ] ; then
|
||||||
ERR_CNT=$((ERR_CNT + 1))
|
ERR_CNT=$((ERR_CNT + 1))
|
||||||
ERR_LIST="${ERR_LIST} $target"
|
ERR_LIST="${ERR_LIST} $target"
|
||||||
|
@ -962,6 +969,8 @@ print_stats() {
|
||||||
echo "Boards with warnings or errors: ${ERR_CNT} (${ERR_LIST} )"
|
echo "Boards with warnings or errors: ${ERR_CNT} (${ERR_LIST} )"
|
||||||
fi
|
fi
|
||||||
echo "----------------------------------------------------------"
|
echo "----------------------------------------------------------"
|
||||||
|
|
||||||
|
exit $RC
|
||||||
}
|
}
|
||||||
|
|
||||||
#-----------------------------------------------------------------------
|
#-----------------------------------------------------------------------
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -24,7 +24,7 @@
|
||||||
VERSION = 2009
|
VERSION = 2009
|
||||||
PATCHLEVEL = 11
|
PATCHLEVEL = 11
|
||||||
SUBLEVEL =
|
SUBLEVEL =
|
||||||
EXTRAVERSION = -rc1
|
EXTRAVERSION = -rc2
|
||||||
ifneq "$(SUBLEVEL)" ""
|
ifneq "$(SUBLEVEL)" ""
|
||||||
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
||||||
else
|
else
|
||||||
|
|
|
@ -315,10 +315,6 @@ int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
/*
|
/*
|
||||||
* Wait for the write to complete. The write can take
|
* Wait for the write to complete. The write can take
|
||||||
* up to 10mSec (we allow a little more time).
|
* up to 10mSec (we allow a little more time).
|
||||||
*
|
|
||||||
* On some chips, while the write is in progress, the
|
|
||||||
* chip doesn't respond. This apparently isn't a
|
|
||||||
* universal feature so we don't take advantage of it.
|
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* No write delay with FRAM devices.
|
* No write delay with FRAM devices.
|
||||||
|
|
|
@ -229,15 +229,13 @@ main (int argc, char **argv)
|
||||||
case 'f':
|
case 'f':
|
||||||
if (--argc <= 0)
|
if (--argc <= 0)
|
||||||
usage ();
|
usage ();
|
||||||
params.type = IH_TYPE_FLATDT;
|
|
||||||
params.datafile = *++argv;
|
|
||||||
params.fflag = 1;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The flattened image tree (FIT) format
|
* The flattened image tree (FIT) format
|
||||||
* requires a flattened device tree image type
|
* requires a flattened device tree image type
|
||||||
*/
|
*/
|
||||||
params.type = IH_TYPE_FLATDT;
|
params.type = IH_TYPE_FLATDT;
|
||||||
|
params.datafile = *++argv;
|
||||||
|
params.fflag = 1;
|
||||||
goto NXTARG;
|
goto NXTARG;
|
||||||
case 'n':
|
case 'n':
|
||||||
if (--argc <= 0)
|
if (--argc <= 0)
|
||||||
|
|
Loading…
Reference in New Issue