mvebu: enable core drivers in the kernel config instead of packaging them

Simplify profile package selection

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-05-21 19:09:59 +02:00
parent a5a3b59bf5
commit f849c2c832
13 changed files with 72 additions and 165 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -20,6 +20,6 @@ include $(INCLUDE_DIR)/target.mk
KERNELNAME:=zImage dtbs
DEFAULT_PACKAGES += uboot-envtools
DEFAULT_PACKAGES += uboot-envtools kmod-gpio-button-hotplug
$(eval $(call BuildTarget))

View File

@ -1,3 +1,4 @@
CONFIG_AHCI_MVEBU=y
CONFIG_ALIGNMENT_TRAP=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@ -29,6 +30,7 @@ CONFIG_ARM=y
CONFIG_ARMADA_370_CLK=y
CONFIG_ARMADA_370_XP_TIMER=y
CONFIG_ARMADA_38X_CLK=y
CONFIG_ARMADA_THERMAL=y
CONFIG_ARMADA_XP_CLK=y
CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
@ -48,6 +50,7 @@ CONFIG_ARM_THUMB=y
# CONFIG_ARM_THUMBEE is not set
CONFIG_ARM_VIRT_EXT=y
CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
CONFIG_ATA=y
CONFIG_ATAGS=y
CONFIG_AUTO_ZRELADDR=y
CONFIG_BOUNCE=y
@ -88,10 +91,16 @@ CONFIG_CPU_PABRT_V7=y
CONFIG_CPU_PJ4B=y
CONFIG_CPU_PM=y
CONFIG_CPU_RMAP=y
CONFIG_CPU_THERMAL=y
CONFIG_CPU_TLB_V7=y
CONFIG_CPU_V7=y
CONFIG_CRC16=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
@ -134,10 +143,12 @@ CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
CONFIG_GENERIC_MSI_IRQ=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_PHY=y
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
@ -198,8 +209,13 @@ CONFIG_HAVE_UID16=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_HIGHMEM=y
# CONFIG_HIGHPTE is not set
CONFIG_HWMON=y
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_IRQCHIP=y
@ -210,6 +226,9 @@ CONFIG_IRQ_FORCED_THREADING=y
CONFIG_IRQ_WORK=y
# CONFIG_IWMMXT is not set
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_PCA963X=y
CONFIG_LEDS_TLC591XX=y
CONFIG_LEDS_TRIGGER_USBDEV=y
CONFIG_LIBFDT=y
CONFIG_LOCK_SPIN_ON_OWNER=y
CONFIG_LOG_BUF_SHIFT=14
@ -230,6 +249,9 @@ CONFIG_MDIO_BOARDINFO=y
CONFIG_MEMORY=y
CONFIG_MIGHT_HAVE_CACHE_L2X0=y
CONFIG_MIGHT_HAVE_PCI=y
CONFIG_MMC=y
CONFIG_MMC_MVSDIO=y
# CONFIG_MMC_TIFM_SD is not set
CONFIG_MODULES_USE_ELF_REL=y
CONFIG_MTD_CFI_STAA=y
CONFIG_MTD_M25P80=y
@ -258,6 +280,7 @@ CONFIG_MV_XOR=y
CONFIG_NEED_DMA_MAP_STATE=y
# CONFIG_NEON is not set
CONFIG_NET_FLOW_LIMIT=y
CONFIG_NLS=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_NO_BOOTMEM=y
CONFIG_NR_CPUS=4
@ -276,6 +299,7 @@ CONFIG_OF_PCI_IRQ=y
CONFIG_OF_RESERVED_MEM=y
CONFIG_OLD_SIGACTION=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_ORION_WATCHDOG=y
CONFIG_OUTER_CACHE=y
CONFIG_OUTER_CACHE_SYNC=y
CONFIG_PAGE_OFFSET=0xC0000000
@ -304,17 +328,23 @@ CONFIG_PWM_SYSFS=y
CONFIG_RATIONAL=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_RFS_ACCEL=y
CONFIG_RPS=y
CONFIG_RTC_CLASS=y
# CONFIG_RTC_DRV_MV is not set
CONFIG_RTC_DRV_ARMADA38X=y
CONFIG_RTC_DRV_MV=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_SATA_AHCI_PLATFORM=y
CONFIG_SATA_MV=y
CONFIG_SCHED_HRTICK=y
# CONFIG_SCHED_INFO is not set
# CONFIG_SCSI_DMA is not set
CONFIG_SCSI=y
CONFIG_SENSORS_PWM_FAN=y
CONFIG_SENSORS_TMP421=y
CONFIG_SERIAL_8250_DW=y
CONFIG_SERIAL_8250_FSL=y
CONFIG_SMP=y
@ -324,11 +354,17 @@ CONFIG_SPARSE_IRQ=y
CONFIG_SPI=y
CONFIG_SPI_MASTER=y
CONFIG_SPI_ORION=y
CONFIG_SRAM=y
CONFIG_SRCU=y
CONFIG_SWCONFIG=y
CONFIG_SWIOTLB=y
CONFIG_SWP_EMULATE=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_HWMON=y
CONFIG_THERMAL_OF=y
# CONFIG_THUMB2_KERNEL is not set
CONFIG_TICK_CPU_ACCOUNTING=y
CONFIG_TIMER_STATS=y
@ -339,12 +375,25 @@ CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_XZ=y
CONFIG_UBIFS_FS_ZLIB=y
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
CONFIG_USB=y
CONFIG_USB_COMMON=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_HCD_ORION=y
CONFIG_USB_EHCI_HCD_PLATFORM=y
CONFIG_USB_EHCI_PCI=y
CONFIG_USB_PHY=y
CONFIG_USB_STORAGE=y
CONFIG_USB_SUPPORT=y
# CONFIG_USB_UHCI_HCD is not set
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_MVEBU=y
CONFIG_USB_XHCI_PCI=y
CONFIG_USB_XHCI_PLATFORM=y
CONFIG_USE_OF=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_VFP=y
CONFIG_VFPv3=y
CONFIG_WATCHDOG_CORE=y
CONFIG_XPS=y
CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_BCJ=y

