diff --git a/packages/linux-drivers/wetekdvb/package.mk b/packages/linux-drivers/wetekdvb/package.mk index 0cd802d890..0be31e6b9f 100644 --- a/packages/linux-drivers/wetekdvb/package.mk +++ b/packages/linux-drivers/wetekdvb/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="wetekdvb" -PKG_VERSION="20150503" +PKG_VERSION="20150930" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree" diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 5efec1a673..5cc4cece19 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -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) diff --git a/projects/WeTek_Play/linux/linux.arm.conf b/projects/WeTek_Play/linux/linux.arm.conf index a573d01e82..e9fe72cab7 100644 --- a/projects/WeTek_Play/linux/linux.arm.conf +++ b/projects/WeTek_Play/linux/linux.arm.conf @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 # @@ -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 @@ -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 @@ -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 @@ -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 # @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 # diff --git a/projects/WeTek_Play/patches/linux/000-svn_rev.patch b/projects/WeTek_Play/patches/linux/000-svn_rev.patch deleted file mode 100644 index 464e76af17..0000000000 --- a/projects/WeTek_Play/patches/linux/000-svn_rev.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naur linux-amlogic-3.10-fa4c242/drivers/amlogic/gpu/mali/Kbuild linux-amlogic-3.10-fa4c242.patch/drivers/amlogic/gpu/mali/Kbuild ---- linux-amlogic-3.10-fa4c242/drivers/amlogic/gpu/mali/Kbuild 2015-01-22 21:04:55.000000000 +0100 -+++ linux-amlogic-3.10-fa4c242.patch/drivers/amlogic/gpu/mali/Kbuild 2015-01-23 20:17:06.225678942 +0100 -@@ -220,32 +220,32 @@ - # Get subversion revision number, fall back to only ${MALI_RELEASE_NAME} if no svn info is available - MALI_RELEASE_NAME=$(shell cat $(TOP_KBUILD_SRC)$(DRIVER_DIR)/.version 2> /dev/null) - --SVN_INFO = (cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); svn info 2>/dev/null) -+#SVN_INFO = (cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); svn info 2>/dev/null) - --ifneq ($(shell $(SVN_INFO) 2>/dev/null),) --# SVN detected --SVN_REV := $(shell $(SVN_INFO) | grep '^Revision: '| sed -e 's/^Revision: //' 2>/dev/null) --DRIVER_REV := $(MALI_RELEASE_NAME)-r$(SVN_REV) --CHANGE_DATE := $(shell $(SVN_INFO) | grep '^Last Changed Date: ' | cut -d: -f2- | cut -b2-) --CHANGED_REVISION := $(shell $(SVN_INFO) | grep '^Last Changed Rev: ' | cut -d: -f2- | cut -b2-) --REPO_URL := $(shell $(SVN_INFO) | grep '^URL: ' | cut -d: -f2- | cut -b2-) -- --else # SVN --GIT_REV := $(shell cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); git describe --always 2>/dev/null) --ifneq ($(GIT_REV),) --# Git detected --DRIVER_REV := $(MALI_RELEASE_NAME)-$(GIT_REV) --CHANGE_DATE := $(shell cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); git log -1 --format="%ci") --CHANGED_REVISION := $(GIT_REV) --REPO_URL := $(shell cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); git describe --all --always 2>/dev/null) -+#ifneq ($(shell $(SVN_INFO) 2>/dev/null),) -+## SVN detected -+#SVN_REV := $(shell $(SVN_INFO) | grep '^Revision: '| sed -e 's/^Revision: //' 2>/dev/null) -+#DRIVER_REV := $(MALI_RELEASE_NAME)-r$(SVN_REV) -+#CHANGE_DATE := $(shell $(SVN_INFO) | grep '^Last Changed Date: ' | cut -d: -f2- | cut -b2-) -+#CHANGED_REVISION := $(shell $(SVN_INFO) | grep '^Last Changed Rev: ' | cut -d: -f2- | cut -b2-) -+#REPO_URL := $(shell $(SVN_INFO) | grep '^URL: ' | cut -d: -f2- | cut -b2-) -+ -+#else # SVN -+#GIT_REV := $(shell cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); git describe --always 2>/dev/null) -+#ifneq ($(GIT_REV),) -+## Git detected -+#DRIVER_REV := $(MALI_RELEASE_NAME)-$(GIT_REV) -+#CHANGE_DATE := $(shell cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); git log -1 --format="%ci") -+#CHANGED_REVISION := $(GIT_REV) -+#REPO_URL := $(shell cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); git describe --all --always 2>/dev/null) - --else # Git -+#else # Git - # No Git or SVN detected - DRIVER_REV := $(MALI_RELEASE_NAME) - CHANGE_DATE := $(MALI_RELEASE_NAME) - CHANGED_REVISION := $(MALI_RELEASE_NAME) --endif --endif -+#endif -+#endif - - ccflags-y += -DSVN_REV_STRING=\"$(DRIVER_REV)\" - -diff -Naur linux-amlogic-3.10-fa4c242/drivers/amlogic/gpu/ump/Kbuild linux-amlogic-3.10-fa4c242.patch/drivers/amlogic/gpu/ump/Kbuild ---- linux-amlogic-3.10-fa4c242/drivers/amlogic/gpu/ump/Kbuild 2015-01-22 21:04:55.000000000 +0100 -+++ linux-amlogic-3.10-fa4c242.patch/drivers/amlogic/gpu/ump/Kbuild 2015-01-23 20:18:02.544746215 +0100 -@@ -32,7 +32,8 @@ - UDD_FILE_PREFIX = ../mali/ - - # Get subversion revision number, fall back to 0000 if no svn info is available --SVN_REV := $(shell ((svnversion | grep -qv exported && echo -n 'Revision: ' && svnversion) || git svn info | sed -e 's/$$$$/M/' | grep '^Revision: ' || echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //') -+#SVN_REV := $(shell ((svnversion | grep -qv exported && echo -n 'Revision: ' && svnversion) || git svn info | sed -e 's/$$$$/M/' | grep '^Revision: ' || echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //') -+SVN_REV := $(shell (echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //') - - ccflags-y += -DSVN_REV=$(SVN_REV) - ccflags-y += -DSVN_REV_STRING=\"$(SVN_REV)\" diff --git a/projects/WeTek_Play/patches/linux/020-wetek_dvb_code.patch b/projects/WeTek_Play/patches/linux/010-wetek_dvb_code.patch similarity index 100% rename from projects/WeTek_Play/patches/linux/020-wetek_dvb_code.patch rename to projects/WeTek_Play/patches/linux/010-wetek_dvb_code.patch diff --git a/projects/WeTek_Play/patches/linux/040-no_dev_console.patch b/projects/WeTek_Play/patches/linux/020-no_dev_console.patch similarity index 100% rename from projects/WeTek_Play/patches/linux/040-no_dev_console.patch rename to projects/WeTek_Play/patches/linux/020-no_dev_console.patch diff --git a/projects/WeTek_Play/patches/linux/050-turn_power_led_into_standby_mode_after_poweroff.patch b/projects/WeTek_Play/patches/linux/030-turn_power_led_into_standby_mode_after_poweroff.patch similarity index 100% rename from projects/WeTek_Play/patches/linux/050-turn_power_led_into_standby_mode_after_poweroff.patch rename to projects/WeTek_Play/patches/linux/030-turn_power_led_into_standby_mode_after_poweroff.patch diff --git a/projects/WeTek_Play/patches/linux/070-amports_ignore_fec_control.patch b/projects/WeTek_Play/patches/linux/040-amports_ignore_fec_control.patch similarity index 100% rename from projects/WeTek_Play/patches/linux/070-amports_ignore_fec_control.patch rename to projects/WeTek_Play/patches/linux/040-amports_ignore_fec_control.patch diff --git a/projects/WeTek_Play/patches/linux/201-update_nand_partition_layout.patch b/projects/WeTek_Play/patches/linux/050-update_nand_partition_layout.patch similarity index 100% rename from projects/WeTek_Play/patches/linux/201-update_nand_partition_layout.patch rename to projects/WeTek_Play/patches/linux/050-update_nand_partition_layout.patch diff --git a/projects/WeTek_Play/patches/linux/203-wetek-dvb-less-log-spam.patch b/projects/WeTek_Play/patches/linux/060-wetek-dvb-less-log-spam.patch similarity index 100% rename from projects/WeTek_Play/patches/linux/203-wetek-dvb-less-log-spam.patch rename to projects/WeTek_Play/patches/linux/060-wetek-dvb-less-log-spam.patch diff --git a/projects/WeTek_Play/patches/linux/060-xattr.patch b/projects/WeTek_Play/patches/linux/060-xattr.patch deleted file mode 100644 index 98676ee158..0000000000 --- a/projects/WeTek_Play/patches/linux/060-xattr.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h -index e4629b9..f7a2d1f 100644 ---- a/include/uapi/linux/xattr.h -+++ b/include/uapi/linux/xattr.h -@@ -10,6 +10,8 @@ - #ifndef _UAPI_LINUX_XATTR_H - #define _UAPI_LINUX_XATTR_H - -+#define __USE_KERNEL_XATTR_DEFS -+ - #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ - diff --git a/projects/WeTek_Play/patches/linux/linux-010_tivo_slide_pro.patch b/projects/WeTek_Play/patches/linux/070-linux-010_tivo_slide_pro.patch similarity index 100% rename from projects/WeTek_Play/patches/linux/linux-010_tivo_slide_pro.patch rename to projects/WeTek_Play/patches/linux/070-linux-010_tivo_slide_pro.patch diff --git a/projects/WeTek_Play/patches/linux/070-remove-amvideocap-spam.patch b/projects/WeTek_Play/patches/linux/070-remove-amvideocap-spam.patch deleted file mode 100644 index ac3a45cb05..0000000000 --- a/projects/WeTek_Play/patches/linux/070-remove-amvideocap-spam.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- a/drivers/amlogic/amports/amvideocap.c 2015-01-12 19:17:17.003191369 +0100 -+++ b/drivers/amlogic/amports/amvideocap.c 2015-01-12 19:20:50.855003956 +0100 -@@ -163,13 +163,13 @@ - //printk("vf->type:0x%x\n", vf->type); - - if ((vf->type & VIDTYPE_VIU_422) == VIDTYPE_VIU_422) { -- printk("********************Into VIDTYPE_VIU_422*********************\n"); -+ //printk("********************Into VIDTYPE_VIU_422*********************\n"); - format = GE2D_FORMAT_S16_YUV422; - } else if ((vf->type & VIDTYPE_VIU_444) == VIDTYPE_VIU_444) { -- printk("********************Into VIDTYPE_VIU_444*********************\n"); -+ //printk("********************Into VIDTYPE_VIU_444*********************\n"); - format = GE2D_FORMAT_S24_YUV444; - } else if((vf->type & VIDTYPE_VIU_NV21) == VIDTYPE_VIU_NV21){ -- printk("********************Into VIDTYPE_VIU_NV21*********************\n"); -+ //printk("********************Into VIDTYPE_VIU_NV21*********************\n"); - format= GE2D_FORMAT_M24_NV21; - } - return format; -@@ -195,13 +195,13 @@ - printk("%s: failed to alloc y addr\n", __FUNCTION__); - return -1; - } -- printk("RGB_phy_addr:%x\n", (unsigned int)priv->phyaddr); -+ //printk("RGB_phy_addr:%x\n", (unsigned int)priv->phyaddr); - RGB_addr = (unsigned long)priv->vaddr; - if (!RGB_addr) { - printk("%s: failed to remap y addr\n", __FUNCTION__); - return -1; - } -- printk("RGB_addr:%x\n", (unsigned int)RGB_addr); -+ //printk("RGB_addr:%x\n", (unsigned int)RGB_addr); - - if(vf == NULL) { - printk("%s: vf is NULL\n", __FUNCTION__); -@@ -250,7 +250,7 @@ - canvas_read(y_index, &cs0); - canvas_read(u_index, &cs1); - canvas_read(v_index, &cs2); -- printk("y_index=[0x%x] u_index=[0x%x] cur_index:%x\n", y_index, u_index, cur_index); -+ //printk("y_index=[0x%x] u_index=[0x%x] cur_index:%x\n", y_index, u_index, cur_index); - ge2d_config.src_planes[0].addr = cs0.addr; - ge2d_config.src_planes[0].w = cs0.width; - ge2d_config.src_planes[0].h = cs0.height; -@@ -260,7 +260,7 @@ - ge2d_config.src_planes[2].addr = cs2.addr; - ge2d_config.src_planes[2].w = cs2.width; - ge2d_config.src_planes[2].h = cs2.height; -- printk("w=%d-height=%d cur_index:%x\n", cs0.width, cs0.height, cur_index); -+ //printk("w=%d-height=%d cur_index:%x\n", cs0.width, cs0.height, cur_index); - - ge2d_config.src_key.key_enable = 0; - ge2d_config.src_key.key_mask = 0; -@@ -282,7 +282,7 @@ - - - canvas_read(canvas_idx, &cd); -- printk("cd.addr:%x\n", (unsigned int)cd.addr); -+ //printk("cd.addr:%x\n", (unsigned int)cd.addr); - ge2d_config.dst_planes[0].addr = cd.addr; - ge2d_config.dst_planes[0].w = cd.width; - ge2d_config.dst_planes[0].h = cd.height; -@@ -349,7 +349,7 @@ - int curindex; - vframe_t *vf = vfput; - int ret = 0; -- printk("%s:start vf=%p,index=%x\n", __func__,vf,index); -+ //printk("%s:start vf=%p,index=%x\n", __func__,vf,index); - if (!vf) { - ret = amvideocap_capture_get_frame(priv, &vf, &curindex); - }else{ -@@ -358,7 +358,7 @@ - if (ret < 0 || !vf) { - return -EAGAIN; - } -- printk("%s: get vf type=%x\n", __func__,vf->type); -+ //printk("%s: get vf type=%x\n", __func__,vf->type); - - - #define CHECK_AND_SETVAL(val,want,def) (val)=(want)>0?(want):(def) -@@ -374,7 +374,7 @@ - amvideocap_capture_put_frame(priv, vf); - - if (!ret) { -- printk("%s: capture ok priv->want.fmt=%d\n", __func__,priv->want.fmt); -+ //printk("%s: capture ok priv->want.fmt=%d\n", __func__,priv->want.fmt); - priv->state = AMVIDEOCAP_STATE_FINISHED_CAPTURE; - priv->src.width=vf->width; - priv->src.height=vf->height; -@@ -387,7 +387,7 @@ - }else{ - priv->state = AMVIDEOCAP_STATE_ERROR; - } -- printk("amvideocap_capture_one_frame priv->state=%d\n", priv->state); -+ //printk("amvideocap_capture_one_frame priv->state=%d\n", priv->state); - return ret; - } - static int amvideocap_capture_one_frame_callback(unsigned long data, vframe_t *vfput, int index) -@@ -427,7 +427,7 @@ - } - } else { - ret = amvideocap_capture_one_frame(priv, NULL, 0); -- printk("amvideocap_capture_one_frame_wait ret=%d\n", ret); -+ //printk("amvideocap_capture_one_frame_wait ret=%d\n", ret); - } - } while (ret == -EAGAIN && time_before(jiffies, timeout)); - ext_register_end_frame_callback(NULL);/*del req*/ -@@ -606,7 +606,7 @@ - printk("set_cached: failed remap_pfn_range\n"); - return -EAGAIN; - } -- printk("amvideocap_mmap ok\n"); -+ //printk("amvideocap_mmap ok\n"); - return 0; - } - static ssize_t amvideocap_read(struct file *file, char __user *buf, size_t count, loff_t * ppos) -@@ -626,12 +626,12 @@ - waitdelay=file->f_flags & O_NONBLOCK ? HZ/100 : HZ * 10; - } - if(!pos){/*trigger a new capture,*/ -- printk("start amvideocap_read waitdelay=%d\n",waitdelay); -+ //printk("start amvideocap_read waitdelay=%d\n",waitdelay); - ret = amvideocap_capture_one_frame_wait(priv,waitdelay); -- printk("amvideocap_read=%d,priv->state=%d,priv->vaddr=%p\n", ret,priv->state,priv->vaddr); -+ //printk("amvideocap_read=%d,priv->state=%d,priv->vaddr=%p\n", ret,priv->state,priv->vaddr); - if ((ret == 0) && (priv->state==AMVIDEOCAP_STATE_FINISHED_CAPTURE) && (priv->vaddr != NULL)) { - int size = min((int)count, (priv->out.byte_per_pix * priv->out.width_aligned* priv->out.height)); -- printk("priv->out_width=%d priv->out_height=%d priv->outfmt_byteppix=%d, size=%d\n", priv->out.width,priv->out.height,priv->out.byte_per_pix,size); -+ //printk("priv->out_width=%d priv->out_height=%d priv->outfmt_byteppix=%d, size=%d\n", priv->out.width,priv->out.height,priv->out.byte_per_pix,size); - copied=copy_to_user(buf, priv->vaddr, size); - if(copied){ - printk("amvideocap_read %d copy_to_user failed \n",size); -@@ -646,7 +646,7 @@ - int maxsize = priv->out.byte_per_pix * priv->out.width_aligned* priv->out.height; - if(posvaddr+pos, rsize); - if(copied){ - printk("amvideocap_read11 %d copy_to_user failed \n",rsize); diff --git a/projects/WeTek_Play/patches/linux/100-fix-23hzpixelclock.patch b/projects/WeTek_Play/patches/linux/100-fix-23hzpixelclock.patch deleted file mode 100644 index 958ac795c1..0000000000 --- a/projects/WeTek_Play/patches/linux/100-fix-23hzpixelclock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/amlogic/display/vout/tvconf.c.orig 2015-01-14 22:43:43.861634189 +0100 -+++ b/drivers/amlogic/display/vout/tvconf.c 2015-01-14 22:46:45.289865564 +0100 -@@ -390,7 +390,7 @@ - .aspect_ratio_den = 9, - .sync_duration_num = 2397, - .sync_duration_den = 100, -- .video_clk = 74250000, -+ .video_clk = 74176000,//74250000, - }, - #endif - { /* VMODE_4K2K_30HZ */ diff --git a/projects/WeTek_Play/patches/linux/202-disable_ethernet_mac_update_from_nand.patch b/projects/WeTek_Play/patches/linux/202-disable_ethernet_mac_update_from_nand.patch deleted file mode 100644 index 07ce5aac14..0000000000 --- a/projects/WeTek_Play/patches/linux/202-disable_ethernet_mac_update_from_nand.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/amlogic/ethernet/am_net8218.c b/drivers/amlogic/ethernet/am_net8218.c -index aec2980..697984f 100755 ---- a/drivers/amlogic/ethernet/am_net8218.c -+++ b/drivers/amlogic/ethernet/am_net8218.c -@@ -890,7 +890,7 @@ static int mac_pmt_enable(unsigned int enable) - * @return - */ - /* --------------------------------------------------------------------------*/ --//#undef CONFIG_AML_NAND_KEY -+#undef CONFIG_AML_NAND_KEY - #ifdef CONFIG_AML_NAND_KEY - extern int get_aml_key_kernel(const char* key_name, unsigned char* data, int ascii_flag); - extern int extenal_api_key_set_version(char *devvesion); diff --git a/tools/mkpkg/mkpkg_linux-amlogic b/tools/mkpkg/mkpkg_linux-amlogic index 999fc0fbfe..5ffef44ace 100755 --- a/tools/mkpkg/mkpkg_linux-amlogic +++ b/tools/mkpkg/mkpkg_linux-amlogic @@ -21,7 +21,7 @@ echo "getting sources..." if [ ! -d linux-amlogic.git ]; then - git clone https://github.com/codesnake/linux-amlogic linux-amlogic.git + git clone https://github.com/codesnake/linux linux-amlogic.git fi cd linux-amlogic.git