From 9a1f441ac81c0c2b96ec813a645bae4fc8792bf5 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 22 Dec 2016 17:19:29 +0100 Subject: [PATCH] kirkwood: enable SoC drivers in the kernel config Clean up packaged modules Signed-off-by: Felix Fietkau --- package/kernel/linux/modules/crypto.mk | 2 +- package/kernel/linux/modules/i2c.mk | 2 +- package/kernel/linux/modules/other.mk | 23 +++-------------------- target/linux/kirkwood/config-4.4 | 23 +++++++++++++++++------ 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 0a88c3be12..ff19751398 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -665,7 +665,7 @@ $(eval $(call KernelPackage,crypto-xts)) define KernelPackage/crypto-mv-cesa TITLE:=Marvell crypto engine - DEPENDS:=+kmod-crypto-manager @TARGET_kirkwood||TARGET_orion + DEPENDS:=+kmod-crypto-manager @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 e1c65d493e..c4767735b9 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 +kmod-i2c-core + DEPENDS:=TARGET_orion +kmod-i2c-core endef define KernelPackage/i2c-mv64xxx/description diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 0c9696956d..923a087651 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 + DEPENDS:=@TARGET_orion KCONFIG:=CONFIG_ORION_WATCHDOG FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/orion_wdt.ko AUTOLOAD:=$(call AutoLoad,50,orion_wdt,1) @@ -587,7 +587,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 + DEPENDS:=@RTC_SUPPORT @TARGET_orion KCONFIG:=CONFIG_RTC_DRV_MV \ CONFIG_RTC_CLASS=y FILES:=$(LINUX_DIR)/drivers/rtc/rtc-mv.ko @@ -795,7 +795,7 @@ $(eval $(call KernelPackage,zram)) define KernelPackage/mvsdio SUBMENU:=$(OTHER_MENU) TITLE:=Marvell SDIO support - DEPENDS:=@TARGET_orion||TARGET_kirkwood +kmod-mmc + DEPENDS:=@TARGET_orion +kmod-mmc KCONFIG:=CONFIG_MMC_MVSDIO FILES:=$(LINUX_DIR)/drivers/mmc/host/mvsdio.ko AUTOLOAD:=$(call AutoProbe,mvsdio) @@ -975,23 +975,6 @@ endef $(eval $(call KernelPackage,thermal-imx)) -define KernelPackage/thermal-kirkwood - SUBMENU:=$(OTHER_MENU) - TITLE:=Temperature sensor on Marvell Kirkwood SoCs - DEPENDS:=@TARGET_kirkwood +kmod-thermal - KCONFIG:=CONFIG_KIRKWOOD_THERMAL - FILES:=$(LINUX_DIR)/drivers/thermal/kirkwood_thermal.ko - AUTOLOAD:=$(call AutoProbe,kirkwood_thermal) -endef - -define KernelPackage/thermal-kirkwood/description - Support for the Kirkwood thermal sensor driver into the Linux thermal - framework. Only kirkwood 88F6282 and 88F6283 have this sensor. -endef - -$(eval $(call KernelPackage,thermal-kirkwood)) - - define KernelPackage/gpio-beeper SUBMENU:=$(OTHER_MENU) TITLE:=GPIO beeper support diff --git a/target/linux/kirkwood/config-4.4 b/target/linux/kirkwood/config-4.4 index 8ca0ebb04e..3c408445a3 100644 --- a/target/linux/kirkwood/config-4.4 +++ b/target/linux/kirkwood/config-4.4 @@ -27,6 +27,7 @@ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_ARM=y +# CONFIG_ARMADA_THERMAL is not set CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set @@ -38,7 +39,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=5 # CONFIG_ARM_MVEBU_V7_CPUIDLE is not set CONFIG_ARM_PATCH_PHYS_VIRT=y # CONFIG_ARM_THUMB is not set -# CONFIG_ARMADA_THERMAL is not set +CONFIG_ATA=y CONFIG_ATAGS=y CONFIG_AUTO_ZRELADDR=y CONFIG_BLK_DEV_SD=y @@ -72,8 +73,11 @@ CONFIG_CRC16=y CONFIG_CRC32_SLICEBY8=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_DEV_MARVELL_CESA=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y @@ -115,6 +119,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GLOB=y CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y CONFIG_GPIO_MVEBU=y @@ -150,11 +155,6 @@ CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_IDE=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZ4=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y @@ -174,6 +174,8 @@ CONFIG_HZ_FIXED=0 CONFIG_HZ_PERIODIC=y CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MV64XXX=y CONFIG_INITRAMFS_SOURCE="" CONFIG_IOMMU_HELPER=y CONFIG_IP_PIMSM_V1=y @@ -184,6 +186,7 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y CONFIG_KIRKWOOD_CLK=y +CONFIG_KIRKWOOD_THERMAL=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_NETXBIG=y CONFIG_LEDS_NS2=y @@ -242,6 +245,7 @@ CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_ORION_IRQCHIP=y CONFIG_ORION_TIMER=y +CONFIG_ORION_WATCHDOG=y CONFIG_OUTER_CACHE=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PCI=y @@ -268,6 +272,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_MV=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_SATA_MV=y CONFIG_SCHED_HRTICK=y # CONFIG_SCHED_INFO is not set CONFIG_SCSI=y @@ -280,10 +285,15 @@ CONFIG_SPI=y CONFIG_SPI_MASTER=y CONFIG_SPI_ORION=y CONFIG_SPLIT_PTLOCK_CPUS=999999 +CONFIG_SRAM=y CONFIG_SRCU=y CONFIG_SWCONFIG=y CONFIG_SWIOTLB=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_THERMAL=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_OF=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS_ADVANCED_COMPR=y @@ -305,6 +315,7 @@ CONFIG_VECTORS_BASE=0xffff0000 # CONFIG_VFP is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_WAN=y +CONFIG_WATCHDOG_CORE=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 -- 2.25.1