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

Config.in

@@ -95,7 +95,7 @@ prompt "Kernel Version"
 depends on ADK_TOOLCHAIN_ONLY
 
 config ADK_KERNEL_VERSION_TOOLCHAIN
-	prompt "3.5.4"
+	prompt "3.5.6"
 	boolean
 	depends on ADK_TOOLCHAIN_ONLY
 
@@ -106,20 +106,25 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 
 choice
 prompt "Kernel Version"
-config ADK_KERNEL_VERSION_3_5_4
-	prompt "3.5.4"
+config ADK_KERNEL_VERSION_3_6_1
+	prompt "3.6.1"
 	boolean
 
-config ADK_KERNEL_VERSION_3_4_9
-	prompt "3.4.9"
+config ADK_KERNEL_VERSION_3_5_6
+	prompt "3.5.6"
+	boolean
+
+config ADK_KERNEL_VERSION_3_4_13
+	prompt "3.4.13"
 	boolean
 
 endchoice
 
 config ADK_KERNEL_VERSION
 	string
-	default "3.4.9" if ADK_KERNEL_VERSION_3_4_9
-	default "3.5.4" if ADK_KERNEL_VERSION_3_5_4
+	default "3.4.13" if ADK_KERNEL_VERSION_3_4_13
+	default "3.5.6" if ADK_KERNEL_VERSION_3_5_6
+	default "3.6.1" if ADK_KERNEL_VERSION_3_6_1
 	help
 
 choice

mk/kernel-ver.mk

@@ -1,17 +1,23 @@
 ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
-KERNEL_VERSION:=	3.5.4
+KERNEL_VERSION:=	3.5.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		95d5c7271ad448bc965bdb29339b6923
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_5_4),y)
-KERNEL_VERSION:=	3.5.4
+ifeq ($(ADK_KERNEL_VERSION_3_6_1),y)
+KERNEL_VERSION:=	3.6.1
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
+KERNEL_RELEASE:=	1
+KERNEL_MD5SUM:=		63bdd7d325afae1ac525586d24eb5399
+endif
+ifeq ($(ADK_KERNEL_VERSION_3_5_6),y)
+KERNEL_VERSION:=	3.5.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		95d5c7271ad448bc965bdb29339b6923
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_9),y)
-KERNEL_VERSION:=	3.4.9
+ifeq ($(ADK_KERNEL_VERSION_3_4_13),y)
+KERNEL_VERSION:=	3.4.13
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		f9cd4fe763396bf814f3a71de42fde9b

toolchain/eglibc/Makefile

@@ -48,7 +48,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 			$(MAKE) install-headers install-bootstrap-headers=yes cross-compiling=yes \
 		); \
 		touch $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include/gnu/stubs.h; \
-		touch $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include/gnu/stubs-{32,x32,64}.h; \
+		touch $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include/gnu/stubs-{32,x32,64,o32,n32}.h; \
 	done
 	touch $@
 else
@@ -76,7 +76,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 		$(MAKE) install-headers install-bootstrap-headers=yes cross-compiling=yes \
 	);
 	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
-	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h
+	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,o32,n32}.h
 	touch $@
 endif
 
@@ -118,7 +118,12 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 	# default libgcc searching for 64 bit libraries
 	${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL)-64 install_root=$(STAGING_TARGET_DIR) install
 	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
-	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h
+	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,o32,n32}.h
+	# for libgcc build we need C library files, 64 bit default
+	mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2 ; \
+	$(CP) $(STAGING_TARGET_DIR)-64/lib/* $(STAGING_TARGET_DIR)-64/usr/lib/* \
+		$(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/; \
+	rm $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/libc.so ; \
 	for abi in $(TABI); do \
 		mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/$${abi/*:/} ; \
 		$(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/* $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/lib/* \

toolchain/eglibc/Makefile.multilib

@@ -28,10 +28,10 @@ endif
 endif
 ifeq ($(ADK_TARGET_MULTILIB_MIPS_O32),y)
 ifeq ($(ADK_KERNEL_CPU_LITTLE_ENDIAN),y)
-TABI+=mips64el-openadk-linux-gnu:o32
+TABI+=mips64el-openadk-linux-gnu:32
 TCFLAGS:=-mabi=
 else
-TABI+=mips64-openadk-linux-gnu:o32
+TABI+=mips64-openadk-linux-gnu:32
 TCFLAGS:=-mabi=
 endif
 endif