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

target/config/Config.in

@@ -97,6 +97,12 @@ config ADK_TARGET_ABI
 	default "n32" if ADK_n32
 	default "64" if ADK_n64
 
+config ADK_TARGET_ABI_MIPS_O32
+	boolean
+	select ADK_o32
+	depends on !ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
+	default y
+
 choice
 prompt "Target ABI"
 depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
@@ -461,7 +467,7 @@ config ADK_TARGET_CPU_ARCH
 
 config ADK_TARGET_ABI_CFLAGS
 	string
-	default "-mabi=32" if ADK_TARGET_ABI_O32
+	default "-mabi=32" if ADK_TARGET_ABI_O32 || ADK_TARGET_ABI_MIPS_O32
 	default "-mabi=n32" if ADK_TARGET_ABI_N32
 	default "-mabi=64" if ADK_TARGET_ABI_N64
 	default "-m32" if ADK_TARGET_ABI_32
@@ -474,9 +480,10 @@ config ADK_TARGET_ABI_LDFLAGS
 
 config ADK_TARGET_KERNEL_LDFLAGS
 	string
-	default "-mabi=64" if ADK_TARGET_ABI_N32
-	default "-mabi=64" if ADK_TARGET_ABI_O32
-	default "-mabi=64" if ADK_TARGET_ABI_N64
+	default "-mabi=64" if ADK_TARGET_ABI_N32 && ADK_TARGET_KERNEL64
+	default "-mabi=64" if ADK_TARGET_ABI_O32 && ADK_TARGET_KERNEL64
+	default "-mabi=64" if ADK_TARGET_ABI_N64 && ADK_TARGET_KERNEL64
+	default ""
 
 config ADK_TARGET_CFLAGS
 	string

target/linux/config/Config.in.netdevice

@@ -144,38 +144,6 @@ config ADK_KERNEL_B44
 	default n
 	help
 
-config ADK_KERNEL_E1000
-	boolean
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_NETDEV_1000
-	default y if ADK_TARGET_SYSTEM_VBOX_I686
-	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_QEMU_I686
-	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
-	default n
-	help
-
-config ADK_KERNEL_E1000E
-	boolean
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_NETDEV_1000
-	default y if ADK_TARGET_SYSTEM_TAROX_PC
-	default y if ADK_NATIVE_SYSTEM_TAROX_PC
-	default n
-	help
-
-config ADK_KERNEL_SKY2
-	boolean
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_NETDEV_1000
-	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
-	default n
-	help
-
 config ADK_KERNEL_R8169
 	boolean
 	select ADK_KERNEL_NETDEVICES