View File

@ -7,16 +7,7 @@
define Profile/Default
NAME:=Default Profile (all drivers)
PACKAGES:= \
kmod-mmc kmod-mvsdio swconfig \
kmod-usb2 kmod-usb3 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-ata-core kmod-ata-marvell-sata \
kmod-rtc-marvell kmod-thermal-armada \
kmod-gpio-button-hotplug kmod-hwmon-tmp421 \
kmod-hwmon-pwmfan kmod-leds-tlc59116 \
kmod-ledtrig-usbdev kmod-mwlwifi wpad-mini \
kmod-ata-mvebu-ahci
PACKAGES:= kmod-mwlwifi wpad-mini swconfig
endef
define Profile/Default/Description

View File

@ -7,11 +7,7 @@
define Profile/Mirabox
NAME:=Globalscale Mirabox
PACKAGES:= \
kmod-usb3 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-rtc-marvell kmod-thermal-armada \
kmod-gpio-button-hotplug kmod-mmc kmod-mvsdio
PACKAGES:=
endef
define Profile/Mirabox/Description

View File

@ -7,15 +7,7 @@
define Profile/Caiman
NAME:=Linksys WRT1200AC (Caiman)
PACKAGES:= \
kmod-usb2 kmod-usb3 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-ata-core kmod-ata-mvebu-ahci \
kmod-rtc-armada38x kmod-thermal-armada \
kmod-gpio-button-hotplug kmod-hwmon-tmp421 \
kmod-leds-pca963x \
kmod-ledtrig-usbdev kmod-mwlwifi wpad-mini \
swconfig
PACKAGES:= kmod-mwlwifi wpad-mini swconfig
endef
define Profile/Caiman/Description
@ -27,15 +19,7 @@ $(eval $(call Profile,Caiman))
define Profile/Cobra
NAME:=Linksys WRT1900ACv2 (Cobra)
PACKAGES:= \
kmod-usb2 kmod-usb3 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-ata-core kmod-ata-mvebu-ahci \
kmod-rtc-armada38x kmod-thermal-armada \
kmod-gpio-button-hotplug kmod-hwmon-tmp421 \
kmod-leds-pca963x \
kmod-ledtrig-usbdev kmod-mwlwifi wpad-mini \
swconfig
PACKAGES:= kmod-mwlwifi wpad-mini swconfig
endef
define Profile/Cobra/Description
@ -47,15 +31,7 @@ $(eval $(call Profile,Cobra))
define Profile/Mamba
NAME:=Linksys WRT1900AC (Mamba)
PACKAGES:= \
kmod-usb2 kmod-usb3 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-ata-core kmod-ata-marvell-sata \
kmod-rtc-marvell kmod-thermal-armada \
kmod-gpio-button-hotplug kmod-hwmon-tmp421 \
kmod-hwmon-pwmfan kmod-leds-tlc591xx \
kmod-ledtrig-usbdev kmod-mwlwifi wpad-mini \
swconfig
PACKAGES:= kmod-mwlwifi wpad-mini swconfig
endef
define Profile/Mamba/Description
@ -67,15 +43,7 @@ $(eval $(call Profile,Mamba))
define Profile/Shelby
NAME:=Linksys WRT1900ACS (Shelby)
PACKAGES:= \
kmod-usb2 kmod-usb3 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-ata-core kmod-ata-mvebu-ahci \
kmod-rtc-armada38x kmod-thermal-armada \
kmod-gpio-button-hotplug kmod-hwmon-tmp421 \
kmod-leds-pca963x \
kmod-ledtrig-usbdev kmod-mwlwifi wpad-mini \
swconfig
PACKAGES:= kmod-mwlwifi wpad-mini swconfig
endef
define Profile/Shelby/Description

