瀏覽代碼

Makefile: simplify handling of build target names

Instead of stripping the "_config" part from the make target names in
each call of the "mkconfig" script let this script strip the string.

This prepares the ground for forther simplification of the top level
Makefile.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk 15 年之前
父節點
當前提交
ed7a196cd5
共有 2 個文件被更改,包括 188 次插入202 次删除
  1. 185 199
      Makefile
  2. 3 3
      mkconfig

File diff suppressed because it is too large
+ 185 - 199
Makefile


+ 3 - 3
mkconfig

@@ -16,13 +16,13 @@ while [ $# -gt 0 ] ; do
 	case "$1" in
 	--) shift ; break ;;
 	-a) shift ; APPEND=yes ;;
-	-n) shift ; BOARD_NAME="${1%%_config}" ; shift ;;
+	-n) shift ; BOARD_NAME="${1%_config}" ; shift ;;
 	-t) shift ; TARGETS="`echo $1 | sed 's:_: :g'` ${TARGETS}" ; shift ;;
 	*)  break ;;
 	esac
 done
 
-[ "${BOARD_NAME}" ] || BOARD_NAME="$1"
+[ "${BOARD_NAME}" ] || BOARD_NAME="${1%_config}"
 
 [ $# -lt 4 ] && exit 1
 [ $# -gt 6 ] && exit 1
@@ -102,7 +102,7 @@ done
 cat << EOF >> config.h
 #define CONFIG_BOARDDIR board/$BOARDDIR
 #include <config_defaults.h>
-#include <configs/$1.h>
+#include <configs/${BOARDNAME}.h>
 #include <asm/config.h>
 EOF
 

Some files were not shown because too many files changed in this diff