Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 15 years ago
parent
commit
4f8d0c38d0
3 changed files with 26 additions and 3 deletions
  1. 3 2
      target/Config.in
  2. 1 1
      target/lemote/Makefile
  3. 22 0
      toolchain/uClibc/patches/mips64.patch

+ 3 - 2
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

+ 1 - 1
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

+ 22 - 0
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