Skip to content

Commit

Permalink
Merge pull request #4348 from codesnake/amlogic_kernel_update
Browse files Browse the repository at this point in the history
Update Amlogic kernel and WeTek proprietary DVB module
  • Loading branch information
sraue committed Oct 3, 2015
2 parents 7b474a1 + f13e773 commit 144cf92
Show file tree
Hide file tree
Showing 16 changed files with 38 additions and 258 deletions.
2 changes: 1 addition & 1 deletion packages/linux-drivers/wetekdvb/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
################################################################################

PKG_NAME="wetekdvb"
PKG_VERSION="20150503"
PKG_VERSION="20150930"
PKG_REV="1"
PKG_ARCH="arm"
PKG_LICENSE="nonfree"
Expand Down
2 changes: 1 addition & 1 deletion packages/linux/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and
PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
case "$LINUX" in
amlogic)
PKG_VERSION="amlogic-3.10-a9cef51"
PKG_VERSION="amlogic-3.10-753dc30"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
;;
imx6)
Expand Down
43 changes: 35 additions & 8 deletions projects/WeTek_Play/linux/linux.arm.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.10.76 Kernel Configuration
# Linux/arm 3.10.89 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
Expand Down Expand Up @@ -302,6 +302,7 @@ CONFIG_ARCH_MESON6=y
# CONFIG_ARCH_MESON8B is not set
# CONFIG_ARCH_MESON8M2 is not set
# CONFIG_ARCH_MESONG9TV is not set
# CONFIG_ARCH_MESONG9BB is not set

#
# Meson development boards
Expand Down Expand Up @@ -926,6 +927,12 @@ CONFIG_EARLY_INIT=y
# CONFIG_AML_REG_DEBUG is not set
CONFIG_AM_UART=y
CONFIG_AM_UART_CONSOLE=y
# CONFIG_PRINTK_NOBLOCK_MODE is not set

#
# Amlogic UM220 GPS Support
#
# CONFIG_GPS_UM220 is not set
CONFIG_OF_LM=y
CONFIG_AML_RTC=y

Expand All @@ -941,6 +948,7 @@ CONFIG_MESON_INPUT_REMOTE=y
CONFIG_AM_REMOTE=y
# CONFIG_AM_IR_RECEIVER is not set
# CONFIG_VIRTUAL_REMOTE is not set
# CONFIG_AM_IR_IRBLASTER is not set
CONFIG_MESON_NEW_INPUT_REMOTE=y
# CONFIG_NEW_AM_REMOTE is not set
# CONFIG_NEW_AM_IR_TX is not set
Expand Down Expand Up @@ -990,12 +998,17 @@ CONFIG_EFUSE=y
# CONFIG_EFUSE_WRITE_VERSION_PERMIT is not set
CONFIG_EFUSE_LAYOUT_VERSION=3

#
# defend img file update support
#
# CONFIG_DEFEND_IMG is not set

#
# Smartcard support
#
# CONFIG_AM_SMARTCARD is not set
CONFIG_AML_VIRTUAL_THERMAL=y
# CONFIG_AMLOGIC_THERMAL is not set
# CONFIG_AML_PLATFORM_THERMAL is not set
# CONFIG_AML_WDT is not set

#
Expand All @@ -1006,6 +1019,7 @@ CONFIG_AML_VIRTUAL_THERMAL=y
#
# USB Support
#
# CONFIG_AMLOGIC_USB_3 is not set
CONFIG_AMLOGIC_USB=y
CONFIG_USB_DWC_OTG_HCD=y
CONFIG_USB_HOST_ELECT_TEST=y
Expand Down Expand Up @@ -1051,12 +1065,13 @@ CONFIG_NAND_KEY_BLOCK_NUM=8
# Ethernet Support
#
CONFIG_AM_ETHERNET=y
CONFIG_AM_PHY=y
CONFIG_PHYLIB=y

#
# MII PHY device drivers
#
# CONFIG_AML_PHY is not set
CONFIG_AML_PHY=y
CONFIG_AML_LAN8720=y
CONFIG_AML_IP101_PHY=y
CONFIG_AML_KSZ8091=y
Expand Down Expand Up @@ -1118,6 +1133,7 @@ CONFIG_AML_VFM=y
CONFIG_AM_PTSSERVER=y
# CONFIG_H264_4K2K_SINGLE_CORE is not set
CONFIG_VSYNC_RDMA=y
# CONFIG_TVIN_VIUIN is not set
CONFIG_AM_VIDEO=y
# CONFIG_AM_VIDEO2 is not set
# CONFIG_KEEP_FRAME_RESERVED is not set
Expand Down Expand Up @@ -1155,6 +1171,7 @@ CONFIG_AM_DISPLAY_MODULE=y
#
CONFIG_AM_TV_OUTPUT=y
CONFIG_AML_VOUT_FRAMERATE_AUTOMATION=y
# CONFIG_AML_VDAC_HW_SWITCH is not set
# CONFIG_AM_LCD_OUTPUT is not set

