projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a 'cpu' command to print CPU information
[oweals/u-boot.git]
/
MAKEALL
diff --git
a/MAKEALL
b/MAKEALL
index ed85b7c07514f3bc31bf917253abce9707285f49..a6e378f89cf589a20b7909b5ec80610fd43c37a0 100755
(executable)
--- a/
MAKEALL
+++ b/
MAKEALL
@@
-171,6
+171,11
@@
GNU_MAKE=$(scripts/show-gnu-make) || {
# echo "Remaining arguments:"
# for arg do echo '--> '"\`$arg'" ; done
# echo "Remaining arguments:"
# for arg do echo '--> '"\`$arg'" ; done
+tools/genboardscfg.py || {
+ echo "Failed to generate boards.cfg" >&2
+ exit 1
+}
+
FILTER="\$1 !~ /^#/"
[ "$opt_a" ] && FILTER="${FILTER} && $opt_a"
[ "$opt_c" ] && FILTER="${FILTER} && $opt_c"
FILTER="\$1 !~ /^#/"
[ "$opt_a" ] && FILTER="${FILTER} && $opt_a"
[ "$opt_c" ] && FILTER="${FILTER} && $opt_c"
@@
-286,12
+291,6
@@
LIST_8xx="$(targets_by_cpu mpc8xx)"
LIST_4xx="$(targets_by_cpu ppc4xx)"
LIST_4xx="$(targets_by_cpu ppc4xx)"
-#########################################################################
-## MPC824x Systems
-#########################################################################
-
-LIST_824x="$(targets_by_cpu mpc824x)"
-
#########################################################################
## MPC8260 Systems (includes 8250, 8255 etc.)
#########################################################################
#########################################################################
## MPC8260 Systems (includes 8250, 8255 etc.)
#########################################################################
@@
-316,12
+315,6
@@
LIST_85xx="$(targets_by_cpu mpc85xx)"
LIST_86xx="$(targets_by_cpu mpc86xx)"
LIST_86xx="$(targets_by_cpu mpc86xx)"
-#########################################################################
-## 74xx/7xx Systems
-#########################################################################
-
-LIST_74xx_7xx="$(targets_by_cpu 74xx_7xx)"
-
#########################################################################
## PowerPC groups
#########################################################################
#########################################################################
## PowerPC groups
#########################################################################
@@
-343,7
+336,6
@@
LIST_powerpc=" \
${LIST_85xx} \
${LIST_86xx} \
${LIST_4xx} \
${LIST_85xx} \
${LIST_86xx} \
${LIST_4xx} \
- ${LIST_74xx_7xx}\
"
# Alias "ppc" -> "powerpc" to not break compatibility with older scripts
"
# Alias "ppc" -> "powerpc" to not break compatibility with older scripts
@@
-512,9
+504,9
@@
get_target_location() {
set ${line}
set ${line}
- CONFIG_NAME="${7%_config}"
+ CONFIG_NAME="${7%_
def
config}"
- [ "${BOARD_NAME}" ] || BOARD_NAME="${7%_config}"
+ [ "${BOARD_NAME}" ] || BOARD_NAME="${7%_
def
config}"
if [ $# -gt 5 ]; then
if [ "$6" = "-" ] ; then
if [ $# -gt 5 ]; then
if [ "$6" = "-" ] ; then
@@
-559,13
+551,7
@@
get_target_maintainers() {
get_target_arch() {
local target=$1
get_target_arch() {
local target=$1
- # Automatic mode
- local line=`awk '\$7 == "'"$target"'" { print \$0 }' boards.cfg`
-
- if [ -z "${line}" ] ; then echo "" ; return ; fi
-
- set ${line}
- echo "$2"
+ awk '$7 == "'$target'" { print $2 }' boards.cfg
}
list_target() {
}
list_target() {
@@
-650,8
+636,10
@@
build_target() {
MAKE="${MAKE} O=${output_dir}"
fi
MAKE="${MAKE} O=${output_dir}"
fi
- ${MAKE} distclean >/dev/null
- ${MAKE} -s ${target}_config
+ ${MAKE} mrproper >/dev/null
+
+ echo "Building ${target} board..."
+ ${MAKE} -s ${target}_defconfig >/dev/null
${MAKE} ${JOBS} ${CHECK} all \
>${LOG_DIR}/$target.MAKELOG 2> ${LOG_DIR}/$target.ERR
${MAKE} ${JOBS} ${CHECK} all \
>${LOG_DIR}/$target.MAKELOG 2> ${LOG_DIR}/$target.ERR
@@
-661,6
+649,13
@@
build_target() {
RC=1
fi
RC=1
fi
+ OBJS=${output_dir}/u-boot
+ if [ -e ${output_dir}/spl/u-boot-spl ]; then
+ OBJS="${OBJS} ${output_dir}/spl/u-boot-spl"
+ fi
+
+ ${CROSS_COMPILE}size ${OBJS} | tee -a ${LOG_DIR}/$target.MAKELOG
+
if [ $BUILD_MANY == 1 ] ; then
trap - TERM
if [ $BUILD_MANY == 1 ] ; then
trap - TERM
@@
-685,13
+680,6
@@
build_target() {
fi
fi
fi
fi
- OBJS=${output_dir}/u-boot
- if [ -e ${output_dir}/spl/u-boot-spl ]; then
- OBJS="${OBJS} ${output_dir}/spl/u-boot-spl"
- fi
-
- ${CROSS_COMPILE}size ${OBJS} | tee -a ${LOG_DIR}/$target.MAKELOG
-
[ -e "${LOG_DIR}/${target}.ERR" ] && cat "${LOG_DIR}/${target}.ERR"
touch "${donep}${build_idx}"
[ -e "${LOG_DIR}/${target}.ERR" ] && cat "${LOG_DIR}/${target}.ERR"
touch "${donep}${build_idx}"