aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-05-21 19:09:59 +0200
committerFelix Fietkau <nbd@nbd.name>2016-05-21 19:57:06 +0200
commitf849c2c83247340d623fdb549e2b75f4c1feea62 (patch)
tree2d55138ecd6dd651e2343c1642e80c29522255b4 /package/kernel/linux
parenta5a3b59bf54c72c1eea7745d7a83dfc298d4ae1e (diff)
downloadupstream-f849c2c83247340d623fdb549e2b75f4c1feea62.tar.gz
upstream-f849c2c83247340d623fdb549e2b75f4c1feea62.tar.bz2
upstream-f849c2c83247340d623fdb549e2b75f4c1feea62.zip
mvebu: enable core drivers in the kernel config instead of packaging them
Simplify profile package selection Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/linux')
-rw-r--r--package/kernel/linux/modules/block.mk18
-rw-r--r--package/kernel/linux/modules/crypto.mk2
-rw-r--r--package/kernel/linux/modules/i2c.mk2
-rw-r--r--package/kernel/linux/modules/leds.mk16
-rw-r--r--package/kernel/linux/modules/other.mk40
5 files changed, 6 insertions, 72 deletions
diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk
index 0c8d9b1fe9..d7f5ca4762 100644
--- a/package/kernel/linux/modules/block.mk
+++ b/package/kernel/linux/modules/block.mk
@@ -65,7 +65,7 @@ define KernelPackage/ata-ahci-platform
$(LINUX_DIR)/drivers/ata/ahci_platform.ko \
$(LINUX_DIR)/drivers/ata/libahci_platform.ko
AUTOLOAD:=$(call AutoLoad,40,libahci libahci_platform ahci_platform,1)
- $(call AddDepends/ata,@TARGET_ipq806x||TARGET_mvebu||TARGET_sunxi)
+ $(call AddDepends/ata,@TARGET_ipq806x||TARGET_sunxi)
endef
define KernelPackage/ata-ahci-platform/description
@@ -124,22 +124,6 @@ endef
$(eval $(call KernelPackage,ata-marvell-sata))
-define KernelPackage/ata-mvebu-ahci
- TITLE:=Marvell EBU AHCI support
- DEPENDS:=@TARGET_mvebu +kmod-ata-ahci-platform
- KCONFIG:=CONFIG_AHCI_MVEBU
- FILES:=$(LINUX_DIR)/drivers/ata/ahci_mvebu.ko
- AUTOLOAD:=$(call AutoLoad,41,ahci_mvebu,1)
- $(call AddDepends/ata)
-endef
-
-define KernelPackage/ata-mvebu-ahci/description
- AHCI support for Marvell EBU SoCs
-endef
-
-$(eval $(call KernelPackage,ata-mvebu-ahci))
-
-
define KernelPackage/ata-nvidia-sata
TITLE:=Nvidia Serial ATA support
KCONFIG:=CONFIG_SATA_NV
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index e144d64dfb..bea05488ab 100644
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -666,7 +666,7 @@ $(eval $(call KernelPackage,crypto-xts))
define KernelPackage/crypto-mv-cesa
TITLE:=Marvell crypto engine
- DEPENDS:=+kmod-crypto-manager @TARGET_kirkwood||TARGET_orion||TARGET_mvebu
+ DEPENDS:=+kmod-crypto-manager @TARGET_kirkwood||TARGET_orion
KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA
FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko
AUTOLOAD:=$(call AutoLoad,09,mv_cesa)
diff --git a/package/kernel/linux/modules/i2c.mk b/package/kernel/linux/modules/i2c.mk
index d4effee13d..e1c65d493e 100644
--- a/package/kernel/linux/modules/i2c.mk
+++ b/package/kernel/linux/modules/i2c.mk
@@ -140,7 +140,7 @@ I2C_MV64XXX_MODULES:=\
define KernelPackage/i2c-mv64xxx
$(call i2c_defaults,$(I2C_MV64XXX_MODULES),59)
TITLE:=Orion Platform I2C interface support
- DEPENDS:=@TARGET_kirkwood||TARGET_orion||TARGET_mvebu +kmod-i2c-core
+ DEPENDS:=@TARGET_kirkwood||TARGET_orion +kmod-i2c-core
endef
define KernelPackage/i2c-mv64xxx/description
diff --git a/package/kernel/linux/modules/leds.mk b/package/kernel/linux/modules/leds.mk
index c4261d31ac..aea62902ac 100644
--- a/package/kernel/linux/modules/leds.mk
+++ b/package/kernel/linux/modules/leds.mk
@@ -197,19 +197,3 @@ define KernelPackage/leds-pca963x/description
endef
$(eval $(call KernelPackage,leds-pca963x))
-
-
-define KernelPackage/leds-tlc591xx
- SUBMENU:=$(LEDS_MENU)
- TITLE:=TLC591xx LED support
- DEPENDS:=@TARGET_mvebu +kmod-i2c-core +kmod-regmap
- KCONFIG:=CONFIG_LEDS_TLC591XX
- FILES:=$(LINUX_DIR)/drivers/leds/leds-tlc591xx.ko
- AUTOLOAD:=$(call AutoLoad,60,leds-tlc591xx,1)
-endef
-
-define KernelPackage/leds-tlc591xx/description
- Kernel module for LEDs on TLC591xx
-endef
-
-$(eval $(call KernelPackage,leds-tlc591xx))
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 98e77bfbbd..98b7f54dcf 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -501,7 +501,7 @@ $(eval $(call KernelPackage,wdt-omap))
define KernelPackage/wdt-orion
SUBMENU:=$(OTHER_MENU)
TITLE:=Marvell Orion Watchdog timer
- DEPENDS:=@TARGET_orion||TARGET_kirkwood||TARGET_mvebu
+ DEPENDS:=@TARGET_orion||TARGET_kirkwood
KCONFIG:=CONFIG_ORION_WATCHDOG
FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/orion_wdt.ko
AUTOLOAD:=$(call AutoLoad,50,orion_wdt,1)
@@ -585,7 +585,7 @@ $(eval $(call KernelPackage,rtc-isl1208))
define KernelPackage/rtc-marvell
SUBMENU:=$(OTHER_MENU)
TITLE:=Marvell SoC built-in RTC support
- DEPENDS:=@RTC_SUPPORT @TARGET_kirkwood||TARGET_orion||TARGET_mvebu
+ DEPENDS:=@RTC_SUPPORT @TARGET_kirkwood||TARGET_orion
KCONFIG:=CONFIG_RTC_DRV_MV \
CONFIG_RTC_CLASS=y
FILES:=$(LINUX_DIR)/drivers/rtc/rtc-mv.ko
@@ -599,23 +599,6 @@ endef
$(eval $(call KernelPackage,rtc-marvell))
-define KernelPackage/rtc-armada38x
- SUBMENU:=$(OTHER_MENU)
- TITLE:=Marvell Armada 38x SoC built-in RTC support
- DEPENDS:=@RTC_SUPPORT @TARGET_mvebu
- KCONFIG:=CONFIG_RTC_DRV_ARMADA38X \
- CONFIG_RTC_CLASS=y
- FILES:=$(LINUX_DIR)/drivers/rtc/rtc-armada38x.ko
- AUTOLOAD:=$(call AutoProbe,rtc-armada38x)
-endef
-
-define KernelPackage/rtc-armada38x/description
- Kernel module for Marvell Armada 38x SoC built-in RTC.
-endef
-
-$(eval $(call KernelPackage,rtc-armada38x))
-
-
define KernelPackage/rtc-pcf8563
SUBMENU:=$(OTHER_MENU)
TITLE:=Philips PCF8563/Epson RTC8564 RTC support
@@ -794,7 +777,7 @@ $(eval $(call KernelPackage,zram))
define KernelPackage/mvsdio
SUBMENU:=$(OTHER_MENU)
TITLE:=Marvell SDIO support
- DEPENDS:=@TARGET_orion||TARGET_kirkwood||TARGET_mvebu +kmod-mmc
+ DEPENDS:=@TARGET_orion||TARGET_kirkwood +kmod-mmc
KCONFIG:=CONFIG_MMC_MVSDIO
FILES:=$(LINUX_DIR)/drivers/mmc/host/mvsdio.ko
AUTOLOAD:=$(call AutoProbe,mvsdio)
@@ -922,23 +905,6 @@ endef
$(eval $(call KernelPackage,thermal))
-define KernelPackage/thermal-armada
- SUBMENU:=$(OTHER_MENU)
- TITLE:=Armada 370/XP thermal management
- DEPENDS:=@TARGET_mvebu +kmod-thermal
- KCONFIG:=CONFIG_ARMADA_THERMAL
- FILES:=$(LINUX_DIR)/drivers/thermal/armada_thermal.ko
- AUTOLOAD:=$(call AutoProbe,armada_thermal)
-endef
-
-define KernelPackage/thermal-armada/description
- Enable this module if you want to have support for thermal management
- controller present in Armada 370 and Armada XP SoC.
-endef
-
-$(eval $(call KernelPackage,thermal-armada))
-
-
define KernelPackage/thermal-imx
SUBMENU:=$(OTHER_MENU)
TITLE:=Temperature sensor driver for Freescale i.MX SoCs