summaryrefslogtreecommitdiffstats
path: root/meta-tlk/recipes-kernel/linux/files
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2017-05-30 15:04:17 -0700
committerSaul Wold <sgw@linux.intel.com>2017-07-06 15:58:01 -0700
commitcb55344928f13306feaf57dd1435913415d9122e (patch)
tree96a1e8d8ef53099cda4dc8eb84444989a3174930 /meta-tlk/recipes-kernel/linux/files
parent931e708262a973bd6ea1b87631d1f907b972a92b (diff)
downloadmeta-intel-cb55344928f13306feaf57dd1435913415d9122e.tar.gz
meta-tlk: merge linux-yocto_tlk.inc with bbappend
Only one recipe uses this .inc file, and we need to add a linux-intel bbappend that is slightly different, so this .inc file will not be appropriate there either. Instead just keep everything in the bbappend. We can reuse the time-limited-kernel config fragment, so move that to a neutral location as well. Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta-tlk/recipes-kernel/linux/files')
-rw-r--r--meta-tlk/recipes-kernel/linux/files/time-limited-kernel.cfg3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta-tlk/recipes-kernel/linux/files/time-limited-kernel.cfg b/meta-tlk/recipes-kernel/linux/files/time-limited-kernel.cfg
new file mode 100644
index 00000000..44f4beaa
--- /dev/null
+++ b/meta-tlk/recipes-kernel/linux/files/time-limited-kernel.cfg
@@ -0,0 +1,3 @@
1CONFIG_UPTIME_LIMITED_KERNEL=y
2CONFIG_UPTIME_LIMIT_DURATION=14400
3CONFIG_UPTIME_LIMIT_KERNEL_REBOOT=y