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/native | |
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/native')
-rw-r--r-- | target/native/Makefile | 5 | ||||
-rw-r--r-- | target/native/device.mk | 6 | ||||
-rw-r--r-- | target/native/target.mk | 6 | ||||
-rw-r--r-- | target/native/uclibc.config | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/target/native/Makefile b/target/native/Makefile index 4f38c3a0b..2b279e4ff 100644 --- a/target/native/Makefile +++ b/target/native/Makefile @@ -2,6 +2,7 @@ # material, please see the LICENCE file in the top-level directory. include $(TOPDIR)/rules.mk +include $(TOPDIR)/mk/vars.mk include $(TOPDIR)/mk/kernel.mk include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk @@ -11,8 +12,8 @@ kernel-install: ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${DEVICE}-${ARCH}-kernel - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/native/device.mk b/target/native/device.mk deleted file mode 100644 index 0b28f9c9e..000000000 --- a/target/native/device.mk +++ /dev/null @@ -1,6 +0,0 @@ -ARCH:= $(shell uname -m|sed -e "s/i.*86/x86/") -CPU_ARCH:= $(shell uname -m) -KERNEL_VERSION:= 2.6.30.5 -KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= be9c3a697a54ac099c910d068ff0dc03 -TARGET_OPTIMIZATION:= -Os -pipe diff --git a/target/native/target.mk b/target/native/target.mk new file mode 100644 index 000000000..c4eb94ace --- /dev/null +++ b/target/native/target.mk @@ -0,0 +1,6 @@ +ARCH:= $(shell uname -m|sed -e "s/i.*86/x86/" -e "s/_\?64//") +CPU_ARCH:= $(shell uname -m) +KERNEL_VERSION:= 2.6.33 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= c3883760b18d50e8d78819c54d579b00 +TARGET_OPTIMIZATION:= -Os -pipe diff --git a/target/native/uclibc.config b/target/native/uclibc.config index ed46e1519..f779cc8bf 100644 --- a/target/native/uclibc.config +++ b/target/native/uclibc.config @@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y UCLIBC_HAS_NETWORK_SUPPORT=y UCLIBC_HAS_SOCKET=y UCLIBC_HAS_IPV4=y -# UCLIBC_HAS_IPV6 is not set +UCLIBC_HAS_IPV6=y UCLIBC_HAS_RPC=y UCLIBC_HAS_FULL_RPC=y UCLIBC_HAS_REENTRANT_RPC=y |