From f849c2c83247340d623fdb549e2b75f4c1feea62 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 21 May 2016 19:09:59 +0200 Subject: mvebu: enable core drivers in the kernel config instead of packaging them Simplify profile package selection Signed-off-by: Felix Fietkau --- target/linux/mvebu/Makefile | 2 +- target/linux/mvebu/config-4.4 | 53 ++++++++++++++++++++++++++++-- target/linux/mvebu/profiles/000-Default.mk | 11 +------ target/linux/mvebu/profiles/globalscale.mk | 6 +--- target/linux/mvebu/profiles/linksys.mk | 40 +++------------------- target/linux/mvebu/profiles/marvell.mk | 35 ++++---------------- target/linux/mvebu/profiles/plathome.mk | 6 +--- target/linux/mvebu/profiles/solidrun.mk | 6 +--- 8 files changed, 66 insertions(+), 93 deletions(-) (limited to 'target/linux/mvebu') diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile index 143c3f842b..bda69f64c7 100644 --- a/target/linux/mvebu/Makefile +++ b/target/linux/mvebu/Makefile @@ -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)) diff --git a/target/linux/mvebu/config-4.4 b/target/linux/mvebu/config-4.4 index cc5886956d..829bfafa4c 100644 --- a/target/linux/mvebu/config-4.4 +++ b/target/linux/mvebu/config-4.4 @@ -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 diff --git a/target/linux/mvebu/profiles/000-Default.mk b/target/linux/mvebu/profiles/000-Default.mk index 56608368ee..7f71f3e01f 100644 --- a/target/linux/mvebu/profiles/000-Default.mk +++ b/target/linux/mvebu/profiles/000-Default.mk @@ -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 diff --git a/target/linux/mvebu/profiles/globalscale.mk b/target/linux/mvebu/profiles/globalscale.mk index 7938c35be3..1b9f780e79 100644 --- a/target/linux/mvebu/profiles/globalscale.mk +++ b/target/linux/mvebu/profiles/globalscale.mk @@ -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 diff --git a/target/linux/mvebu/profiles/linksys.mk b/target/linux/mvebu/profiles/linksys.mk index 9c954bd305..41f9c7d5bb 100644 --- a/target/linux/mvebu/profiles/linksys.mk +++ b/target/linux/mvebu/profiles/linksys.mk @@ -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 diff --git a/target/linux/mvebu/profiles/marvell.mk b/target/linux/mvebu/profiles/marvell.mk index e8ca9bd250..d4a1701c13 100644 --- a/target/linux/mvebu/profiles/marvell.mk +++ b/target/linux/mvebu/profiles/marvell.mk @@ -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 diff --git a/target/linux/mvebu/profiles/plathome.mk b/target/linux/mvebu/profiles/plathome.mk index 63cdb71139..02503a190a 100644 --- a/target/linux/mvebu/profiles/plathome.mk +++ b/target/linux/mvebu/profiles/plathome.mk @@ -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 diff --git a/target/linux/mvebu/profiles/solidrun.mk b/target/linux/mvebu/profiles/solidrun.mk index 5aa61e28a2..e66d2cbc7d 100644 --- a/target/linux/mvebu/profiles/solidrun.mk +++ b/target/linux/mvebu/profiles/solidrun.mk @@ -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 -- cgit v1.2.3