Merge branch 'buildman' of git://git.denx.de/u-boot-x86

[J-u-boot.git] / MAKEALL

diff --git a/MAKEALL b/MAKEALL
index 020e65fdc8fc5432624b3ee6449d56a6ac36cb07..4d643d194c4b46ac01886385a986eb105f3f0007 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -162,9 +162,20 @@ while true ; do
                echo "Internal error!" >&2 ; exit 1 ;;
        esac
 done
+
+GNU_MAKE=$(scripts/show-gnu-make) || {
+       echo "GNU Make not found" >&2
+       exit 1
+}
+
 # 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"
@@ -280,12 +291,6 @@ LIST_8xx="$(targets_by_cpu mpc8xx)"
 
 LIST_4xx="$(targets_by_cpu ppc4xx)"
 
-#########################################################################
-## MPC824x Systems
-#########################################################################
-
-LIST_824x="$(targets_by_cpu mpc824x)"
-
 #########################################################################
 ## MPC8260 Systems (includes 8250, 8255 etc.)
 #########################################################################
@@ -506,9 +511,9 @@ get_target_location() {
 
        set ${line}
 
-       CONFIG_NAME="${7%_config}"
+       CONFIG_NAME="${7%_defconfig}"
 
-       [ "${BOARD_NAME}" ] || BOARD_NAME="${7%_config}"
+       [ "${BOARD_NAME}" ] || BOARD_NAME="${7%_defconfig}"
 
        if [ $# -gt 5 ]; then
                if [ "$6" = "-" ] ; then
@@ -633,19 +638,21 @@ build_target() {
        target_arch=$(get_target_arch ${target})
        eval cross_toolchain=\$CROSS_COMPILE_`echo $target_arch | tr '[:lower:]' '[:upper:]'`
        if [ "${cross_toolchain}" ] ; then
-           MAKE="make CROSS_COMPILE=${cross_toolchain}"
+           MAKE="$GNU_MAKE CROSS_COMPILE=${cross_toolchain}"
        elif [ "${CROSS_COMPILE}" ] ; then
-           MAKE="make CROSS_COMPILE=${CROSS_COMPILE}"
+           MAKE="$GNU_MAKE CROSS_COMPILE=${CROSS_COMPILE}"
        else
-           MAKE=make
+           MAKE=$GNU_MAKE
        fi
 
        if [  "${output_dir}" != "." ] ; then
                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