diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /target/Makefile | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'target/Makefile')
| -rw-r--r-- | target/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/Makefile b/target/Makefile index 82484ad98..b3f266ee0 100644 --- a/target/Makefile +++ b/target/Makefile @@ -41,9 +41,9 @@ config-prepare: $(TOPDIR)/.config >${BUILD_DIR}/.kernelconfig.nokernel # if native build, first try /proc/config.gz ifeq ($(ADK_NATIVE),y) - @if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${DEVICE}/kernel.config.$(CPU_ARCH) ${BUILD_DIR}/.kernelconfig.board; fi + @if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${ADK_TARGET}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi else - @cp ${DEVICE}/kernel.config ${BUILD_DIR}/.kernelconfig.board + @cp ${ADK_TARGET}/kernel.config ${BUILD_DIR}/.kernelconfig.board endif @(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \ while IFS='=' read symbol value; do \ @@ -62,11 +62,11 @@ endif cp .kernelconfig.tmp .kernelconfig @-rm -f ${BUILD_DIR}/.kernelconfig.tmp -prepare: $(DEVICE)-prepare -compile: $(DEVICE)-compile -image: $(DEVICE)-imageclean $(DEVICE)-imageinstall -install: $(DEVICE)-imageclean $(DEVICE)-install $(DEVICE)-imageinstall -clean: $(DEVICE)-clean $(DEVICE)-imageclean +prepare: $(ADK_TARGET)-prepare +compile: $(ADK_TARGET)-compile +image: $(ADK_TARGET)-imageclean $(ADK_TARGET)-imageinstall +install: $(ADK_TARGET)-imageclean $(ADK_TARGET)-install $(ADK_TARGET)-imageinstall +clean: $(ADK_TARGET)-clean $(ADK_TARGET)-imageclean %-clean: $(TRACE) target/$(patsubst %-clean,%,$@)-clean |