Merge pull request #2404 from kszaq/amlogic_kernel_update

projects/Amlogic: update kernel version and kernel config
This commit is contained in:
Radostan Riedel 2018-01-10 21:34:49 +01:00 committed by GitHub
commit 883f1ba311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 324 additions and 294 deletions

View File

@ -39,8 +39,8 @@ case "$LINUX" in
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET aml-dtbtools:host"
;;
amlogic-3.14)
PKG_VERSION="0228a64"
PKG_SHA256="72204f928bd63e021a973fbe6efe068461f8ece4fab6ee41ccf6235763be9042"
PKG_VERSION="9ccf3f0"
PKG_SHA256="0b5f0ecffe6ceb0e31dfc6c27ba328d0682b05723fe88a2f5c4cf6ceb7b7565f"
PKG_URL="https://github.com/LibreELEC/linux-amlogic/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_DIR="$PKG_NAME-amlogic-$PKG_VERSION*"
PKG_PATCH_DIRS="amlogic-3.14"

File diff suppressed because it is too large Load Diff

View File

@ -1,14 +0,0 @@
diff --git a/kernel/power/main.c b/kernel/power/main.c
index dd56bc8..6e73ad4 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -362,6 +362,9 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
error = 0;
request_suspend_state(state);
}
+ if (state == PM_SUSPEND_MEM) {
+ msleep_interruptible(5000);
+ }
#else
error = pm_suspend(state);
#endif