From edba86d7d2cd642a213ba55212f55036c743a0d6 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 2 Jan 2013 11:28:11 +0000 Subject: [PATCH 1/1] Remove remaining etrax references git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34968 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/block.mk | 2 +- package/kernel/modules/i2c.mk | 1 - package/kernel/modules/usb.mk | 2 +- package/kernel/modules/video.mk | 2 +- package/network/services/hostapd/Makefile | 2 +- package/network/utils/iw/Makefile | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index ba2443957a..373230b9a6 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -25,7 +25,7 @@ $(eval $(call KernelPackage,aoe)) define KernelPackage/ata-core SUBMENU:=$(BLOCK_MENU) TITLE:=Serial and Parallel ATA support - DEPENDS:=@PCI_SUPPORT +kmod-scsi-core @!TARGET_etrax + DEPENDS:=@PCI_SUPPORT +kmod-scsi-core KCONFIG:=CONFIG_ATA FILES:=$(LINUX_DIR)/drivers/ata/libata.ko AUTOLOAD:=$(call AutoLoad,21,libata,1) diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index 49d8250777..0a4982010c 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -27,7 +27,6 @@ I2C_CORE_MODULES:= \ define KernelPackage/i2c-core $(call i2c_defaults,$(I2C_CORE_MODULES),51) TITLE:=I2C support - DEPENDS:=@!TARGET_etrax endef define KernelPackage/i2c-core/description diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 459920326a..5947e88174 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -32,7 +32,7 @@ $(eval $(call KernelPackage,usb-core)) define AddDepends/usb SUBMENU:=$(USB_MENU) - DEPENDS+=+!TARGET_etrax:kmod-usb-core $(1) + DEPENDS+=+kmod-usb-core $(1) endef diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index ae6012aeb2..e652e8a4f0 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -82,7 +82,7 @@ $(eval $(call KernelPackage,fb-cfb-imgblt)) define KernelPackage/video-core SUBMENU:=$(VIDEO_MENU) TITLE=Video4Linux support - DEPENDS:=@PCI_SUPPORT||USB_SUPPORT +!TARGET_etrax:kmod-i2c-core + DEPENDS:=@PCI_SUPPORT||USB_SUPPORT KCONFIG:= \ CONFIG_MEDIA_SUPPORT=m \ CONFIG_MEDIA_CAMERA_SUPPORT=y \ diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index 3f8474c627..44b6684416 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -86,7 +86,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/network/utils/iw/Makefile b/package/network/utils/iw/Makefile index b63a61cecc..91167d8b3b 100644 --- a/package/network/utils/iw/Makefile +++ b/package/network/utils/iw/Makefile @@ -24,7 +24,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 -- 2.11.0