diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-04 00:26:37 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-04 00:26:37 +0100 |
| commit | 4f8d0c38d0429b26dbc8c3035cf212b22ac2b516 (patch) | |
| tree | 664e5918560c19a0adea71292d551b51f958a769 | |
| parent | 613edafdbc80885a5465bf1add798432be2e52d8 (diff) | |
| parent | 066c65e388b2799adfab01ff40075838217a9199 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | target/Config.in | 5 | ||||
| -rw-r--r-- | target/lemote/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/uClibc/patches/mips64.patch | 22 |
3 files changed, 26 insertions, 3 deletions
diff --git a/target/Config.in b/target/Config.in index 44d6a4465..78e42d988 100644 --- a/target/Config.in +++ b/target/Config.in @@ -195,7 +195,6 @@ config ADK_LINUX_ALIX Support for Alix and Wrap boards. http://www.pcengines.ch - config ADK_LINUX_CRIS_FOXBOARD bool "Foxboard (ETRAX LX100)" select ADK_foxboard @@ -400,6 +399,7 @@ config ADK_LINUX_MIPS64_QEMU bool "mips64 (big endian)" select ADK_mips64_qemu select ADK_LINUX_64 + depends on ADK_BROKEN help Qemu support for MIPS64 BE architecture. Status: development @@ -408,6 +408,7 @@ config ADK_LINUX_MIPS64EL_QEMU bool "mips64 (little endian)" select ADK_mips64el_qemu select ADK_LINUX_64 + depends on ADK_BROKEN help Qemu support for MIPS64 LE architecture. Status: development @@ -608,7 +609,7 @@ depends on ! ADK_NATIVE config ADK_TARGET_LIB_UCLIBC bool "uClibc embedded C library" # broken, because of 16kB pagesize - depends on !ADK_LINUX_MIPS64_LEMOTE + #depends on !ADK_LINUX_MIPS64_LEMOTE select ADK_uclibc help http://uclibc.org diff --git a/target/lemote/Makefile b/target/lemote/Makefile index 9654e0c5e..951d0b3cc 100644 --- a/target/lemote/Makefile +++ b/target/lemote/Makefile @@ -28,7 +28,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' @echo 'Boot your lemote and type following commands in PMON:' @echo 'PMON> ifaddr rtl0 <ip-address-client>' - @echo 'PMON> load tftp://<ip-address-server>/lemote-mips-kernel' + @echo 'PMON> load tftp://<ip-address-server>/${ADK_TARGET}-${FS}-kernel' @echo 'PMON> g no_auto_cmd root=/dev/nfs ip=dhcp init=/init' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/toolchain/uClibc/patches/mips64.patch b/toolchain/uClibc/patches/mips64.patch new file mode 100644 index 000000000..fd2135a48 --- /dev/null +++ b/toolchain/uClibc/patches/mips64.patch @@ -0,0 +1,22 @@ +diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/getdents.c uClibc-0.9.30.2/libc/sysdeps/linux/common/getdents.c +--- uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/getdents.c 2010-01-13 22:22:31.000000000 +0100 ++++ uClibc-0.9.30.2/libc/sysdeps/linux/common/getdents.c 2010-02-03 20:21:34.000000000 +0100 +@@ -136,9 +136,6 @@ + return (char *) dp - buf; + } + +-#if defined __UCLIBC_HAS_LFS__ && ! defined __NR_getdents64 +-attribute_hidden strong_alias(__getdents,__getdents64) +-#endif + + #elif __WORDSIZE == 32 + +@@ -171,4 +168,8 @@ + } + #endif + ++#if defined __UCLIBC_HAS_LFS__ && ! defined __NR_getdents64 ++attribute_hidden strong_alias(__getdents,__getdents64) ++#endif ++ + #endif |