Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 10 years ago
parent
commit
c25486df97
3 changed files with 65 additions and 1 deletions
  1. 4 1
      package/libcec/Makefile
  2. 1 0
      target/arm/kernel/raspberry-pi
  3. 60 0
      target/linux/config/Config.in.cpu

+ 4 - 1
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

+ 1 - 0
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

+ 60 - 0
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
+