mxs: remove modules.mk, select drivers in the kernel config

Signed-off-by: Felix Fietkau <nbd@nbd.name>

2 files changed, 11 insertions, 99 deletions

diff --git a/target/linux/mxs/config-4.4 b/target/linux/mxs/config-4.4
index eadd10e1da..6723f05d31 100644
--- a/target/linux/mxs/config-4.4
+++ b/target/linux/mxs/config-4.4
@@ -71,11 +71,15 @@ CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_USE_DOMAINS=y
 CONFIG_CRC16=y
 CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_DEV_MXS_DCP is not set
+CONFIG_CRYPTO_DEV_MXS_DCP=y
+CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
@@ -169,13 +173,14 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PINCTRL=y
-# CONFIG_I2C_MXS is not set
+CONFIG_I2C_MXS=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 CONFIG_IIO_KFIFO_BUF=y
 CONFIG_IIO_PERIODIC_RTC_TRIGGER=y
 CONFIG_IIO_SYSFS_TRIGGER=y
 CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_TRIGGERED_BUFFER=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
 CONFIG_IOMMU_HELPER=y
@@ -199,7 +204,7 @@ CONFIG_MODULES_USE_ELF_REL=y
 # CONFIG_MTD_PHYSMAP_OF is not set
 CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_MXS_DMA=y
-# CONFIG_MXS_LRADC is not set
+CONFIG_MXS_LRADC=y
 CONFIG_MXS_POWER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_KUSER_HELPERS=y
@@ -249,7 +254,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_MXS=y
 CONFIG_RTC_CLASS=y
-# CONFIG_RTC_DRV_STMP is not set
+CONFIG_RTC_DRV_STMP=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SCHED_HRTICK=y
 # CONFIG_SCHED_INFO is not set
@@ -269,9 +274,10 @@ CONFIG_SOC_IMX28=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
-# CONFIG_SPI_MXS is not set
+CONFIG_SPI_MXS=y
 CONFIG_SPLIT_PTLOCK_CPUS=999999
 CONFIG_SRCU=y
+CONFIG_STMP3XXX_RTC_WATCHDOG=y
 CONFIG_STMP_DEVICE=y
 CONFIG_SWIOTLB=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/target/linux/mxs/modules.mk b/target/linux/mxs/modules.mk
deleted file mode 100644
index 147c25d1e7..0000000000
--- a/target/linux/mxs/modules.mk
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Copyright (C) 2013-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-define KernelPackage/rtc-stmp3xxx
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=STMP3xxx SoC built-in RTC support
-  DEPENDS:=@TARGET_mxs
-  $(call AddDepends/rtc)
-  KCONFIG:= \
-	CONFIG_RTC_CLASS=y \
-	CONFIG_RTC_DRV_STMP=m
-  FILES:=$(LINUX_DIR)/drivers/rtc/rtc-stmp3xxx.ko
-  AUTOLOAD:=$(call AutoLoad,50,rtc-stmp3xxx)
-endef
-
-$(eval $(call KernelPackage,rtc-stmp3xxx))
-
-define KernelPackage/wdt-stmp3xxx
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=STMP3xxx Watchdog timer
-  DEPENDS:=kmod-rtc-stmp3xxx
-  KCONFIG:=CONFIG_STMP3XXX_RTC_WATCHDOG
-  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/stmp3xxx_rtc_wdt.ko
-  AUTOLOAD:=$(call AutoLoad,51,stmp3xxx_rtc_wdt)
-endef
-
-define KernelPackage/wdt-stmp3xxx/description
-  Kernel module for STMP3xxx watchdog timer.
-endef
-
-$(eval $(call KernelPackage,wdt-stmp3xxx))
-
-define KernelPackage/iio-mxs-lradc
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Freescale i.MX23/28 LRADC driver
-  DEPENDS:=@TARGET_mxs +kmod-iio-core
-  KCONFIG:=CONFIG_MXS_LRADC
-  FILES:=$(LINUX_DIR)/drivers/staging/iio/adc/mxs-lradc.ko 
-  AUTOLOAD:=$(call AutoLoad,70,mxs-lradc)
-endef
-
-define KernelPackage/iio-mxs-lradc/description
-  Kernel module for Freescale i.MX23/28 LRADC driver
-endef
-
-$(eval $(call KernelPackage,iio-mxs-lradc))
-
-define KernelPackage/crypto-hw-dcp
-  TITLE:=Freescale i.MX23/28 DCP hardware crypto module
-  DEPENDS:=@TARGET_mxs
-  KCONFIG:=CONFIG_CRYPTO_DEV_MXS_DCP
-  FILES:=$(LINUX_DIR)/drivers/crypto/mxs-dcp.ko
-  AUTOLOAD:=$(call AutoLoad,90,mxs-dcp)
-  $(call AddDepends/crypto,+kmod-crypto-authenc +kmod-crypto-des)
-endef
-
-define KernelPackage/crypto-hw-dcp/description
-  Kernel support for Freescale i.MX23/28 DCP crypto engine
-endef
-
-$(eval $(call KernelPackage,crypto-hw-dcp))
-
-define KernelPackage/spi-mxs
-  SUBMENU:=$(SPI_MENU)
-  TITLE:=Freescale i.MX23/28 SPI driver
-  DEPENDS:=@TARGET_mxs
-  KCONFIG:=CONFIG_SPI_MXS
-  FILES:=$(LINUX_DIR)/drivers/spi/spi-mxs.ko
-  AUTOLOAD:=$(call AutoProbe,spi-mxs)
-endef
-
-define KernelPackage/spi-mxs/description
-  Kernel module for Freescale i.MX23/28 SPI controller
-endef
-
-$(eval $(call KernelPackage,spi-mxs))
-
-I2C_MXS_MODULES:= \
-  CONFIG_I2C_MXS:drivers/i2c/busses/i2c-mxs
-
-define KernelPackage/i2c-mxs
-  $(call i2c_defaults,$(I2C_MXS_MODULES),55)
-  TITLE:=Freescale i.MX23/28 I2C driver
-  DEPENDS:=@TARGET_mxs +kmod-i2c-core
-endef
-
-define KernelPackage/i2c-mxs/description
-  Kernel module for Freescale i.MX23/28 I2C controller
-endef
-
-$(eval $(call KernelPackage,i2c-mxs))