diff -r 0d9c107d4422 Makefile --- a/Makefile Tue Aug 02 00:26:35 2011 +0300 +++ b/Makefile Wed Aug 10 19:58:50 2011 +0200 @@ -35,9 +35,13 @@ #.endif .if !defined(TARGET) || !defined(TARGET_ARCH) -.error "soc.mk must define both TARGET and TARGET_ARCH" +ERROROUT:: + @echo "soc.mk must define both TARGET and TARGET_ARCH" && /bin/false +# .error "soc.mk must define both TARGET and TARGET_ARCH" .endif +menuconfig: + ./menu.sh build-info: @echo "++++++++++++++ Selected settings for building ++++++++++++++" @@ -342,7 +346,9 @@ # XXX Must make makefs, mkulzma with [kernel-]toolchain + uboot_mkimage and old lzma ports -all: build-info world kernel ports +all: menuconfig + +build: build-info world kernel ports IMAGE_SUFFIX?=trx ZTOOLS_PATH=${ZROUTER_OBJ}/ztools NEW_KERNEL=${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}_kernel diff -r 0d9c107d4422 boards/boards.mk --- a/boards/boards.mk Tue Aug 02 00:26:35 2011 +0300 +++ b/boards/boards.mk Wed Aug 10 19:58:50 2011 +0200 @@ -19,6 +19,9 @@ .if !defined(TARGET_BOARDDIR) PAIRS!=ls -d ${ZROUTER_ROOT}/boards/*/* | sed 's/^.*\/boards\///' -.warning "No board configuration for pair TARGET_VENDOR/TARGET_DEVICE `${TARGET_VENDOR}/${TARGET_DEVICE}`" -.error "Posible pairs ${PAIRS}" +#.warning "No board configuration for pair TARGET_VENDOR/TARGET_DEVICE `${TARGET_VENDOR}/${TARGET_DEVICE}`" +#.error "Posible pairs ${PAIRS}" +ERROROUT:: + @echo "No board configuration for pair TARGET_VENDOR/TARGET_DEVICE `${TARGET_VENDOR}/${TARGET_DEVICE}`" + @echo "Posible pairs ${PAIRS}" && /bin/false .endif diff -r 0d9c107d4422 menu.sh --- a/menu.sh Tue Aug 02 00:26:35 2011 +0300 +++ b/menu.sh Wed Aug 10 19:58:50 2011 +0200 @@ -34,7 +34,7 @@ main_menu() { TMPOPTIONSFILE=$(mktemp -t zrouter-build-menu) trap "${RM} -f ${TMPOPTIONSFILE}; exit 1" 1 2 3 5 10 13 15 - ${SH} -c "${DIALOG} --title \"ZRouter build menu\" --menu ' ' 13 60 6 \ + ${SH} -c "${DIALOG} --title \"ZRouter build menu ${PROFILE_NAME}\" --menu ' ' 13 60 6 \ Device \"Select the target device\" \ Targets \"Select the build targets\" \ Paths \"Set the paths of sources and build objects\" \ @@ -271,6 +271,7 @@ FREEBSD_SRC_TREE="${FREEBSD_SRC_TREE}" OBJ_DIR="${OBJ_DIR}" EOF + PROFILE_NAME="(${PROFILE})" return 0 } @@ -320,6 +321,7 @@ \"\nThere is a problem with the selected profile (not a file ?).\nThe file could not be read.\" 8 65" return 1 fi + PROFILE_NAME="(${PROFILE})" return 0 } @@ -332,7 +334,7 @@ else BOX_SIZE=$(($BOX_SIZE + 10)) fi - ${SH} -c "${DIALOG} --title \"ZRouter build settings\" --yesno \ + ${SH} -c "${DIALOG} --title \"ZRouter build settings ${PROFILE_NAME}\" --yesno \ \"\nPROFILE: ${PROFILE} \ \nTARGET_PAIR: ${TARGET_PAIR} \ \nTARGETS: ${TARGETS} \ @@ -352,12 +354,13 @@ # # Set defaults # -BUILD_PROFILES_DIR=build_profiles -FREEBSD_SRC_TREE="/usr/src" -OBJ_DIR="/usr/obj" -TARGET_PAIR="NONE" -PROFILE="NONE" -TARGETS="kernel.oldlzma.uboot rootfs.iso.ulzma" +: ${BUILD_PROFILES_DIR:="build_profiles"} +: ${FREEBSD_SRC_TREE:="/usr/src"} +: ${OBJ_DIR:="/usr/obj"} +: ${TARGET_PAIR:="NONE"} +: ${PROFILE:="NONE"} +: ${TARGETS:="kernel.oldlzma.uboot rootfs.iso.ulzma"} +PROFILE_NAME="(${PROFILE})" # # Tools paths diff -r 0d9c107d4422 socs/socs.mk --- a/socs/socs.mk Tue Aug 02 00:26:35 2011 +0300 +++ b/socs/socs.mk Wed Aug 10 19:58:50 2011 +0200 @@ -9,6 +9,10 @@ .if !defined(TARGET_SOCDIR) PAIRS!=ls -d ${ZROUTER_ROOT}/socs/*/* | sed 's/^.*\/socs\///' -.warning "No board configuration for pair SOC_VENDOR/SOC_CHIP `${SOC_VENDOR}/${SOC_CHIP}`" -.error "Posible pairs ${PAIRS}" +ERROROUT:: + @echo "No board configuration for pair SOC_VENDOR/SOC_DEVICE `${SOC_VENDOR}/${SOC_DEVICE}`" + @echo "Posible pairs ${PAIRS}" && /bin/false + +#.warning "No board configuration for pair SOC_VENDOR/SOC_CHIP `${SOC_VENDOR}/${SOC_CHIP}`" +#.error "Posible pairs ${PAIRS}" .endif