diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-05-04 07:00:06 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-05-04 07:07:18 +0200 |
| commit | be40d0a144937a788fa8902e3335a25586acaa95 (patch) | |
| tree | 8102c51648efa303a8779dffc0423af4e6c1785d /target/linux/sunxi/modules.mk | |
| parent | 414b65db8583b02cffa1addde57ce1b37f163aa5 (diff) | |
| download | upstream-be40d0a144937a788fa8902e3335a25586acaa95.tar.gz upstream-be40d0a144937a788fa8902e3335a25586acaa95.tar.bz2 upstream-be40d0a144937a788fa8902e3335a25586acaa95.zip | |
sunxi: clean up modules definitions
Module definitions for kmod-wdt-sunxi and kmod-eeprom-sunxi are removed
(wdt-sunxi was builtin anyways; nvmem-sunxi, which is the new name of
eeprom-sunxi is changed to builtin). As kmod-eeprom-sunxi was specified
in DEFAULT_PACKAGES, but not available on kernel 4.4, it was breaking the
image builder.
Support for kmod-sunxi-ir is added for kernel 4.4 (it is unclear why it
was disable before, it builds fine with with kernel 4.4).
Condtionals only relevant for pre-4.4 kernels are removed from modules.mk,
as sunxi does't support older kernels anymore.
Fixes FS#755.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'target/linux/sunxi/modules.mk')
| -rw-r--r-- | target/linux/sunxi/modules.mk | 46 |
1 files changed, 3 insertions, 43 deletions
diff --git a/target/linux/sunxi/modules.mk b/target/linux/sunxi/modules.mk index 6f4991798d..99b82a3b5f 100644 --- a/target/linux/sunxi/modules.mk +++ b/target/linux/sunxi/modules.mk @@ -25,7 +25,7 @@ $(eval $(call KernelPackage,rtc-sunxi)) define KernelPackage/sunxi-ir SUBMENU:=$(OTHER_MENU) TITLE:=Sunxi SoC built-in IR support (A20) - DEPENDS:=@TARGET_sunxi @!LINUX_4_4 +kmod-input-core + DEPENDS:=@TARGET_sunxi +kmod-input-core $(call AddDepends/rtc) KCONFIG:= \ CONFIG_MEDIA_SUPPORT=y \ @@ -42,22 +42,6 @@ endef $(eval $(call KernelPackage,sunxi-ir)) -define KernelPackage/eeprom-sunxi - SUBMENU:=$(OTHER_MENU) - TITLE:=AllWinner Security ID fuse support - DEPENDS:=@TARGET_sunxi @!LINUX_4_4 - KCONFIG:= \ - CONFIG_EEPROM_SUNXI_SID - FILES:=$(LINUX_DIR)/drivers/misc/eeprom/sunxi_sid.ko - AUTOLOAD:=$(call AutoLoad,50,sunxi_sid) -endef - -define KernelPackage/eeprom-sunxi/description - Support for the AllWinner Security ID fuse support -endef - -$(eval $(call KernelPackage,eeprom-sunxi)) - define KernelPackage/ata-sunxi TITLE:=AllWinner sunXi AHCI SATA support SUBMENU:=$(BLOCK_MENU) @@ -76,7 +60,7 @@ $(eval $(call KernelPackage,ata-sunxi)) define KernelPackage/sun4i-emac SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=AllWinner EMAC Ethernet support - DEPENDS:=@TARGET_sunxi +LINUX_4_4:kmod-of-mdio +LINUX_4_4:kmod-libphy + DEPENDS:=@TARGET_sunxi +kmod-of-mdio +kmod-libphy KCONFIG:=CONFIG_SUN4I_EMAC FILES:=$(LINUX_DIR)/drivers/net/ethernet/allwinner/sun4i-emac.ko AUTOLOAD:=$(call AutoProbe,sun4i-emac) @@ -85,35 +69,11 @@ endef $(eval $(call KernelPackage,sun4i-emac)) -define KernelPackage/wdt-sunxi - SUBMENU:=$(OTHER_MENU) - TITLE:=AllWinner sunXi Watchdog timer - DEPENDS:=@TARGET_sunxi - KCONFIG:=CONFIG_SUNXI_WATCHDOG - FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/sunxi_wdt.ko - AUTOLOAD:=$(call AutoLoad,51,sunxi_wdt) -endef - -define KernelPackage/wdt-sunxi/description - Kernel module for AllWinner sunXi watchdog timer. -endef - -$(eval $(call KernelPackage,wdt-sunxi)) - - define KernelPackage/sound-soc-sunxi TITLE:=AllWinner built-in SoC sound support - KCONFIG:= \ - CONFIG_SND_SUNXI_SOC_CODEC \ - CONFIG_SND_SUN4I_CODEC -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,4.4.0)),1) - FILES+=$(LINUX_DIR)/sound/soc/sunxi/sunxi-codec.ko - AUTOLOAD:=$(call AutoLoad,65,sunxi-codec) -endif -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,4.4.0)),1) + KCONFIG:=CONFIG_SND_SUN4I_CODEC FILES:=$(LINUX_DIR)/sound/soc/sunxi/sun4i-codec.ko AUTOLOAD:=$(call AutoLoad,65,sun4i-codec) -endif DEPENDS:=@TARGET_sunxi +kmod-sound-soc-core $(call AddDepends/sound) endef |