main/linux-rpi: enable zram

settings taken from https://github.com/raspberrypi/linux/issues/894

3 files changed, 19 insertions, 9 deletions

diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index dc95820daf..fac15ed08d 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -6,7 +6,7 @@ case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux kernel with Raspberry Pi patches"
 url=https://github.com/raspberrypi/linux
 depends="mkinitfs linux-firmware"
@@ -202,8 +202,8 @@ md5sums="9a78fa2eb6c68ca5a40ed5af08142599  linux-4.4.tar.xz
 b66e8aa4991ca5c2ccd61559ed7e6491  gpio-mcp23s08-pullups.patch
 5508d2b3e5967bd57f92f551d90b3e54  rotary-encoder-fix.patch
 29281b74d2cef6965fa4ab6d826a2aa4  issue-4973.patch
-488b5bf00d6d9dfc0be1a29f9ca9c37e  config-rpi.armhf
-e6fcd3178e3b77046cf35b77b28871ea  config-rpi2.armhf
+be796ac6943a517f458f1d7e4c945a21  config-rpi.armhf
+4c7a6496c6bc579b5fc2323cfd397a0d  config-rpi2.armhf
 e587cae1dca2f5992555d9bcf53deecf  markdt"
 sha256sums="401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2  linux-4.4.tar.xz
 394c3970865c092f21cd02b8f433024adbf8539114567d6bde197fed6612f553  patch-4.4.11.xz
@@ -212,8 +212,8 @@ sha256sums="401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2  li
 b389a556bbd98053881b43deef1adf20640f980557c5f37cfd7ece2daeecbda9  gpio-mcp23s08-pullups.patch
 ab6740577fe8c1d71d2c716720ebbbf9a750985963d6938093b4ca9194b6e871  rotary-encoder-fix.patch
 3a16e927ce53a8c56e7f1dd86fe8ad08b1c06466f5206c521a7e2de1e4796d6c  issue-4973.patch
-cd0ac8a7d50fcf22594d26e06b8aa48a88b899f6bbaea69931cded65bb64dc71  config-rpi.armhf
-df59e22f99720769b2296e1e1f117dcae37a9c6eca6bdaabed5814ee40bd4c3c  config-rpi2.armhf
+12967b9599ab956bce1d4bd522257be2b6b5cc02c990c9dc86d13c77464d8675  config-rpi.armhf
+e8794c7524340ac0c41c90cec7fe6988d5e8eaecf5723a0af5c0f182c74ae39b  config-rpi2.armhf
 0f6681fc5c3590e1dbe13a2bde796403bd1529cf0fe19720899eaa0db79bcb49  markdt"
 sha512sums="13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e  linux-4.4.tar.xz
 697e6dd2b85da13ae65ac70b9654c9c3fa00c3120d425fdb53104fc234457cda40b9f0ebe29e7ae5c1a191730666c0bbd291721b16623ee8e402287771f20def  patch-4.4.11.xz
@@ -222,6 +222,6 @@ abe4d482a98450335eb935cf49be468accc8955a464553c45280f15d4114a87e96b158800536c2f6
 36724ba56cb8fdf3a3d347cffb67ae1cc3d7b1052d526b6b5134ebf6baae9f9724b586c97833453dc7697ab24699426f0749af78b6a80be36967a80033a0cf40  gpio-mcp23s08-pullups.patch
 3a711e2cdb6c0ecaceb3755437d38626dec8403e8aa167a6e16f64d8a8b7cc5bdc7e04aa7c05938719ebc90e319ec4124ee2151a7855e7838ee143b62d140ad0  rotary-encoder-fix.patch
 501c91bf2538a18102da59bbccc3097f9c3c90079acc0e946ff075074160c09b8a66934e5ce5470e170f0e4f93d114709a95230367426d0bb7ea02c4bdf4cc9b  issue-4973.patch
-9e1e54c1a9e5a5cce72d96c875e759b1354ab8fbf4a09eeb1d21078de1b43a2d762bac6351e9df959930c0f08bf62696efb80b6cae17af7203860f62d78b6597  config-rpi.armhf
-e7cb9c2bb045a51b84dd68eddb65efe2be2645e65f869bb080994984bae8deb2db5cab2d65951d1a33919f620f6685485cf5856905a840c0d0dc5ff9e7071108  config-rpi2.armhf
+ea032eaad9a748a838386fa6f3ef7695dcda194fa0eaa46875c4c0913803cba4f4a1be1be51887d32682df1d120a361048cc24ac574ac394f08de125ce7fb10f  config-rpi.armhf
+888326dc898b4572d829f93914203fea91b6f0e764bbe611ec0d019f756510ec9ad7d10a923ac3b15086eb9bfc1c999d2669776ac44948b2b8cf2a0cd6c496e8  config-rpi2.armhf
 a4ecd1f48db64f9d6a189250d1937d7f2cd3a049a3d24cc527d04d05db06137722f1ba44bcd6033794781c3f2cfe2fbe065410a16de4bfdf4b1cd95d89322a77  markdt"
diff --git a/main/linux-rpi/config-rpi.armhf b/main/linux-rpi/config-rpi.armhf
index 4f16fb9924..1f80bb79aa 100644
--- a/main/linux-rpi/config-rpi.armhf
+++ b/main/linux-rpi/config-rpi.armhf
@@ -438,7 +438,9 @@ CONFIG_CMA_AREAS=7
 # CONFIG_ZSWAP is not set
 # CONFIG_ZPOOL is not set
 # CONFIG_ZBUD is not set
-# CONFIG_ZSMALLOC is not set
+CONFIG_ZSMALLOC=m
+CONFIG_PGTABLE_MAPPING=y
+# CONFIG_ZSMALLOC_STAT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_FRAME_VECTOR=y
 CONFIG_FORCE_MAX_ZONEORDER=11
@@ -1269,6 +1271,8 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
+CONFIG_ZRAM=m
+CONFIG_ZRAM_LZ4_COMPRESS=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
@@ -4927,6 +4931,7 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=m
 CONFIG_XZ_DEC=m
 # CONFIG_XZ_DEC_X86 is not set
diff --git a/main/linux-rpi/config-rpi2.armhf b/main/linux-rpi/config-rpi2.armhf
index 008e4937a5..fab3376300 100644
--- a/main/linux-rpi/config-rpi2.armhf
+++ b/main/linux-rpi/config-rpi2.armhf
@@ -476,7 +476,9 @@ CONFIG_CMA_AREAS=7
 # CONFIG_ZSWAP is not set
 # CONFIG_ZPOOL is not set
 # CONFIG_ZBUD is not set
-# CONFIG_ZSMALLOC is not set
+CONFIG_ZSMALLOC=m
+CONFIG_PGTABLE_MAPPING=y
+# CONFIG_ZSMALLOC_STAT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_FRAME_VECTOR=y
 CONFIG_FORCE_MAX_ZONEORDER=11
@@ -1328,6 +1330,8 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
+CONFIG_ZRAM=m
+CONFIG_ZRAM_LZ4_COMPRESS=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
@@ -5000,6 +5004,7 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=m
 CONFIG_XZ_DEC=m
 # CONFIG_XZ_DEC_X86 is not set