Browse Source

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

Waldemar Brodkorb 12 years ago
parent
commit
5279458ae6

+ 0 - 3
package/eglibc/Makefile

@@ -38,9 +38,6 @@ else
 	${INSTALL_DIR} $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH) \
 	    $(IDIR_EGLIBC)/usr/lib $(IDIR_EGLIBC)/usr/bin
 	$(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH)
-ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
-	(cd $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); ln -sf ld-linux.so.3 ld-linux-armhf.so.3)
-endif
 	-for file in libc libcrypt libdl libm libresolv libutil libnsl libnss_dns libnss_files; do \
 		$(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); \
 		$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); \

+ 3 - 3
package/libnetfilter_queue/Makefile

@@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libnetfilter_queue
 PKG_VERSION:=		1.0.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		df09befac35cb215865b39a36c96a3fa
 PKG_DESCR:=		API to packets that have been queued by the kernel packet filter
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libnfnetlink
-PKG_BUILDDEP:=		libnfnetlink
+PKG_DEPENDS:=		libnfnetlink libmnl
+PKG_BUILDDEP:=		libnfnetlink libmnl
 PKG_URL:=		http://www.netfilter.org/projects/libnetfilter_queue/
 PKG_SITES:=		http://www.netfilter.org/projects/libnetfilter_queue/files/
 

+ 1 - 0
target/arm/sys-available/raspberry-pi

@@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_KERNEL_ARCH_BCM2708
 	select ADK_KERNEL_AEABI
 	select ADK_KERNEL_PREEMPT
+	select ADK_KERNEL_VFP
 	select ADK_EABIHF
 	select ADK_CPU_RASPBERRY_PI
 	select ADK_TARGET_WITH_MMC

+ 1 - 1
target/config/Config.in

@@ -525,7 +525,7 @@ config ADK_TARGET_CFLAGS
 	default "-march=v32" if ADK_CPU_CRIS_V32
 	default "-march=v10" if ADK_CPU_CRIS_V10
 	default "-march=armv5te -mtune=iwmmxt" if ADK_CPU_XSCALE
-	default "-march=armv6 -mtune=arm1176jzf-s -mfloat-abi=hard" if ADK_CPU_RASPBERRY_PI
+	default "-march=armv6 -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard" if ADK_CPU_RASPBERRY_PI
 
 config ADK_TARGET_CMDLINE
 	string

+ 3 - 0
target/linux/config/Config.in.cpu

@@ -32,3 +32,6 @@ config ADK_KERNEL_USE_GENERIC_SMP_HELPERS
 	boolean
 	default y if ADK_TARGET_CPU_WITH_HT
 	default n
+
+config ADK_KERNEL_VFP
+	boolean