From 583e39e3d5149357c8070eb7cdd942e42ea44906 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Mon, 4 Jan 2021 22:52:20 +0900 Subject: [PATCH] kernel: drop empty kmod-ledtrig-* packages The following four led triggers are enabled in generic config. * kmod-ledtrig-default-on * kmod-ledtrig-heartbeat * kmod-ledtrig-netdev * kmod-ledtrig-timer Drop the packages and remove them from DEVICE_PACKAGES. There's no other package depending on them in this repo. Signed-off-by: Sungbo Eo --- package/kernel/linux/modules/leds.mk | 61 ------------------- target/linux/bcm47xx/Makefile | 3 +- target/linux/bcm53xx/Makefile | 2 +- target/linux/gemini/Makefile | 2 +- target/linux/lantiq/falcon/target.mk | 3 +- target/linux/mvebu/image/cortexa72.mk | 2 +- target/linux/mxs/profiles/01-duckbill.mk | 2 +- .../linux/mxs/profiles/02-olinuxino-maxi.mk | 2 +- .../linux/mxs/profiles/03-olinuxino-micro.mk | 2 +- target/linux/oxnas/Makefile | 2 +- target/linux/ramips/image/mt7620.mk | 3 +- target/linux/ramips/image/rt305x.mk | 21 +++---- target/linux/sunxi/image/cortexa7.mk | 17 +++--- target/linux/x86/image/geode.mk | 3 +- 14 files changed, 29 insertions(+), 96 deletions(-) diff --git a/package/kernel/linux/modules/leds.mk b/package/kernel/linux/modules/leds.mk index fe90c6b559..bc94e54ae1 100644 --- a/package/kernel/linux/modules/leds.mk +++ b/package/kernel/linux/modules/leds.mk @@ -38,21 +38,6 @@ endef $(eval $(call KernelPackage,ledtrig-activity)) -define KernelPackage/ledtrig-heartbeat - SUBMENU:=$(LEDS_MENU) - TITLE:=LED Heartbeat Trigger - KCONFIG:=CONFIG_LEDS_TRIGGER_HEARTBEAT - FILES:=$(LED_TRIGGER_DIR)/ledtrig-heartbeat.ko - AUTOLOAD:=$(call AutoLoad,50,ledtrig-heartbeat) -endef - -define KernelPackage/ledtrig-heartbeat/description - Kernel module that allows LEDs to blink like heart beat -endef - -$(eval $(call KernelPackage,ledtrig-heartbeat)) - - define KernelPackage/ledtrig-gpio SUBMENU:=$(LEDS_MENU) TITLE:=LED GPIO Trigger @@ -68,52 +53,6 @@ endef $(eval $(call KernelPackage,ledtrig-gpio)) -define KernelPackage/ledtrig-netdev - SUBMENU:=$(LEDS_MENU) - TITLE:=LED NETDEV Trigger - KCONFIG:=CONFIG_LEDS_TRIGGER_NETDEV - FILES:=$(LINUX_DIR)/drivers/leds/trigger/ledtrig-netdev.ko - AUTOLOAD:=$(call AutoLoad,50,ledtrig-netdev) -endef - -define KernelPackage/ledtrig-netdev/description - Kernel module to drive LEDs based on network activity -endef - -$(eval $(call KernelPackage,ledtrig-netdev)) - - -define KernelPackage/ledtrig-default-on - SUBMENU:=$(LEDS_MENU) - TITLE:=LED Default ON Trigger - KCONFIG:=CONFIG_LEDS_TRIGGER_DEFAULT_ON - FILES:=$(LED_TRIGGER_DIR)/ledtrig-default-on.ko - AUTOLOAD:=$(call AutoLoad,50,ledtrig-default-on,1) -endef - -define KernelPackage/ledtrig-default-on/description - Kernel module that allows LEDs to be initialised in the ON state -endef - -$(eval $(call KernelPackage,ledtrig-default-on)) - - -define KernelPackage/ledtrig-timer - SUBMENU:=$(LEDS_MENU) - TITLE:=LED Timer Trigger - KCONFIG:=CONFIG_LEDS_TRIGGER_TIMER - FILES:=$(LED_TRIGGER_DIR)/ledtrig-timer.ko - AUTOLOAD:=$(call AutoLoad,50,ledtrig-timer,1) -endef - -define KernelPackage/ledtrig-timer/description - Kernel module that allows LEDs to be controlled by a programmable timer - via sysfs -endef - -$(eval $(call KernelPackage,ledtrig-timer)) - - define KernelPackage/ledtrig-transient SUBMENU:=$(LEDS_MENU) TITLE:=LED Transient Trigger diff --git a/target/linux/bcm47xx/Makefile b/target/linux/bcm47xx/Makefile index bd0032a0e3..6be852919c 100644 --- a/target/linux/bcm47xx/Makefile +++ b/target/linux/bcm47xx/Makefile @@ -22,7 +22,6 @@ endef include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += swconfig nvram otrx \ - kmod-leds-gpio kmod-gpio-button-hotplug \ - kmod-ledtrig-default-on kmod-ledtrig-timer kmod-ledtrig-netdev + kmod-leds-gpio kmod-gpio-button-hotplug $(eval $(call BuildTarget)) diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile index f980f8a8fb..ac118c0153 100644 --- a/target/linux/bcm53xx/Makefile +++ b/target/linux/bcm53xx/Makefile @@ -27,6 +27,6 @@ KERNELNAME:=zImage dtbs DEFAULT_PACKAGES += swconfig nvram \ osafeloader oseama otrx \ kmod-gpio-button-hotplug \ - kmod-leds-gpio kmod-ledtrig-default-on kmod-ledtrig-timer + kmod-leds-gpio $(eval $(call BuildTarget)) diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index 0835adc41d..d30b8d3ac8 100644 --- a/target/linux/gemini/Makefile +++ b/target/linux/gemini/Makefile @@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ kmod-usb-fotg210 \ kmod-usb-ledtrig-usbport \ - kmod-leds-gpio kmod-ledtrig-heartbeat \ + kmod-leds-gpio \ kmod-gpio-button-hotplug $(eval $(call BuildTarget)) diff --git a/target/linux/lantiq/falcon/target.mk b/target/linux/lantiq/falcon/target.mk index c07c8c2d82..4051b5ada4 100644 --- a/target/linux/lantiq/falcon/target.mk +++ b/target/linux/lantiq/falcon/target.mk @@ -5,8 +5,7 @@ FEATURES+=nand source-only CPU_TYPE:=24kc DEFAULT_PACKAGES+= kmod-leds-gpio \ - kmod-gpio-button-hotplug \ - kmod-ledtrig-heartbeat + kmod-gpio-button-hotplug define Target/Description Lantiq Falcon diff --git a/target/linux/mvebu/image/cortexa72.mk b/target/linux/mvebu/image/cortexa72.mk index 8bd4581766..1440c07a0b 100644 --- a/target/linux/mvebu/image/cortexa72.mk +++ b/target/linux/mvebu/image/cortexa72.mk @@ -38,7 +38,7 @@ define Device/marvell_macchiatobin-singleshot DEVICE_ALT0_VENDOR := SolidRun DEVICE_ALT0_MODEL := Armada 8040 Community Board DEVICE_ALT0_VARIANT := Single Shot - DEVICE_PACKAGES += kmod-i2c-mux-pca954x kmod-ledtrig-heartbeat + DEVICE_PACKAGES += kmod-i2c-mux-pca954x DEVICE_DTS := armada-8040-mcbin-singleshot SUPPORTED_DEVICES := marvell,armada8040-mcbin-singleshot endef diff --git a/target/linux/mxs/profiles/01-duckbill.mk b/target/linux/mxs/profiles/01-duckbill.mk index cab379a213..5224c3cfed 100644 --- a/target/linux/mxs/profiles/01-duckbill.mk +++ b/target/linux/mxs/profiles/01-duckbill.mk @@ -10,7 +10,7 @@ define Profile/duckbill FEATURES+=usbgadget PACKAGES+= \ -dnsmasq -firewall -ppp -ip6tables -iptables -6relayd -mtd uboot-envtools \ - kmod-leds-gpio kmod-ledtrig-timer -kmod-ipt-nathelper uboot-mxs-duckbill + kmod-leds-gpio -kmod-ipt-nathelper uboot-mxs-duckbill endef define Profile/duckbill/Description diff --git a/target/linux/mxs/profiles/02-olinuxino-maxi.mk b/target/linux/mxs/profiles/02-olinuxino-maxi.mk index e3d1c3b3c0..5c8ab287dd 100644 --- a/target/linux/mxs/profiles/02-olinuxino-maxi.mk +++ b/target/linux/mxs/profiles/02-olinuxino-maxi.mk @@ -9,7 +9,7 @@ define Profile/olinuxino-maxi NAME:=Olimex OLinuXino Maxi/Mini boards PACKAGES += imx-bootlets uboot-mxs-mx23_olinuxino \ kmod-usb-net-smsc95xx kmod-gpio-mcp23s08 \ - kmod-leds-gpio kmod-ledtrig-heartbeat kmod-sound-core + kmod-leds-gpio kmod-sound-core endef define Profile/olinuxino-maxi/Description diff --git a/target/linux/mxs/profiles/03-olinuxino-micro.mk b/target/linux/mxs/profiles/03-olinuxino-micro.mk index 535f6b53f1..62de50151d 100644 --- a/target/linux/mxs/profiles/03-olinuxino-micro.mk +++ b/target/linux/mxs/profiles/03-olinuxino-micro.mk @@ -8,7 +8,7 @@ define Profile/olinuxino-micro NAME:=Olimex OLinuXino Micro/Nano boards PACKAGES += imx-bootlets uboot-mxs-mx23_olinuxino \ - kmod-gpio-mcp23s08 kmod-leds-gpio kmod-ledtrig-heartbeat + kmod-gpio-mcp23s08 kmod-leds-gpio endef define Profile/olinuxino-micro/Description diff --git a/target/linux/oxnas/Makefile b/target/linux/oxnas/Makefile index 750eddbcbb..f503c2819f 100644 --- a/target/linux/oxnas/Makefile +++ b/target/linux/oxnas/Makefile @@ -13,7 +13,7 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ kmod-button-hotplug kmod-input-gpio-keys-polled \ - kmod-ledtrig-timer kmod-leds-gpio uboot-envtools + kmod-leds-gpio uboot-envtools KERNELNAME:=zImage dtbs diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index dfdb5f28d3..2d0050f986 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -1175,8 +1175,7 @@ define Device/zbtlink_zbt-we1026-h-32m DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1026-H DEVICE_VARIANT := 32M - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \ - kmod-ledtrig-netdev + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 endef TARGET_DEVICES += zbtlink_zbt-we1026-h-32m diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk index cf24be0f1b..7730b5aaa9 100644 --- a/target/linux/ramips/image/rt305x.mk +++ b/target/linux/ramips/image/rt305x.mk @@ -413,7 +413,6 @@ define Device/dlink_dir-610-a1 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-610 DEVICE_VARIANT := A1 - DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer SUPPORTED_DEVICES += dir-610-a1 DEFAULT := n endef @@ -554,7 +553,7 @@ define Device/hame_mpr-a1 DEVICE_VENDOR := HAME DEVICE_MODEL := MPR DEVICE_VARIANT := A1 - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 SUPPORTED_DEVICES += mpr-a1 DEFAULT := n endef @@ -567,7 +566,7 @@ define Device/hame_mpr-a2 DEVICE_VENDOR := HAME DEVICE_MODEL := MPR DEVICE_VARIANT := A2 - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 SUPPORTED_DEVICES += mpr-a2 endef TARGET_DEVICES += hame_mpr-a2 @@ -631,8 +630,8 @@ define Device/intenso_memory2move UIMAGE_NAME:= Linux Kernel Image DEVICE_VENDOR := Intenso DEVICE_MODEL := Memory 2 Move - DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer kmod-usb2 \ - kmod-usb-storage kmod-scsi-core kmod-fs-ext4 kmod-fs-vfat block-mount + DEVICE_PACKAGES := kmod-usb2 kmod-usb-storage kmod-scsi-core kmod-fs-ext4 \ + kmod-fs-vfat block-mount SUPPORTED_DEVICES += m2m endef TARGET_DEVICES += intenso_memory2move @@ -868,7 +867,7 @@ define Device/poray_m3 poray-header -B M3 -F 4M DEVICE_VENDOR := Poray DEVICE_MODEL := M3 - DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer + DEVICE_PACKAGES := kmod-usb2 SUPPORTED_DEVICES += m3 DEFAULT := n endef @@ -883,7 +882,7 @@ define Device/poray_m4-4m DEVICE_VENDOR := Poray DEVICE_MODEL := M4 DEVICE_VARIANT := 4M - DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer + DEVICE_PACKAGES := kmod-usb2 SUPPORTED_DEVICES += m4-4M DEFAULT := n endef @@ -898,7 +897,7 @@ define Device/poray_m4-8m DEVICE_VENDOR := Poray DEVICE_MODEL := M4 DEVICE_VARIANT := 8M - DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer + DEVICE_PACKAGES := kmod-usb2 SUPPORTED_DEVICES += m4-8M endef TARGET_DEVICES += poray_m4-8m @@ -911,7 +910,7 @@ define Device/poray_x5 poray-header -B X5 -F 8M DEVICE_VENDOR := Poray DEVICE_MODEL := X5/X6 - DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer + DEVICE_PACKAGES := kmod-usb2 SUPPORTED_DEVICES += x5 endef TARGET_DEVICES += poray_x5 @@ -924,7 +923,7 @@ define Device/poray_x8 poray-header -B X8 -F 8M DEVICE_VENDOR := Poray DEVICE_MODEL := X8 - DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer + DEVICE_PACKAGES := kmod-usb2 SUPPORTED_DEVICES += x8 endef TARGET_DEVICES += poray_x8 @@ -1179,7 +1178,7 @@ define Device/zorlik_zl5900v2 IMAGE_SIZE := 7872k DEVICE_VENDOR := Zorlik DEVICE_MODEL := ZL5900V2 - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 endef TARGET_DEVICES += zorlik_zl5900v2 diff --git a/target/linux/sunxi/image/cortexa7.mk b/target/linux/sunxi/image/cortexa7.mk index a87817037d..d491dbc338 100644 --- a/target/linux/sunxi/image/cortexa7.mk +++ b/target/linux/sunxi/image/cortexa7.mk @@ -25,8 +25,8 @@ TARGET_DEVICES += cubietech_cubietruck define Device/friendlyarm_nanopi-m1-plus DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi M1 Plus - DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ - kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic-wolfssl + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-brcmfmac \ + brcmfmac-firmware-43430-sdio wpad-basic-wolfssl SOC := sun8i-h3 endef TARGET_DEVICES += friendlyarm_nanopi-m1-plus @@ -41,8 +41,8 @@ TARGET_DEVICES += friendlyarm_nanopi-neo define Device/friendlyarm_nanopi-neo-air DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi NEO Air - DEVICE_PACKAGES := kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ - kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic-wolfssl + DEVICE_PACKAGES := kmod-rtc-sunxi kmod-leds-gpio kmod-brcmfmac \ + brcmfmac-firmware-43430-sdio wpad-basic-wolfssl SOC := sun8i-h3 endef TARGET_DEVICES += friendlyarm_nanopi-neo-air @@ -50,9 +50,8 @@ TARGET_DEVICES += friendlyarm_nanopi-neo-air define Device/friendlyarm_nanopi-r1 DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi R1 - DEVICE_PACKAGES := kmod-rtc-sunxi kmod-usb-net-rtl8152 \ - kmod-brcmfmac kmod-leds-gpio kmod-ledtrig-heartbeat wpad-basic-wolfssl \ - brcmfmac-firmware-43430-sdio + DEVICE_PACKAGES := kmod-rtc-sunxi kmod-usb-net-rtl8152 kmod-leds-gpio \ + kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic-wolfssl SOC := sun8i-h3 endef TARGET_DEVICES += friendlyarm_nanopi-r1 @@ -152,8 +151,8 @@ TARGET_DEVICES += olimex_a20-olinuxino-micro define Device/sinovoip_bananapi-m2-plus DEVICE_VENDOR := Sinovoip DEVICE_MODEL := Banana Pi M2+ - DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ - kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic-wolfssl + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-brcmfmac \ + brcmfmac-firmware-43430a0-sdio wpad-basic-wolfssl SOC := sun8i-h3 endef TARGET_DEVICES += sinovoip_bananapi-m2-plus diff --git a/target/linux/x86/image/geode.mk b/target/linux/x86/image/geode.mk index 4ebb14888a..2ed2245f7d 100644 --- a/target/linux/x86/image/geode.mk +++ b/target/linux/x86/image/geode.mk @@ -1,7 +1,6 @@ define Device/generic DEVICE_TITLE := Generic x86/Geode - DEVICE_PACKAGES += kmod-crypto-cbc kmod-crypto-hw-geode kmod-ledtrig-gpio \ - kmod-ledtrig-heartbeat kmod-ledtrig-netdev + DEVICE_PACKAGES += kmod-crypto-cbc kmod-crypto-hw-geode kmod-ledtrig-gpio GRUB2_VARIANT := legacy endef TARGET_DEVICES += generic -- 2.30.2