KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sunxi: clean up modules definitions

Browse source 
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>
This commit is contained in:
Matthias Schiffer 2017-05-04 07:00:06 +02:00
parent 414b65db85
commit be40d0a144
No known key found for this signature in database
GPG key ID: 16EF3F64CB201D9C
3 changed files with 5 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/sunxi/Makefile
View file

@ -27,7 +27,7 @@ KERNELNAME:=zImage dtbs
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += uboot-envtools kmod-eeprom-sunxi kmod-wdt-sunxi
DEFAULT_PACKAGES += uboot-envtools
DEFAULT_PACKAGES += mkf2fs e2fsprogs
$(eval $(call BuildTarget))

2
target/linux/sunxi/config-4.4
View file

@ -355,7 +355,7 @@ CONFIG_NO_HZ_COMMON=y
CONFIG_NO_HZ_IDLE=y
CONFIG_NR_CPUS=8
CONFIG_NVMEM=y
# CONFIG_NVMEM_SUNXI_SID is not set
CONFIG_NVMEM_SUNXI_SID=y
CONFIG_OF=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_EARLY_FLATTREE=y

46
target/linux/sunxi/modules.mk
View file

@ -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