diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
| commit | 5861b2783c0615345b80a93470312b36d1cb9907 (patch) | |
| tree | 42ded4821e0834063449a5620a1b46bc6f1e509b /target/Makefile | |
| parent | e3d296fa18ef060fad7e654cd9308e57ffd0934b (diff) | |
| parent | d8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff) | |
fix conflict
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 |