From c653423921e82df58aa203674fabe6fc6e157cd4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 15 Feb 2014 14:25:32 +0100 Subject: fix a warning in menuconfig, remove obsolete symbols while migrating to miniconfig --- target/config/Config.in | 15 +++++++++++---- target/linux/config/Config.in.netdevice | 32 -------------------------------- 2 files changed, 11 insertions(+), 36 deletions(-) diff --git a/target/config/Config.in b/target/config/Config.in index 4b35b7a50..b047742b7 100644 --- a/target/config/Config.in +++ b/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 diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index cdd602cd7..7d189a063 100644 --- a/target/linux/config/Config.in.netdevice +++ b/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 -- cgit v1.2.3