From: Nicolas Thill Date: Sat, 24 Apr 2010 14:08:49 +0000 (+0000) Subject: package/kernel: use common gpio- & wdt- prefixes for GPIO and watchdog module names X-Git-Tag: reboot~20094 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=37b02afe6a1c79d580d72d4d660ca27ddf237b0a;p=openwrt%2Fstaging%2Fchunkeey.git package/kernel: use common gpio- & wdt- prefixes for GPIO and watchdog module names SVN-Revision: 21137 --- diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 0b6d3fa1ea..56b9da71e5 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -393,7 +393,7 @@ endef $(eval $(call KernelPackage,gpio-dev)) -define KernelPackage/nsc-gpio +define KernelPackage/gpio-nsc SUBMENU:=$(OTHER_MENU) TITLE:=Natsemi GPIO support DEPENDS:=@TARGET_x86 @@ -409,7 +409,7 @@ endef $(eval $(call KernelPackage,nsc-gpio)) -define KernelPackage/scx200-gpio +define KernelPackage/gpio-scx200 SUBMENU:=$(OTHER_MENU) TITLE:=Natsemi SCX200 GPIO support DEPENDS:=@TARGET_x86 +kmod-nsc-gpio @@ -425,7 +425,7 @@ endef $(eval $(call KernelPackage,scx200-gpio)) -define KernelPackage/scx200-wdt +define KernelPackage/wdt-scx200 SUBMENU:=$(OTHER_MENU) TITLE:=Natsemi SCX200 Watchdog support DEPENDS:=@TARGET_x86 @@ -441,7 +441,7 @@ endef $(eval $(call KernelPackage,scx200-wdt)) -define KernelPackage/sc520-wdt +define KernelPackage/wdt-sc520 SUBMENU:=$(OTHER_MENU) TITLE:=Natsemi SC520 Watchdog support DEPENDS:=@TARGET_x86 @@ -591,7 +591,7 @@ endef $(eval $(call KernelPackage,mmc-atmelmci,1)) -define KernelPackage/cs5535-gpio +define KernelPackage/gpio-cs5535 SUBMENU:=$(OTHER_MENU) TITLE:=AMD CS5535/CS5536 GPIO driver DEPENDS:=@TARGET_x86 @@ -653,7 +653,7 @@ endef $(eval $(call KernelPackage,rfkill)) -define KernelPackage/geodewdt +define KernelPackage/wdt-geode SUBMENU:=$(OTHER_MENU) TITLE:=Geode/LX Watchdog timer DEPENDS:=@TARGET_x86 @LINUX_2_6 @@ -668,7 +668,7 @@ endef $(eval $(call KernelPackage,geodewdt)) -define KernelPackage/pc8736x-gpio +define KernelPackage/gpio-pc8736x SUBMENU:=$(OTHER_MENU) TITLE:=PC8736x GPIO support DEPENDS:=@TARGET_x86 diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 23eb5280dc..326ecfb033 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -11,7 +11,7 @@ BOARD:=ramips BOARDNAME:=Ralink RT288x/RT305x SUBTARGETS:=rt288x rt305x CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time -FEATURES:=squashfs broken +FEATURES:=squashfs LINUX_VERSION:=2.6.32.10 diff --git a/target/linux/x86/generic/profiles/Soekris45xx.mk b/target/linux/x86/generic/profiles/Soekris45xx.mk index a3255178be..d1d88c6fca 100644 --- a/target/linux/x86/generic/profiles/Soekris45xx.mk +++ b/target/linux/x86/generic/profiles/Soekris45xx.mk @@ -7,7 +7,7 @@ define Profile/Soekris45xx NAME:=Soekris Net45xx - PACKAGES:=kmod-natsemi kmod-leds-net48xx kmod-sc520-wdt + PACKAGES:=kmod-natsemi kmod-leds-net48xx kmod-wdt-sc520 endef define Profile/Soekris45xx/Description diff --git a/target/linux/x86/generic/profiles/Soekris48xx.mk b/target/linux/x86/generic/profiles/Soekris48xx.mk index e4d17fe520..66bafbfe47 100644 --- a/target/linux/x86/generic/profiles/Soekris48xx.mk +++ b/target/linux/x86/generic/profiles/Soekris48xx.mk @@ -7,7 +7,7 @@ define Profile/Soekris48xx NAME:=Soekris Net48xx - PACKAGES:=kmod-i2c-scx200 kmod-natsemi kmod-leds-net48xx kmod-scx200-gpio kmod-scx200-wdt kmod-hwmon-pc87360 + PACKAGES:=kmod-i2c-scx200 kmod-natsemi kmod-leds-net48xx kmod-gpio-scx200 kmod-wdt-scx200 kmod-hwmon-pc87360 endef define Profile/Soekris48xx/Description diff --git a/target/linux/x86/generic/profiles/Wrap.mk b/target/linux/x86/generic/profiles/Wrap.mk index 4a21f03810..62532ac828 100644 --- a/target/linux/x86/generic/profiles/Wrap.mk +++ b/target/linux/x86/generic/profiles/Wrap.mk @@ -7,7 +7,7 @@ define Profile/Wrap NAME:=PCEngines WRAP - PACKAGES:=kmod-i2c-scx200 kmod-natsemi kmod-leds-wrap kmod-scx200-gpio kmod-scx200-wdt kmod-hwmon-pc87360 + PACKAGES:=kmod-i2c-scx200 kmod-natsemi kmod-leds-wrap kmod-gpio-scx200 kmod-wdt-scx200 kmod-hwmon-pc87360 endef define Profile/Wrap/Description diff --git a/target/linux/x86/net5501/target.mk b/target/linux/x86/net5501/target.mk index be4cefe680..0e45a34e37 100644 --- a/target/linux/x86/net5501/target.mk +++ b/target/linux/x86/net5501/target.mk @@ -1,7 +1,7 @@ BOARDNAME:=Soekris net5501 DEFAULT_PACKAGES += kmod-ata-via-sata kmod-crypto-hw-geode \ - kmod-cs5535-gpio kmod-nsc-gpio kmod-pc8736x-gpio \ - kmod-geodewdt kmod-hwmon-core kmod-hwmon-pc87360 \ + kmod-gpio-cs5535 kmod-gpio-nsc kmod-gpio-pc8736x \ + kmod-wdt-geode kmod-hwmon-core kmod-hwmon-pc87360 \ kmod-via-rhine \ kmod-i2c-core kmod-i2c-gpio \ kmod-i2c-algo-bit kmod-i2c-algo-pca kmod-i2c-algo-pcf \