From cbd5a0ae3189e3e5a18073fc87f9fdd4a6188a9a Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Wed, 23 Nov 2011 21:44:18 +0000 Subject: [PATCH] cleanup: remove refs to unsupported "etrax" target SVN-Revision: 29300 --- package/hostapd/Makefile | 2 +- package/iw/Makefile | 2 +- package/kernel/modules/block.mk | 2 +- package/kernel/modules/i2c.mk | 2 +- package/kernel/modules/usb.mk | 15 --------------- package/madwifi/Makefile | 2 +- toolchain/gcc/Config.in | 1 - toolchain/gcc/Config.version | 1 - 8 files changed, 5 insertions(+), 22 deletions(-) diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 01c9ff66ad..452f16dc5d 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -81,7 +81,7 @@ ifneq ($(LOCAL_TYPE),hostapd) CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch) endif -DRV_DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny @(!(TARGET_avr32||TARGET_etrax)||BROKEN) +DRV_DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny @(!(TARGET_avr32)||BROKEN) define Package/hostapd/Default SECTION:=net diff --git a/package/iw/Makefile b/package/iw/Makefile index 2b714f8f98..152d78b7d0 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -23,7 +23,7 @@ define Package/iw CATEGORY:=Network TITLE:=cfg80211 interface configuration utility URL:=http://wireless.kernel.org/en/users/Documentation/iw - DEPENDS:= +libnl-tiny @(!(TARGET_avr32||TARGET_etrax)||BROKEN) + DEPENDS:= +libnl-tiny @(!(TARGET_avr32)||BROKEN) endef define Build/Configure diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 7f3686d35e..426f3c7102 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -10,7 +10,7 @@ BLOCK_MENU:=Block Devices define KernelPackage/ata-core SUBMENU:=$(BLOCK_MENU) TITLE:=Serial and Parallel ATA support - DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax||!TARGET_x86) + DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_x86) KCONFIG:=CONFIG_ATA FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,21,libata,1) diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index 86f1b3bd9b..ed626fcf01 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -27,7 +27,7 @@ I2C_CORE_MODULES:= \ define KernelPackage/i2c-core $(call i2c_defaults,$(I2C_CORE_MODULES),51) TITLE:=I2C support - DEPENDS:=@LINUX_2_6 @!TARGET_etrax + DEPENDS:=@LINUX_2_6 endef define KernelPackage/i2c-core/description diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 18f18cf037..17ed761d7b 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -128,21 +128,6 @@ endef $(eval $(call KernelPackage,usb-adm5120)) -define KernelPackage/usb-etrax -$(call KernelPackage/usb/Depends,@TARGET_etrax) - TITLE:=Support for the ETRAX USB host controller - KCONFIG:=CONFIG_ETRAX_USB_HOST \ - CONFIG_ETRAX_USB_HOST_PORT1=y CONFIG_ETRAX_USB_HOST_PORT2=y - FILES:=$(LINUX_DIR)/drivers/usb/host/hc-crisv10.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,50,hc-crisv10,1) -endef - -define KernelPackage/usb-etrax/description - Kernel support for the ETRAX USB host controller -endef - -$(eval $(call KernelPackage,usb-etrax)) - define KernelPackage/usb-octeon $(call KernelPackage/usb/Depends,@TARGET_octeon) TITLE:=Support for the Octeon USB OTG controller diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 18fef0ab1c..3c23245db1 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -162,7 +162,7 @@ define KernelPackage/madwifi TITLE:=Driver for Atheros wireless chipsets URL:=http://madwifi-project.org/ MAINTAINER:=Felix Fietkau - DEPENDS:=+wireless-tools @LINUX_2_6 @PCI_SUPPORT @(!(TARGET_avr32||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN) + DEPENDS:=+wireless-tools @LINUX_2_6 @PCI_SUPPORT @(!(TARGET_avr32||TARGET_cobalt||TARGET_ep93xx||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN) FILES:=$(MADWIFI_FILES) AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD)) MENU:=1 diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index b183e3618a..da3745de27 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -5,7 +5,6 @@ choice default GCC_VERSION_3_4_6 if LINUX_2_4 default GCC_VERSION_4_2_4 if avr32 default GCC_VERSION_4_3_3 if powerpc64 - default GCC_VERSION_4_3_3 if TARGET_etrax 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 diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index 4e7fe8790c..3cfc60ae20 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -66,7 +66,6 @@ if !LINUX_2_4 config GCC_VERSION_4_3_3 default y if powerpc64 - default y if TARGET_etrax default y if TARGET_coldfire config GCC_VERSION_4_3_4 -- 2.30.2