summaryrefslogtreecommitdiff
path: root/target/rb532/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-11 19:49:33 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-11 19:49:33 (GMT)
commit070cac9d32fa7a0f7f4d52eddec901d248cdfae3 (patch)
tree1a4cf65e381c5ce777316fb67e69018feb741f8f /target/rb532/Makefile
parentd82534d3a6bfb048cc7bdc694654c15a975d7af6 (diff)
parent644de656b41be3def5d2d0f276f7e24c0b367ea1 (diff)
resolve conflict
Merge branch 'master' of git+ssh://openadk.org/git/openadk Conflicts: mk/build.mk
Diffstat (limited to 'target/rb532/Makefile')
-rw-r--r--target/rb532/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/rb532/Makefile b/target/rb532/Makefile
index 9c590c0..f1b2566 100644
--- a/target/rb532/Makefile
+++ b/target/rb532/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/mk/image.mk
OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
kernel-install:
- $(KERNEL_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \
+ $(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \
$(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
ifeq ($(FS),ext2-cf)