From 37b334551d2c566c0f195a672272e47f30a62e81 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Wed, 23 Nov 2011 21:44:22 +0000 Subject: [PATCH] cleanup: remove refs to unsupported "gemini" target SVN-Revision: 29301 --- package/madwifi/Makefile | 3 --- toolchain/Config.in | 1 - toolchain/gcc/Config.in | 3 +-- toolchain/gcc/Config.version | 5 +--- .../uClibc/config-0.9.30+nptl/arm.gemini | 26 ------------------- toolchain/uClibc/config-0.9.30.1/arm.gemini | 26 ------------------- toolchain/uClibc/config-0.9.30.2/arm.gemini | 26 ------------------- toolchain/uClibc/config-0.9.30.3/arm.gemini | 26 ------------------- 8 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 toolchain/uClibc/config-0.9.30+nptl/arm.gemini delete mode 100644 toolchain/uClibc/config-0.9.30.1/arm.gemini delete mode 100644 toolchain/uClibc/config-0.9.30.2/arm.gemini delete mode 100644 toolchain/uClibc/config-0.9.30.3/arm.gemini diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 3c23245db1..cb5efb60d8 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -88,9 +88,6 @@ endif ifeq ($(ARCH),powerpc) HAL_TARGET:=powerpc-be-elf endif -ifeq ($(BOARD),gemini) - HAL_TARGET:=armv4-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) -endif ifneq ($(CONFIG_TARGET_atheros),) HAL_TARGET:=wisoc endif diff --git a/toolchain/Config.in b/toolchain/Config.in index aaf4f47006..3975ffdcce 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -90,7 +90,6 @@ config EABI_SUPPORT bool depends arm||armeb prompt "Enable EABI support" if TOOLCHAINOPTS - default n if TARGET_gemini default y help Enable ARM EABI support diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index da3745de27..55b8400999 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -6,10 +6,9 @@ choice default GCC_VERSION_4_2_4 if avr32 default GCC_VERSION_4_3_3 if powerpc64 default GCC_VERSION_4_3_3 if TARGET_coldfire - default GCC_VERSION_4_3_4 if TARGET_gemini default GCC_VERSION_4_4_1 if ubicom32 default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte) - default GCC_VERSION_4_3_3_CS if (arm || armeb) && !TARGET_gemini + default GCC_VERSION_4_3_3_CS if (arm || armeb) default GCC_VERSION_4_4_3 if powerpc default GCC_VERSION_4_4_3 if (TARGET_octeon || TARGET_sibyte) default GCC_VERSION_4_1_2 diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index 3cfc60ae20..fd4f6905c9 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -68,12 +68,9 @@ if !LINUX_2_4 default y if powerpc64 default y if TARGET_coldfire - config GCC_VERSION_4_3_4 - default y if TARGET_gemini - config GCC_VERSION_4_3_3_CS default y if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte) - default y if (arm || armeb) && !TARGET_gemini + default y if (arm || armeb) config GCC_VERSION_4_4_1 default y if ubicom32 diff --git a/toolchain/uClibc/config-0.9.30+nptl/arm.gemini b/toolchain/uClibc/config-0.9.30+nptl/arm.gemini deleted file mode 100644 index 8043cf61b7..0000000000 --- a/toolchain/uClibc/config-0.9.30+nptl/arm.gemini +++ /dev/null @@ -1,26 +0,0 @@ -ARCH_ANY_ENDIAN=y -ARCH_LITTLE_ENDIAN=y -ARCH_WANTS_LITTLE_ENDIAN=y -# CONFIG_ARM10T is not set -# CONFIG_ARM1136JF_S is not set -# CONFIG_ARM1176JZF_S is not set -# CONFIG_ARM1176JZ_S is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM720T is not set -# CONFIG_ARM7TDMI is not set -CONFIG_ARM920T=y -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM_CORTEX_M1 is not set -# CONFIG_ARM_CORTEX_M3 is not set -# CONFIG_ARM_EABI is not set -# CONFIG_ARM_IWMMXT is not set -CONFIG_ARM_OABI=y -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -# CONFIG_ARM_XSCALE is not set -# CONFIG_GENERIC_ARM is not set -TARGET_ARCH="arm" -TARGET_arm=y -# USE_BX is not set diff --git a/toolchain/uClibc/config-0.9.30.1/arm.gemini b/toolchain/uClibc/config-0.9.30.1/arm.gemini deleted file mode 100644 index 8043cf61b7..0000000000 --- a/toolchain/uClibc/config-0.9.30.1/arm.gemini +++ /dev/null @@ -1,26 +0,0 @@ -ARCH_ANY_ENDIAN=y -ARCH_LITTLE_ENDIAN=y -ARCH_WANTS_LITTLE_ENDIAN=y -# CONFIG_ARM10T is not set -# CONFIG_ARM1136JF_S is not set -# CONFIG_ARM1176JZF_S is not set -# CONFIG_ARM1176JZ_S is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM720T is not set -# CONFIG_ARM7TDMI is not set -CONFIG_ARM920T=y -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM_CORTEX_M1 is not set -# CONFIG_ARM_CORTEX_M3 is not set -# CONFIG_ARM_EABI is not set -# CONFIG_ARM_IWMMXT is not set -CONFIG_ARM_OABI=y -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -# CONFIG_ARM_XSCALE is not set -# CONFIG_GENERIC_ARM is not set -TARGET_ARCH="arm" -TARGET_arm=y -# USE_BX is not set diff --git a/toolchain/uClibc/config-0.9.30.2/arm.gemini b/toolchain/uClibc/config-0.9.30.2/arm.gemini deleted file mode 100644 index 8043cf61b7..0000000000 --- a/toolchain/uClibc/config-0.9.30.2/arm.gemini +++ /dev/null @@ -1,26 +0,0 @@ -ARCH_ANY_ENDIAN=y -ARCH_LITTLE_ENDIAN=y -ARCH_WANTS_LITTLE_ENDIAN=y -# CONFIG_ARM10T is not set -# CONFIG_ARM1136JF_S is not set -# CONFIG_ARM1176JZF_S is not set -# CONFIG_ARM1176JZ_S is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM720T is not set -# CONFIG_ARM7TDMI is not set -CONFIG_ARM920T=y -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM_CORTEX_M1 is not set -# CONFIG_ARM_CORTEX_M3 is not set -# CONFIG_ARM_EABI is not set -# CONFIG_ARM_IWMMXT is not set -CONFIG_ARM_OABI=y -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -# CONFIG_ARM_XSCALE is not set -# CONFIG_GENERIC_ARM is not set -TARGET_ARCH="arm" -TARGET_arm=y -# USE_BX is not set diff --git a/toolchain/uClibc/config-0.9.30.3/arm.gemini b/toolchain/uClibc/config-0.9.30.3/arm.gemini deleted file mode 100644 index 8043cf61b7..0000000000 --- a/toolchain/uClibc/config-0.9.30.3/arm.gemini +++ /dev/null @@ -1,26 +0,0 @@ -ARCH_ANY_ENDIAN=y -ARCH_LITTLE_ENDIAN=y -ARCH_WANTS_LITTLE_ENDIAN=y -# CONFIG_ARM10T is not set -# CONFIG_ARM1136JF_S is not set -# CONFIG_ARM1176JZF_S is not set -# CONFIG_ARM1176JZ_S is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM720T is not set -# CONFIG_ARM7TDMI is not set -CONFIG_ARM920T=y -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM_CORTEX_M1 is not set -# CONFIG_ARM_CORTEX_M3 is not set -# CONFIG_ARM_EABI is not set -# CONFIG_ARM_IWMMXT is not set -CONFIG_ARM_OABI=y -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -# CONFIG_ARM_XSCALE is not set -# CONFIG_GENERIC_ARM is not set -TARGET_ARCH="arm" -TARGET_arm=y -# USE_BX is not set -- 2.30.2