#
Expand All @@ -1166,6 +1183,7 @@ CONFIG_AML_VOUT_FRAMERATE_AUTOMATION=y
# Amlogic TV LCD Support
#
# CONFIG_AML_TV_LCD is not set
# CONFIG_AML_TV_LCD_V2 is not set

#
# Amlogic osd module
Expand All @@ -1184,7 +1202,6 @@ CONFIG_FB_OSD1_DEFAULT_WIDTH=1280
CONFIG_FB_OSD1_DEFAULT_HEIGHT=720
CONFIG_FB_OSD1_DEFAULT_WIDTH_VIRTUAL=1280
CONFIG_FB_OSD1_DEFAULT_HEIGHT_VIRTUAL=1440
# CONFIG_FB_AMLOGIC_UMP is not set

#
# Amlogic osd_ext module
Expand All @@ -1202,12 +1219,17 @@ CONFIG_AM_GE2D=y
CONFIG_AM_LOGO=y
CONFIG_AM_HDMI_ONLY=y

#
# Amlogic Sys led Support
#
# CONFIG_AMLOGIC_SYS_LED is not set

#
# HDMI TX Support
#
# CONFIG_AML_HDMI_TX_20 is not set
CONFIG_AML_HDMI_TX=y
# CONFIG_AML_HDMI_TX_HDCP is not set
# CONFIG_AML_HDMI_TX_CTS_DVI is not set
# CONFIG_TVIN is not set
# CONFIG_AML_EXT_HDMIIN is not set
# CONFIG_DEBUG_DRIVER is not set
Expand Down Expand Up @@ -1257,6 +1279,7 @@ CONFIG_DEINTERLACE=y
# Amlogic DVB driver
#
# CONFIG_AM_DVB is not set
# CONFIG_AM_ATVDEMOD is not set

#
# AMLOGIC CI Driver
Expand Down Expand Up @@ -1301,8 +1324,7 @@ CONFIG_MESON6_GPU_EXTRA=y
#
# Amlogic Crypto Support
#
CONFIG_CRYPTO_AML_HW_CRYPRO=y
# CONFIG_CRYPTO_DEVICE_DRIVER is not set
CONFIG_CRYPTO_AML_HW_CRYPTO=y

#
# MHL Support
Expand Down Expand Up @@ -1659,6 +1681,8 @@ CONFIG_USB_NET_RNDIS_HOST=m
# CONFIG_USB_IPHETH is not set
# CONFIG_USB_SIERRA_NET is not set
# CONFIG_USB_VL600 is not set
# CONFIG_USB_NET_QF9700 is not set
# CONFIG_USB_NET_SR9600 is not set
CONFIG_WLAN=y
# CONFIG_LIBERTAS_THINFIRM is not set
# CONFIG_AT76C50X_USB is not set
Expand Down Expand Up @@ -1865,6 +1889,7 @@ CONFIG_HVC_DCC=y
CONFIG_HW_RANDOM=m
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_HW_RANDOM_ATMEL is not set
CONFIG_HW_RANDOM_MESON=m
# CONFIG_HW_RANDOM_EXYNOS is not set
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
Expand Down Expand Up @@ -2844,7 +2869,7 @@ CONFIG_USB_HIDDEV=y
# CONFIG_I2C_HID is not set
# CONFIG_USB_ARCH_HAS_OHCI is not set
# CONFIG_USB_ARCH_HAS_EHCI is not set
# CONFIG_USB_ARCH_HAS_XHCI is not set
CONFIG_USB_ARCH_HAS_XHCI=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=y
CONFIG_USB_ARCH_HAS_HCD=y
Expand All @@ -2867,6 +2892,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_XHCI_HCD is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_ISP1760_HCD is not set
Expand Down Expand Up @@ -3331,6 +3357,7 @@ CONFIG_FAT_FS=y
CONFIG_VFAT_FS=y
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
# CONFIG_EXFAT_FS is not set
# CONFIG_NTFS_FS is not set

#
Expand Down
69 changes: 0 additions & 69 deletions projects/WeTek_Play/patches/linux/000-svn_rev.patch

This file was deleted.

13 changes: 0 additions & 13 deletions projects/WeTek_Play/patches/linux/060-xattr.patch

This file was deleted.

Loading

0 comments on commit 144cf92

Please sign in to comment.