diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-25 17:23:53 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-25 17:23:53 +0100 |
| commit | 1e7621172fd201db6677853db31d958c8ffb4ec2 (patch) | |
| tree | 8ee022dad81cc079e91bff67b092a3c13ddc4248 | |
| parent | 9fece56d0bc998262af845ae1c3267d82fff4f6e (diff) | |
| parent | 13f60ace523c24e2c4cc3db7635171318dc21b82 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/libcec/Makefile | 5 | ||||
| -rw-r--r-- | target/arm/kernel/raspberry-pi | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.cpu | 60 |
3 files changed, 65 insertions, 1 deletions
diff --git a/package/libcec/Makefile b/package/libcec/Makefile index dcf6e2580..7cfd8f369 100644 --- a/package/libcec/Makefile +++ b/package/libcec/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libcec PKG_VERSION:= 2.1.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= d65e52ab3295e9e4b73bf4580f3bd4f7 PKG_DESCR:= control your device with your TV remote control PKG_SECTION:= libs @@ -34,5 +34,8 @@ libcec-install: $(INSTALL_DIR) $(IDIR_LIBCEC)/usr/lib $(CP) $(WRKINST)/usr/lib/libcec*.so* \ $(IDIR_LIBCEC)/usr/lib + $(INSTALL_DIR) $(IDIR_LIBCEC)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/cec-client \ + $(IDIR_LIBCEC)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi index 82f9b77a8..debb98417 100644 --- a/target/arm/kernel/raspberry-pi +++ b/target/arm/kernel/raspberry-pi @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_FIQ=y CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_KUSER_HELPERS=y CONFIG_HIGH_RES_TIMERS=y CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu index 17e82c3c3..678cb5696 100644 --- a/target/linux/config/Config.in.cpu +++ b/target/linux/config/Config.in.cpu @@ -36,3 +36,63 @@ config ADK_KERNEL_USE_GENERIC_SMP_HELPERS config ADK_KERNEL_VFP boolean +menu "CPU support" + +config ADK_KERNEL_CPU_FREQ + boolean + default n + +config ADK_KERNEL_CPU_FREQ_GOV_PERFORMANCE + boolean + default n + +config ADK_KERNEL_CPU_FREQ_GOV_POWERSAVE + boolean + default n + +config ADK_KERNEL_CPU_FREQ_GOV_USERSPACE + boolean + default n + +config ADK_KERNEL_CPU_FREQ_GOV_ONDEMAND + boolean + default n + +config ADK_KERNEL_CPU_FREQ_GOV_CONSERVATIVE + boolean + default n + +config ADK_KERNEL_ARM_BCM2835_CPUFREQ + prompt "CPU frequency support" + boolean + select ADK_KERNEL_CPU_FREQ + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + +choice +prompt "Governor" +depends on ADK_KERNEL_ARM_BCM2835_CPUFREQ + +config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_ONDEMAND + boolean "ondemand" + select ADK_KERNEL_CPU_FREQ_GOV_ONDEMAND + +config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_PERFORMANCE + boolean "performance" + select ADK_KERNEL_CPU_FREQ_GOV_PERFORMANCE + +config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_POWERSAVE + boolean "powersave" + select ADK_KERNEL_CPU_FREQ_GOV_POWERSAVE + +config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE + boolean "conservative" + select ADK_KERNEL_CPU_FREQ_GOV_CONSERVATIVE + +config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_USERSPACE + boolean "userspace" + select ADK_KERNEL_CPU_FREQ_GOV_USERSPACE + +endchoice + +endmenu + |