diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-10 18:35:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-10 18:35:59 +0200 |
| commit | 749f6a9cae3114c9b8fd86ada0c0fd4ae5f54ab4 (patch) | |
| tree | 7b5a7bb7d90cfcf44628a21d70e49353dd27000a | |
| parent | 6dae4d981a084fc1159f402e753483ef8fe23060 (diff) | |
| parent | 2bc97af1f4ca05f1e2ffb9c50b8ef717bc2c33a3 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/modules.mk | 4 | ||||
| -rw-r--r-- | target/arm/sys-available/raspberry-pi | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.input | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 44f62a651..70a17f429 100644 --- a/mk/modules.mk +++ b/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 diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index 39b02e77b..4678ac880 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/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 diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 2df3d4444..3eff14a42 100644 --- a/target/linux/config/Config.in.input +++ b/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 |