From 594e2a656efceb16a74b67c38377e3d42bc80244 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sat, 16 Dec 2017 11:08:15 +0100 Subject: [PATCH] linux: update rockchip-4.4 to 28018092 --- packages/linux/package.mk | 4 ++-- .../devices/TinkerBoard/linux/rockchip-4.4/linux.arm.conf | 2 ++ projects/Rockchip/linux/rockchip-4.4/linux.aarch64.conf | 2 ++ projects/Rockchip/linux/rockchip-4.4/linux.arm.conf | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index db6b5d2d61..e9e58d24cd 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -47,8 +47,8 @@ case "$LINUX" in PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET aml-dtbtools:host" ;; rockchip-4.4) - PKG_VERSION="bbea8b14" - PKG_SHA256="6485f7ecbe4eac424b43df774fdce8c62b97ac7d9d406740d9fafb9f6a84e8af" + PKG_VERSION="28018092" + PKG_SHA256="944b59f3b8fd9c1e37ea717e600651f9e49f3f01e2e9290d00386dec1789bf83" PKG_URL="https://github.com/rockchip-linux/kernel/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_DIR="kernel-$PKG_VERSION*" PKG_PATCH_DIRS="rockchip-4.4" diff --git a/projects/Rockchip/devices/TinkerBoard/linux/rockchip-4.4/linux.arm.conf b/projects/Rockchip/devices/TinkerBoard/linux/rockchip-4.4/linux.arm.conf index da63cd2875..8bee659376 100644 --- a/projects/Rockchip/devices/TinkerBoard/linux/rockchip-4.4/linux.arm.conf +++ b/projects/Rockchip/devices/TinkerBoard/linux/rockchip-4.4/linux.arm.conf @@ -2132,6 +2132,7 @@ CONFIG_DEVFREQ_THERMAL=y # CONFIG_THERMAL_EMULATION is not set # CONFIG_IMX_THERMAL is not set CONFIG_ROCKCHIP_THERMAL=y +CONFIG_RK_VIRTUAL_THERMAL=y # CONFIG_RK3368_THERMAL is not set CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_CORE is not set @@ -3198,6 +3199,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # # CONFIG_LEDS_TRIGGER_TRANSIENT is not set # CONFIG_LEDS_TRIGGER_CAMERA is not set +# CONFIG_LEDS_TRIGGER_MULTI_CTRL is not set # CONFIG_SWITCH is not set # CONFIG_ACCESSIBILITY is not set CONFIG_EDAC_ATOMIC_SCRUB=y diff --git a/projects/Rockchip/linux/rockchip-4.4/linux.aarch64.conf b/projects/Rockchip/linux/rockchip-4.4/linux.aarch64.conf index f4daf099f8..f0b92a7106 100644 --- a/projects/Rockchip/linux/rockchip-4.4/linux.aarch64.conf +++ b/projects/Rockchip/linux/rockchip-4.4/linux.aarch64.conf @@ -2277,6 +2277,7 @@ CONFIG_DEVFREQ_THERMAL=y # CONFIG_THERMAL_EMULATION is not set # CONFIG_IMX_THERMAL is not set CONFIG_ROCKCHIP_THERMAL=y +CONFIG_RK_VIRTUAL_THERMAL=y # CONFIG_RK3368_THERMAL is not set CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_CORE is not set @@ -3413,6 +3414,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # # CONFIG_LEDS_TRIGGER_TRANSIENT is not set # CONFIG_LEDS_TRIGGER_CAMERA is not set +# CONFIG_LEDS_TRIGGER_MULTI_CTRL is not set # CONFIG_SWITCH is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set diff --git a/projects/Rockchip/linux/rockchip-4.4/linux.arm.conf b/projects/Rockchip/linux/rockchip-4.4/linux.arm.conf index 5f3dd906f1..3ccdeec7b9 100644 --- a/projects/Rockchip/linux/rockchip-4.4/linux.arm.conf +++ b/projects/Rockchip/linux/rockchip-4.4/linux.arm.conf @@ -2132,6 +2132,7 @@ CONFIG_DEVFREQ_THERMAL=y # CONFIG_THERMAL_EMULATION is not set # CONFIG_IMX_THERMAL is not set CONFIG_ROCKCHIP_THERMAL=y +CONFIG_RK_VIRTUAL_THERMAL=y # CONFIG_RK3368_THERMAL is not set CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_CORE is not set @@ -3198,6 +3199,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # # CONFIG_LEDS_TRIGGER_TRANSIENT is not set # CONFIG_LEDS_TRIGGER_CAMERA is not set +# CONFIG_LEDS_TRIGGER_MULTI_CTRL is not set # CONFIG_SWITCH is not set # CONFIG_ACCESSIBILITY is not set CONFIG_EDAC_ATOMIC_SCRUB=y