ソースを参照

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

Waldemar Brodkorb 11 年 前
コミット
749f6a9cae

+ 4 - 0
mk/modules.mk

@@ -1190,6 +1190,10 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
 	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
 ,55))
 
+$(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
+	$(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \
+,55))
+
 #ifeq ($(ADK_LINUX_64),y)
 #V4L_COMPAT:=drivers/media/video/v4l2-compat-ioctl32
 #endif

+ 1 - 0
target/arm/sys-available/raspberry-pi

@@ -11,6 +11,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_INPUT
 	help
 	  Raspberry PI
 

+ 3 - 0
target/linux/config/Config.in.input

@@ -16,6 +16,7 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KERNEL_KEYBOARD_GPIO
@@ -58,6 +59,7 @@ config ADK_KERNEL_INPUT_KEYBOARD
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KERNEL_KEYBOARD_ATKBD
@@ -127,6 +129,7 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
         depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_TARGET_WITH_USB
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD