hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

omap: build various core drivers into the kernel instead of packaging them

Browse Source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
master
Felix Fietkau 8 years ago
parent 10f7a8d648
commit 7ff7be96dd
6 changed files with 54 additions and 175 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 30
      package/kernel/linux/modules/crypto.mk
  2. 4
      package/kernel/linux/modules/other.mk
  3. 2
      package/kernel/linux/modules/spi.mk
  4. 134
      package/kernel/linux/modules/usb.mk
  5. 57
      target/linux/omap/config-4.4
  6. 2
      target/linux/omap/profiles/beagleboard.mk

30
package/kernel/linux/modules/crypto.mk
Unescape View File

@ -240,36 +240,6 @@ endef
$(eval $(call KernelPackage,crypto-hw-hifn-795x))
define KernelPackage/crypto-hw-omap
TITLE:=TI OMAP hardware crypto modules
DEPENDS:=@TARGET_omap
KCONFIG:= \
CONFIG_CRYPTO_HW=y \
CONFIG_CRYPTO_DEV_OMAP_AES \
CONFIG_CRYPTO_DEV_OMAP_DES \
CONFIG_CRYPTO_DEV_OMAP_SHAM
ifneq ($(wildcard $(LINUX_DIR)/drivers/crypto/omap-des.ko),)
FILES:= \
$(LINUX_DIR)/drivers/crypto/omap-aes.ko \
$(LINUX_DIR)/drivers/crypto/omap-des.ko \
$(LINUX_DIR)/drivers/crypto/omap-sham.ko
AUTOLOAD:=$(call AutoLoad,90,omap-aes omap-des omap-sham)
else
FILES:= \
$(LINUX_DIR)/drivers/crypto/omap-aes.ko \
$(LINUX_DIR)/drivers/crypto/omap-sham.ko
AUTOLOAD:=$(call AutoLoad,90,omap-aes omap-sham)
endif
$(call AddDepends/crypto,+kmod-crypto-manager +kmod-crypto-hash)
endef
define KernelPackage/crypto-hw-omap/description
Kernel support for the TI OMAP HW crypto engine.
endef
$(eval $(call KernelPackage,crypto-hw-omap))
define KernelPackage/crypto-authenc
TITLE:=Combined mode wrapper for IPsec
DEPENDS:=+kmod-crypto-manager +LINUX_4_4:kmod-crypto-null

4
package/kernel/linux/modules/other.mk
Unescape View File

@ -485,7 +485,7 @@ $(eval $(call KernelPackage,bcma))
define KernelPackage/wdt-omap
SUBMENU:=$(OTHER_MENU)
TITLE:=OMAP Watchdog timer
DEPENDS:=@(TARGET_omap24xx||TARGET_omap35xx)
DEPENDS:=@TARGET_omap24xx
KCONFIG:=CONFIG_OMAP_WATCHDOG
FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/omap_wdt.ko
AUTOLOAD:=$(call AutoLoad,50,omap_wdt,1)
@ -849,7 +849,7 @@ define KernelPackage/random-omap
TITLE:=Hardware Random Number Generator OMAP support
KCONFIG:=CONFIG_HW_RANDOM_OMAP
FILES:=$(LINUX_DIR)/drivers/char/hw_random/omap-rng.ko
DEPENDS:=@(TARGET_omap24xx||TARGET_omap) +kmod-random-core
DEPENDS:=@TARGET_omap24xx +kmod-random-core
AUTOLOAD:=$(call AutoProbe,random-omap)
endef

2
package/kernel/linux/modules/spi.mk
Unescape View File

@ -93,7 +93,7 @@ $(eval $(call KernelPackage,spi-dev))
define KernelPackage/spi-omap-24xx
SUBMENU:=$(SPI_MENU)
TITLE:=SPI omap 24xx
DEPENDS:=@(TARGET_omap24xx||TARGET_omap)
DEPENDS:=@TARGET_omap24xx
KCONFIG:=CONFIG_SPI_OMAP24XX \
CONFIG_SPI=y \
CONFIG_SPI_MASTER=y

134
package/kernel/linux/modules/usb.mk
Unescape View File

@ -67,8 +67,7 @@ define KernelPackage/usb-musb-hdrc
CONFIG_USB_MUSB_HOST=n \
CONFIG_USB_MUSB_DEBUG=y
DEPENDS:= \
@(TARGET_omap||TARGET_omap24xx) +kmod-usb-gadget \
+TARGET_omap24xx:kmod-usb-musb-tusb6010
@TARGET_omap24xx +kmod-usb-gadget +kmod-usb-musb-tusb6010
FILES:=$(LINUX_DIR)/drivers/usb/musb/musb_hdrc.ko
AUTOLOAD:=$(call AutoLoad,46,musb_hdrc)
$(call AddDepends/usb)
@ -81,29 +80,6 @@ endef
$(eval $(call KernelPackage,usb-musb-hdrc))
define KernelPackage/usb-musb-platformglue
TITLE:=MUSB platform glue layer
KCONFIG:= \
CONFIG_USB_MUSB_TUSB6010=n \
CONFIG_USB_MUSB_OMAP2PLUS=n \
CONFIG_USB_MUSB_AM35X=n \
CONFIG_USB_MUSB_DSPS \
CONFIG_USB_MUSB_UX500=n
DEPENDS:=@TARGET_omap +kmod-usb-phy-nop +kmod-usb-musb-hdrc +kmod-usb-phy-am335x
FILES:= \
$(LINUX_DIR)/drivers/usb/musb/musb_dsps.ko \
$(LINUX_DIR)/drivers/usb/musb/musb_am335x.ko
AUTOLOAD:=$(call AutoLoad,45,phy-omap-control musb_dsps musb_am335x)
$(call AddDepends/usb)
endef
define KernelPackage/usb-musb-platformglue/description
MUSB platform glue modules
endef
$(eval $(call KernelPackage,usb-musb-platformglue))
define KernelPackage/usb-musb-tusb6010
TITLE:=Support for TUSB 6010
KCONFIG:=CONFIG_USB_MUSB_TUSB6010
@ -134,94 +110,6 @@ endef
$(eval $(call KernelPackage,usb-phy-nop))
define KernelPackage/usb-phy-am335x
TITLE:=Support for AM335x USB PHY
KCONFIG:= \
CONFIG_AM335X_PHY_USB \
CONFIG_AM335X_CONTROL_USB
DEPENDS:=@TARGET_omap +kmod-usb-phy-nop
FILES:= \
$(LINUX_DIR)/drivers/usb/phy/phy-am335x.ko \
$(LINUX_DIR)/drivers/usb/phy/phy-am335x-control.ko
AUTOLOAD:=$(call AutoLoad,44,phy-am335x)
$(call AddDepends/usb)
endef
define KernelPackage/usb-phy-am335x/description
Support for AM335x USB PHY
endef
$(eval $(call KernelPackage,usb-phy-am335x))
define KernelPackage/usb-phy-omap-usb2
TITLE:=Support for OMAP2 USB PHY
KCONFIG:= \
CONFIG_OMAP_USB2 \
CONFIG_OMAP_CONTROL_PHY
DEPENDS:=@TARGET_omap
FILES:= \
$(LINUX_DIR)/drivers/phy/phy-omap-usb2.ko \
$(LINUX_DIR)/drivers/phy/phy-omap-control.ko
AUTOLOAD:=$(call AutoLoad,45,phy-omap-control phy-omap-usb2)
$(call AddDepends/usb)
endef
define KernelPackage/usb-phy-omap-usb2/description
Support for AM335x USB PHY
endef
$(eval $(call KernelPackage,usb-phy-omap-usb2))
define KernelPackage/usb-phy-omap-usb3
TITLE:=Support for OMAP USB3 PHY
KCONFIG:=CONFIG_OMAP_USB3
DEPENDS:=@TARGET_omap +kmod-usb-phy-omap-usb2
FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-omap-usb3.ko
AUTOLOAD:=$(call AutoLoad,45,phy-omap-usb3)
$(call AddDepends/usb)
endef
define KernelPackage/usb-phy-omap-usb3/description
Support for OMAP USB3 PHY
endef
$(eval $(call KernelPackage,usb-phy-omap-usb3))
define KernelPackage/usb-phy-twl4030
TITLE:=Support for TWL4030 OTG PHY
KCONFIG:=CONFIG_TWL4030_USB
DEPENDS:=@TARGET_omap +kmod-usb-phy-omap-usb2 +kmod-usb-musb-hdrc
FILES:=$(LINUX_DIR)/drivers/phy/phy-twl4030-usb.ko
AUTOLOAD:=$(call AutoLoad,45,phy-twl4030-usb)
$(call AddDepends/usb)
endef
define KernelPackage/usb-phy-twl4030/description
Support for TWL4030/TWL5030/TPS659x0 OTG PHY
endef
$(eval $(call KernelPackage,usb-phy-twl4030))
define KernelPackage/usb-phy-twl6030
TITLE:=Support for TWL6030 OTG PHY
KCONFIG:=CONFIG_TWL6030_USB
DEPENDS:=@TARGET_omap +kmod-usb-phy-omap-usb2 +kmod-usb-musb-hdrc
FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-twl6030-usb.ko
AUTOLOAD:=$(call AutoLoad,45,phy-twl6030-usb)
$(call AddDepends/usb)
endef
define KernelPackage/usb-phy-twl6030/description
Support for TWL6030 OTG PHY
endef
$(eval $(call KernelPackage,usb-phy-twl6030))
define KernelPackage/usb-gadget
TITLE:=USB Gadget support
KCONFIG:=CONFIG_USB_GADGET
@ -400,23 +288,6 @@ endef
$(eval $(call KernelPackage,usb-ohci-pci))
define KernelPackage/usb2-omap
TITLE:=Support for USB2 for OMAP
DEPENDS:=@TARGET_omap +kmod-usb-phy-nop +kmod-usb-phy-am335x +kmod-usb2
KCONFIG:=\
CONFIG_MFD_OMAP_USB_HOST=y \
CONFIG_USB_EHCI_HCD_OMAP
FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-omap.ko
AUTOLOAD:=$(call AutoLoad,39,ehci-omap)
$(call AddDepends/usb)
endef
define KernelPackage/usb2-omap/description
Kernel support for OMAP USB2 (EHCI) controllers
endef
$(eval $(call KernelPackage,usb2-omap))
define KernelPackage/usb-bcma
TITLE:=Support for BCMA USB controllers
DEPENDS:=@USB_SUPPORT @TARGET_brcm47xx||TARGET_bcm53xx
@ -1568,8 +1439,7 @@ define KernelPackage/usb3
TITLE:=Support for USB3 controllers
DEPENDS:= \
+TARGET_bcm53xx:kmod-usb-bcma \
+TARGET_bcm53xx:kmod-phy-bcm-ns-usb3 \
+TARGET_omap:kmod-usb-phy-omap-usb3
+TARGET_bcm53xx:kmod-phy-bcm-ns-usb3
KCONFIG:= \
CONFIG_USB_XHCI_HCD \
CONFIG_USB_XHCI_PCI \

