diff --git a/srcpkgs/cubieboard2-kernel/files/config b/srcpkgs/cubieboard2-kernel/files/config index 7ee6131bc2f..52fc60f7374 100644 --- a/srcpkgs/cubieboard2-kernel/files/config +++ b/srcpkgs/cubieboard2-kernel/files/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.75 Kernel Configuration +# Linux/arm 3.4.79 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -162,6 +162,8 @@ CONFIG_HAVE_OPROFILE=y CONFIG_JUMP_LABEL=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y @@ -327,7 +329,6 @@ CONFIG_ARCH_SUN7I=y # CONFIG_SW_DEBUG_UART=0 CONFIG_SUNXI_MULTIPLATFORM=y -CONFIG_SUNXI_MALI_RESERVED_MEM=y CONFIG_SUNXI_SCALING_MIN=60 CONFIG_PLAT_SUNXI=y @@ -432,9 +433,11 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_COMPACTION is not set +CONFIG_MIGRATION=y # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y @@ -1039,6 +1042,19 @@ CONFIG_REGMAP_SPI=y CONFIG_DMA_SHARED_BUFFER=y CONFIG_SYNC=y # CONFIG_SW_SYNC is not set +CONFIG_CMA=y +# CONFIG_CMA_DEBUG is not set + +# +# Default contiguous memory area size: +# +CONFIG_CMA_SIZE_MBYTES=16 +CONFIG_CMA_SIZE_SEL_MBYTES=y +# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SIZE_SEL_MIN is not set +# CONFIG_CMA_SIZE_SEL_MAX is not set +CONFIG_CMA_ALIGNMENT=8 +CONFIG_CMA_AREAS=7 # CONFIG_CONNECTOR is not set CONFIG_MTD=y # CONFIG_MTD_TESTS is not set @@ -1143,7 +1159,6 @@ CONFIG_SUNXI_NAND_COMPAT_DEV=y # CONFIG_SENSORS_LIS3LV02D is not set # CONFIG_AD525X_DPOT is not set CONFIG_SUN4I_VIBRATOR=m -CONFIG_SUN4I_GPIO_UGLY=m CONFIG_SUNXI_DBGREG=y # CONFIG_ATMEL_PWM is not set CONFIG_SUNXI_PWM=y @@ -1785,7 +1800,6 @@ CONFIG_GPIO_SUNXI=m # MODULbus GPIO expanders: # CONFIG_W1=y -CONFIG_W1_SUNXI=m # # 1-wire Bus Masters diff --git a/srcpkgs/cubieboard2-kernel/template b/srcpkgs/cubieboard2-kernel/template index 50a492ee67a..b86ef68d68a 100644 --- a/srcpkgs/cubieboard2-kernel/template +++ b/srcpkgs/cubieboard2-kernel/template @@ -1,18 +1,18 @@ # Template file for 'cubieboard2-kernel' # -# Latest commit as of 20140126 -_githash="9cfbbed3b2b098774b04553843d2f4092b8f7fe8" +# Latest commit as of 20140209 +_githash="0c92978520e9576a0631da949c13e79bae846494" _gitshort="${_githash:0:7}" pkgname=cubieboard2-kernel -version=3.4.75 -revision=4 +version=3.4.79 +revision=1 maintainer="Juan RP " homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules for the Cubieboard2 (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/linux-sunxi/linux-sunxi/archive/${_githash}.tar.gz" -checksum=c9dc6689a9152f3a60459896926183cc5d04428c1a6ed44c20b3e342771b0dc1 +checksum=b90179614b3a5506bcea9f2fab1b7bfd55371d0cf211c04342e6e6756758c33a wrksrc="linux-sunxi-${_githash}" _kernver="${version}_${revision}"