diff --git a/patches/example_imx_v6_v7_defconfig b/patches/example_imx_v6_v7_defconfig index 29e7f0abdccbb625abe628fef06234b6cf6e79f6..66f9aa91f916645bc4dc79ef63239562be02c637 100644 --- a/patches/example_imx_v6_v7_defconfig +++ b/patches/example_imx_v6_v7_defconfig @@ -536,6 +536,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y # CONFIG_FRONTSWAP is not set # CONFIG_CMA is not set # CONFIG_ZBUD is not set +# CONFIG_ZSMALLOC is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set @@ -2545,7 +2546,6 @@ CONFIG_STAGING=y # CONFIG_TRANZPORT is not set # CONFIG_LINE6_USB is not set # CONFIG_VT6656 is not set -# CONFIG_ZSMALLOC is not set # CONFIG_USB_ENESTORAGE is not set # CONFIG_BCM_WIMAX is not set # CONFIG_FT1000 is not set diff --git a/patches/example_omap2plus_defconfig b/patches/example_omap2plus_defconfig index 1a3fa97dfe8beec9c75f367391712a0684d90861..6fb48a44c6a96dbb616013f7413884490f2b1b3c 100644 --- a/patches/example_omap2plus_defconfig +++ b/patches/example_omap2plus_defconfig @@ -535,6 +535,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set # CONFIG_ZBUD is not set +# CONFIG_ZSMALLOC is not set CONFIG_FORCE_MAX_ZONEORDER=12 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set diff --git a/patches/ref_multi_v7_defconfig b/patches/ref_multi_v7_defconfig index f984611b8318abd4825e5da8944391fa33ae508a..ad36f1dd3c01909337b190abd0f3f319dbacb7b7 100644 --- a/patches/ref_multi_v7_defconfig +++ b/patches/ref_multi_v7_defconfig @@ -603,6 +603,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y # CONFIG_FRONTSWAP is not set # CONFIG_CMA is not set # CONFIG_ZBUD is not set +# CONFIG_ZSMALLOC is not set CONFIG_FORCE_MAX_ZONEORDER=12 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set diff --git a/tools/config-checker.sh b/tools/config-checker.sh index 72b47fba26115f7a4fb18be18636562a4b3b9e27..ac737ad512238b9ae0d158614ff7d5073da28d4e 100755 --- a/tools/config-checker.sh +++ b/tools/config-checker.sh @@ -498,8 +498,6 @@ check_config_builtin #check_config_disabled #zram -config="CONFIG_STAGING" -check_config_builtin config="CONFIG_ZSMALLOC" check_config_builtin config="CONFIG_ZRAM" diff --git a/version.sh b/version.sh index 7e910d72d22566578ad864290c87bf93363ade1a..8d247f58d22ed4d2a8bd5d5091ca98ea3134e765 100644 --- a/version.sh +++ b/version.sh @@ -29,10 +29,10 @@ toolchain="gcc_linaro_gnueabihf_4_8" #Kernel/Build KERNEL_REL=3.13 KERNEL_TAG=${KERNEL_REL} -BUILD=armv7-devel-r37 +BUILD=armv7-devel-r38 #v3.X-rcX + upto SHA -KERNEL_SHA="cdfc83075fb76369a31e6c187d0cebcab9f8b9c8" +KERNEL_SHA="e7651b819e90da924991d727d3c007200a18670d" #git branch #BRANCH="v3.13.x"