diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:10:52 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:10:52 +0200 |
| commit | 681a668edf704bbb000a49c835b3d71fa7035d86 (patch) | |
| tree | 27df7d51e37260f63812466b31369c1a144cdc45 /target/Makefile | |
| parent | 2d1f73d4334593134d3a47704a2614ffcae384ae (diff) | |
| parent | 6c2bc15eb5c40548f6a98c37ab0b825b9c163343 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/Makefile')
| -rw-r--r-- | target/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/target/Makefile b/target/Makefile index 7ca524c89..470e9e4e9 100644 --- a/target/Makefile +++ b/target/Makefile @@ -53,7 +53,11 @@ ifeq ($(ADK_NATIVE),y) 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; \ fi else - @cp ${ADK_TARGET_ARCH}/kernel.config ${BUILD_DIR}/.kernelconfig.board + if [ -f ${ADK_TARGET_ARCH}/kernel.config.$(ADK_TARGET_SYSTEM) ];then \ + cp ${ADK_TARGET_ARCH}/kernel.config.$(ADK_TARGET_SYSTEM) ${BUILD_DIR}/.kernelconfig.board; \ + else \ + cp ${ADK_TARGET_ARCH}/kernel.config ${BUILD_DIR}/.kernelconfig.board; \ + fi endif @(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \ while IFS='=' read symbol value; do \ @@ -85,7 +89,11 @@ endif @-rm -f ${BUILD_DIR}/.kernelconfig.tmp else config-prepare: $(TOPDIR)/.config - @cp ${ADK_TARGET_ARCH}/kernel.config ${BUILD_DIR}/.kernelconfig + if [ -f ${ADK_TARGET_ARCH}/kernel.config.$(ADK_TARGET_SYSTEM) ];then \ + cp ${ADK_TARGET_ARCH}/kernel.config.$(ADK_TARGET_SYSTEM) ${BUILD_DIR}/.kernelconfig.board; \ + else \ + cp ${ADK_TARGET_ARCH}/kernel.config ${BUILD_DIR}/.kernelconfig.board; \ + fi endif prepare: $(ADK_TARGET_ARCH)-prepare |