View File

@ -7,11 +7,7 @@
define Profile/370-DB
NAME:=Marvell Armada 370 DB (DB-88F6710-BP-DDR3)
PACKAGES:= \
kmod-mmc kmod-mvsdio kmod-usb2 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-ata-core kmod-ata-marvell-sata \
kmod-rtc-marvell kmod-thermal-armada
PACKAGES:=
endef
define Profile/370-DB/Description
@ -22,11 +18,7 @@ $(eval $(call Profile,370-DB))
define Profile/370-RD
NAME:=Marvell Armada 370 RD (RD-88F6710-A1)
PACKAGES:= \
kmod-mmc kmod-mvsdio kmod-usb2 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-ata-core kmod-ata-marvell-sata \
kmod-rtc-marvell kmod-thermal-armada
PACKAGES:=
endef
define Profile/370-RD/Description
@ -37,10 +29,7 @@ $(eval $(call Profile,370-RD))
define Profile/385-RD
NAME:=Marvell Armada 385 RD (RD-88F6820-AP)
PACKAGES:= \
kmod-mmc kmod-mvsdio kmod-usb3 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-thermal-armada
PACKAGES:=
endef
define Profile/385-RD/Description
@ -51,11 +40,7 @@ $(eval $(call Profile,385-RD))
define Profile/385-DB-AP
NAME:=Marvell Armada 385 DB AP (DB-88F6820-AP)
PACKAGES:= \
kmod-usb3 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-ata-core kmod-ata-marvell-sata \
kmod-thermal-armada
PACKAGES:=
endef
define Profile/385-DB-AP/Description
@ -66,11 +51,7 @@ $(eval $(call Profile,385-DB-AP))
define Profile/XP-DB
NAME:=Marvell Armada XP DB (DB-78460-BP)
PACKAGES:= \
kmod-mmc kmod-mvsdio kmod-usb2 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-ata-core kmod-ata-marvell-sata \
kmod-rtc-marvell kmod-thermal-armada
PACKAGES:=
endef
define Profile/XP-DB/Description
@ -81,11 +62,7 @@ $(eval $(call Profile,XP-DB))
define Profile/XP-GP
NAME:=Marvell Armada XP GP (DB-MV784MP-GP)
PACKAGES:= \
kmod-mmc kmod-mvsdio kmod-usb2 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-ata-core kmod-ata-marvell-sata \
kmod-rtc-marvell kmod-thermal-armada
PACKAGES:=
endef
define Profile/XP-GP/Description

View File

@ -7,11 +7,7 @@
define Profile/OpenBlocks-AX-3-4
NAME:=Plat'Home OpenBlocks AX3
PACKAGES:= \
kmod-usb2 kmod-usb-storage \
kmod-i2c-core kmod-i2c-mv64xxx \
kmod-ata-core kmod-ata-marvell-sata \
kmod-rtc-marvell kmod-thermal-armada
PACKAGES:=
endef
define Profile/OpenBlocks-AX-3-4/Description

View File

@ -7,11 +7,7 @@
define Profile/Solidrun-Clearfog-A1
NAME:=SolidRun ClearFog A1 board
PACKAGES:= \
kmod-usb3 kmod-usb2 kmod-usb-storage \
kmod-of-i2c kmod-i2c-core kmod-i2c-mv64xxx \
kmod-ata-core kmod-ata-marvell-sata \
kmod-thermal-armada kmod-rtc-marvell
PACKAGES:=
endef
define Profile/Solidrun-Clearfog-A1/Description