diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-11 20:49:33 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-11 20:49:33 +0100 |
commit | 070cac9d32fa7a0f7f4d52eddec901d248cdfae3 (patch) | |
tree | 1a4cf65e381c5ce777316fb67e69018feb741f8f /target | |
parent | d82534d3a6bfb048cc7bdc694654c15a975d7af6 (diff) | |
parent | 644de656b41be3def5d2d0f276f7e24c0b367ea1 (diff) |
resolve conflict
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/build.mk
Diffstat (limited to 'target')
-rw-r--r-- | target/lemote/target.mk | 4 | ||||
-rw-r--r-- | target/rb532/Makefile | 2 | ||||
-rw-r--r-- | target/rb532/target.mk | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/target/lemote/target.mk b/target/lemote/target.mk index 2702be95b..db804bc64 100644 --- a/target/lemote/target.mk +++ b/target/lemote/target.mk @@ -1,7 +1,7 @@ ARCH:= mips CPU_ARCH:= mips64el -KERNEL_VERSION:= 2.6.31.5 +KERNEL_VERSION:= 2.6.32 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +KERNEL_MD5SUM:= 260551284ac224c3a43c4adac7df4879 TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=loongson2f -mabi=64 diff --git a/target/rb532/Makefile b/target/rb532/Makefile index 9c590c0e0..f1b2566b6 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) diff --git a/target/rb532/target.mk b/target/rb532/target.mk index c0924be1f..95f01766b 100644 --- a/target/rb532/target.mk +++ b/target/rb532/target.mk @@ -1,7 +1,7 @@ ARCH:= mips CPU_ARCH:= mipsel -KERNEL_VERSION:= 2.6.31.5 +KERNEL_VERSION:= 2.6.32 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 926bff46d24e2f303e4ee92234e394d8 +KERNEL_MD5SUM:= 260551284ac224c3a43c4adac7df4879 TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=mips32 |