57
target/linux/omap/config-4.4
Unescape View File

@ -1,4 +1,6 @@
CONFIG_ALIGNMENT_TRAP=y
CONFIG_AM335X_CONTROL_USB=y
CONFIG_AM335X_PHY_USB=y
# CONFIG_APM_EMULATION is not set
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_ARCH_HAS_BANDGAP=y
@ -136,10 +138,22 @@ CONFIG_CRC_T10DIF=y
CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CRCT10DIF=y
CONFIG_CRYPTO_DEFLATE=y
CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_DEV_OMAP_AES=y
CONFIG_CRYPTO_DEV_OMAP_DES=y
CONFIG_CRYPTO_DEV_OMAP_SHAM=y
CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_LZO=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA512=y
CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_DDR=y
@ -194,7 +208,6 @@ CONFIG_FIX_EARLYCON_MEM=y
CONFIG_FRAME_POINTER=y
CONFIG_FS_MBCACHE=y
CONFIG_FS_POSIX_ACL=y
# CONFIG_FB_OMAP2 is not set
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_CLOCKEVENTS=y
@ -258,11 +271,6 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=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
@ -279,7 +287,6 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_UID16=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_HDMI=y
CONFIG_HDQ_MASTER_OMAP=y
CONFIG_HIGHMEM=y
CONFIG_HIGHPTE=y
CONFIG_HSI=y
@ -382,6 +389,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MULTI_IRQ_HANDLER=y
# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_KM=y
CONFIG_NEON=y
@ -413,6 +421,7 @@ CONFIG_NFS_V4=y
CONFIG_NLS=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_NO_BOOTMEM=y
CONFIG_NO_HZ=y
CONFIG_NO_HZ_COMMON=y
@ -460,6 +469,7 @@ CONFIG_OMAP_OCP2SCP=y
CONFIG_OMAP_PM_NOOP=y
CONFIG_OMAP_RESET_CLOCKS=y
# CONFIG_OMAP_SSI is not set
CONFIG_OMAP_USB2=y
CONFIG_OMAP_WATCHDOG=y
CONFIG_OPROFILE=y
CONFIG_OPTPROBES=y
@ -605,7 +615,7 @@ CONFIG_SOUND_OSS_CORE_PRECLAIM=y
CONFIG_SPARSE_IRQ=y
CONFIG_SPI=y
CONFIG_SPI_MASTER=y
# CONFIG_SPI_OMAP24XX is not set
CONFIG_SPI_OMAP24XX=y
CONFIG_SPI_TI_QSPI=y
CONFIG_SRAM=y
CONFIG_SRCU=y
@ -643,7 +653,9 @@ CONFIG_TRACE_CLOCK=y
CONFIG_TRACE_IRQFLAGS=y
CONFIG_TWL4030_CORE=y
CONFIG_TWL4030_POWER=y
CONFIG_TWL4030_USB=y
CONFIG_TWL4030_WATCHDOG=y
# CONFIG_TWL6030_USB is not set
CONFIG_TWL6040_CORE=y
CONFIG_UBIFS_FS=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
@ -651,8 +663,33 @@ CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
CONFIG_UNINLINE_SPIN_UNLOCK=y
CONFIG_USB=y
# CONFIG_USB_AUDIO is not set
CONFIG_USB_COMMON=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_DUAL_ROLE=y
# CONFIG_USB_DWC3_GADGET is not set
# CONFIG_USB_DWC3_HOST is not set
CONFIG_USB_DWC3_OMAP=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_HCD_OMAP=y
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
# CONFIG_USB_ETH is not set
CONFIG_USB_GADGET=y
# CONFIG_USB_INVENTRA_DMA is not set
CONFIG_USB_MUSB_AM335X_CHILD=y
# CONFIG_USB_MUSB_AM35X is not set
CONFIG_USB_MUSB_DSPS=y
CONFIG_USB_MUSB_DUAL_ROLE=y
# CONFIG_USB_MUSB_GADGET is not set
CONFIG_USB_MUSB_HDRC=y
# CONFIG_USB_MUSB_HOST is not set
CONFIG_USB_MUSB_OMAP2PLUS=y
CONFIG_USB_MUSB_TUSB6010=y
CONFIG_USB_PHY=y
CONFIG_USB_SUPPORT=y
# CONFIG_USB_DWC3_OMAP is not set
# CONFIG_USB_TI_CPPI41_DMA is not set
# CONFIG_USB_TUSB_OMAP_DMA is not set
# CONFIG_USERIO is not set
CONFIG_USE_OF=y
CONFIG_VECTORS_BASE=0xffff0000
@ -662,6 +699,8 @@ CONFIG_VFPv3=y
CONFIG_VIDEOMODE_HELPERS=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WKUP_M3_RPROC is not set
CONFIG_XFRM_ALGO=y
CONFIG_XFRM_MIGRATE=y
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZLIB_DEFLATE=y

2
target/linux/omap/profiles/beagleboard.mk
Unescape View File

@ -7,7 +7,7 @@
define Profile/BEAGLEBOARD
NAME:=EBV BeagleBoard
DEFAULT_PACKAGES += kmod-usb2 kmod-usb2-omap \
DEFAULT_PACKAGES += \
kmod-usb-net kmod-usb-net-asix \
kmod-usb-net-asix-ax88179 kmod-usb-net-hso \
kmod-usb-net-kaweth kmod-usb-net-pegasus \

Write Preview
Loading…
Cancel
Save