From d4ae4b9c31f562aa4cd39b51d6d44ec07ac36f26 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 10 Jul 2013 16:28:06 +0200 Subject: update kernel 3.4.x, fix netfilter nat modules --- mk/kernel-ver.mk | 6 +++--- mk/modules.mk | 13 ++++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'mk') diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index e80460f9c..157dcd059 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -10,9 +10,9 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 70504d1685140e3ee355b9f860284d85 endif -ifeq ($(ADK_KERNEL_VERSION_3_4_51),y) -KERNEL_VERSION:= 3.4.51 +ifeq ($(ADK_KERNEL_VERSION_3_4_52),y) +KERNEL_VERSION:= 3.4.52 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= f028dc67e2e8a782debc3207d47b33a0 +KERNEL_MD5SUM:= 97411d754781f6bae5c0a6e48849b3c9 endif diff --git a/mk/modules.mk b/mk/modules.mk index 4e247d98d..e3f8b1289 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -443,11 +443,22 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_conntrack_ipv4 \ ,50)) -$(eval $(call KMOD_template,NF_NAT_IPV4,nf-nat-ipv4,\ +NAT:=NF_NAT_IPV4 +ifeq ($(KERNEL_BASE),3) +ifeq ($(KERNEL_MAJ),4) +NAT:=NF_NAT +$(eval $(call KMOD_template,$(NAT),full-nat,\ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat \ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ +,50)) +else +$(eval $(call KMOD_template,$(NAT),full-nat,\ $(MODULES_DIR)/kernel/net/netfilter/nf_nat \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_ipv4 \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ ,50)) +endif +endif $(eval $(call KMOD_template,NF_CONNTRACK_FTP,nf-conntrack-ftp,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_ftp \ -- cgit v1.2.3 From 24de0984ed3caa1eb5bdf4d9d4e0b9900e6254eb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 10 Jul 2013 18:12:58 +0200 Subject: add sound module for raspberry pi --- mk/modules.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index 4e247d98d..3df7b63dc 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1181,6 +1181,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 -- cgit v1.2.3 From 6dae4d981a084fc1159f402e753483ef8fe23060 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 10 Jul 2013 18:35:54 +0200 Subject: fix load order --- mk/modules.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index e3f8b1289..44f62a651 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -441,18 +441,16 @@ $(eval $(call KMOD_template,NF_CONNTRACK,nf-conntrack,\ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_defrag_ipv4 \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_conntrack_ipv4 \ -,50)) +,46)) -NAT:=NF_NAT_IPV4 ifeq ($(KERNEL_BASE),3) ifeq ($(KERNEL_MAJ),4) -NAT:=NF_NAT -$(eval $(call KMOD_template,$(NAT),full-nat,\ +$(eval $(call KMOD_template,FULL_NAT,full-nat,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ ,50)) else -$(eval $(call KMOD_template,$(NAT),full-nat,\ +$(eval $(call KMOD_template,FULL_NAT,full-nat,\ $(MODULES_DIR)/kernel/net/netfilter/nf_nat \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_ipv4 \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ @@ -510,7 +508,7 @@ $(eval $(call KMOD_template,NF_CONNTRACK_SIP,nf-conntrack-sip,\ $(eval $(call KMOD_template,IP_NF_IPTABLES,ip-nf-iptables,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_tables \ -,50)) +,49)) $(eval $(call KMOD_template,IP_NF_MATCH_IPRANGE,ip-nf-match-iprange,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_iprange \ -- cgit v1.2.3 From d1436506d0726f839f5db89271ac479cf6c95486 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 Jul 2013 11:04:31 +0200 Subject: fix varios compile issues for raspberry --- mk/build.mk | 2 + package/librpcsecgss/Makefile | 5 +- package/librpcsecgss/patches/libtirpc.patch | 61 ++++++++++++++++++++++ package/mpd/Makefile | 2 +- package/mpd/files/mpd.init | 4 ++ .../patches/patch-utils_blkmapd_device-process_c | 11 ++++ .../nfs-utils/patches/patch-utils_gssd_Makefile_in | 4 +- .../nfs-utils/patches/patch-utils_mountd_fsloc_c | 6 +-- target/linux/config/Config.in.fsnet | 7 +++ 9 files changed, 95 insertions(+), 7 deletions(-) create mode 100644 package/librpcsecgss/patches/libtirpc.patch create mode 100644 package/nfs-utils/patches/patch-utils_blkmapd_device-process_c (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 5dcfa0818..5f9a3684c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -84,6 +84,8 @@ DEFCONFIG= ADK_DEBUG=n \ BUSYBOX_FEATURE_SUN_LABEL=n \ BUSYBOX_FEATURE_OSF_LABEL=n \ BUSYBOX_FEATURE_SGI_LABEL=n \ + BUSYBOX_FEATURE_INETD_RPC=n \ + BUSYBOX_FEATURE_MOUNT_NFS=n \ ADK_KERNEL_RT2X00_DEBUG=n \ ADK_KERNEL_ATH5K_DEBUG=n \ ADK_KERNEL_DEBUG_WITH_KGDB=n diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile index 6c32cb10c..cc0c8d3bd 100644 --- a/package/librpcsecgss/Makefile +++ b/package/librpcsecgss/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= librpcsecgss PKG_VERSION:= 0.19 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b45ed565bdc3099023aa35830ec92997 PKG_DESCR:= Secure RPC library for NFSv4 PKG_SECTION:= libs @@ -17,6 +17,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc +TARGET_LDFLAGS+= -ltirpc + post-install: $(INSTALL_DIR) $(IDIR_LIBRPCSECGSS)/usr/lib $(CP) $(WRKINST)/usr/lib/librpcsecgss.so* $(IDIR_LIBRPCSECGSS)/usr/lib/ diff --git a/package/librpcsecgss/patches/libtirpc.patch b/package/librpcsecgss/patches/libtirpc.patch new file mode 100644 index 000000000..06e14286d --- /dev/null +++ b/package/librpcsecgss/patches/libtirpc.patch @@ -0,0 +1,61 @@ +--- librpcsecgss-0.19/include/rpcsecgss/rpc/rpc.h~ 2013-02-22 08:35:29.949005794 +0100 ++++ librpcsecgss-0.19/include/rpcsecgss/rpc/rpc.h 2013-02-22 08:35:31.199005887 +0100 +@@ -71,13 +71,6 @@ + + __BEGIN_DECLS + +-/* Global variables, protected for multi-threaded applications. */ +-extern fd_set *__rpc_thread_svc_fdset (void) __attribute__ ((__const__)); +-#define svc_fdset (*__rpc_thread_svc_fdset ()) +- +-extern struct rpc_createerr *__rpc_thread_createerr (void) +- __attribute__ ((__const__)); +-#define get_rpc_createerr() (*__rpc_thread_createerr ()) + /* The people who "engineered" RPC should bee punished for naming the + data structure and the variable the same. We cannot always define the + macro 'rpc_createerr' because this would prevent people from defining +--- librpcsecgss-0.19/include/rpcsecgss/rpc/rpcsecgss_rename.h~ 2013-02-22 08:35:34.064007047 +0100 ++++ librpcsecgss-0.19/include/rpcsecgss/rpc/rpcsecgss_rename.h 2013-02-22 08:35:35.309007979 +0100 +@@ -83,8 +83,6 @@ + #define rpc_createerr rpcsecgss_rpc_createerr + #define svc_auth_none rpcsecgss_svc_auth_none + #define svc_auth_none_ops rpcsecgss_svc_auth_none_ops +-#define __svc_fdset rpcsecgss___svc_fdset +-#define __svc_fdsetsize rpcsecgss___svc_fdsetsize + #define svc_maxfd rpcsecgss_svc_maxfd + + #endif /* _RPCSECGSS_RENAME_H_ */ +--- librpcsecgss-0.19/src/clnt_generic.c~ 2013-02-22 08:35:43.705020289 +0100 ++++ librpcsecgss-0.19/src/clnt_generic.c 2013-02-22 08:35:44.853022749 +0100 +@@ -47,8 +47,8 @@ static char *rcsid = "$OpenBSD: clnt_gen + CLIENT * + clnt_create(hostname, prog, vers, proto) + __const char *hostname; +- __const u_long prog; +- __const u_long vers; ++ __const rpcprog_t prog; ++ __const rpcvers_t vers; + __const char *proto; + { + struct hostent *h; +--- librpcsecgss-0.19/src/Makefile.am~ 2009-05-13 23:33:08.000000000 +0200 ++++ librpcsecgss-0.19/src/Makefile.am 2013-02-22 08:38:04.829048549 +0100 +@@ -1,7 +1,7 @@ + lib_LTLIBRARIES = librpcsecgss.la + librpcsecgss_la_CPPFLAGS = $(GSSGLUE_CFLAGS) + librpcsecgss_la_LDFLAGS = -version-info 3:0:0 +-librpcsecgss_la_LIBADD = $(GSSGLUE_LIBS) ++librpcsecgss_la_LIBADD = $(GSSGLUE_LIBS) -ltirpc + librpcsecgss_la_SOURCES = \ + auth_gss.c authgss_prot.c svc.c svc_run.c svc_auth.c \ + svc_auth_none.c svc_auth_unix.c svc_auth_gss.c \ +--- librpcsecgss-0.19/src/rpc_commondata.c~ 2013-02-22 08:35:39.195012386 +0100 ++++ librpcsecgss-0.19/src/rpc_commondata.c 2013-02-22 08:35:40.523014417 +0100 +@@ -36,6 +36,4 @@ static char *rcsid = "$OpenBSD: rpc_comm + * by public interfaces + */ + struct opaque_auth _null_auth; +-fd_set svc_fdset; + int svc_maxfd = -1; +-struct rpc_createerr rpc_createerr; + diff --git a/package/mpd/Makefile b/package/mpd/Makefile index e1e4cad3c..0ac1d9d0b 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd PKG_VERSION:= 0.17.4 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= ab408a61f49f215ce77ed0cf1deed6e1 PKG_DESCR:= A music player daemon PKG_SECTION:= multimedia diff --git a/package/mpd/files/mpd.init b/package/mpd/files/mpd.init index 1e7cf871f..582aa3ebf 100644 --- a/package/mpd/files/mpd.init +++ b/package/mpd/files/mpd.init @@ -17,6 +17,10 @@ start) echo "mpd user must be in group audio." exit 1 fi + if [ ! -d /etc/mpd ];then + mkdir -p /etc/mpd/playlists + chown -R mpd:mpd /etc/mpd + fi if [ ! -d /var/run/mpd ];then mkdir -p /var/run/mpd chown mpd:mpd /var/run/mpd diff --git a/package/nfs-utils/patches/patch-utils_blkmapd_device-process_c b/package/nfs-utils/patches/patch-utils_blkmapd_device-process_c new file mode 100644 index 000000000..b6536e14e --- /dev/null +++ b/package/nfs-utils/patches/patch-utils_blkmapd_device-process_c @@ -0,0 +1,11 @@ +--- nfs-utils-1.2.5.orig/utils/blkmapd/device-process.c 2011-09-24 13:55:15.000000000 +0200 ++++ nfs-utils-1.2.5/utils/blkmapd/device-process.c 2013-07-11 11:02:58.000000000 +0200 +@@ -296,7 +296,7 @@ decode_blk_volume(uint32_t **pp, uint32_ + off_t stripe_unit = vol->param.bv_stripe_unit; + /* Check limitations imposed by device-mapper */ + if ((stripe_unit & (stripe_unit - 1)) != 0 +- || stripe_unit < (off_t) (PAGE_SIZE >> 9)) ++ || stripe_unit < (off_t) (sysconf(_SC_PAGE_SIZE) >> 9)) + return -EIO; + BLK_READBUF(p, end, 4); + READ32(vol->bv_vol_n); diff --git a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in index 5b77024e6..1c98ccb16 100644 --- a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in +++ b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in @@ -1,6 +1,6 @@ --- nfs-utils-1.2.5.orig/utils/gssd/Makefile.in 2011-09-24 14:13:16.000000000 +0200 -+++ nfs-utils-1.2.5/utils/gssd/Makefile.in 2012-02-27 17:39:34.000000000 +0100 -@@ -355,7 +355,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a ++++ nfs-utils-1.2.5/utils/gssd/Makefile.in 2013-07-11 11:01:30.000000000 +0200 +@@ -355,7 +355,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS) gssd_LDFLAGS = $(KRBLDFLAGS) diff --git a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c index e5569c82f..4ec4d3813 100644 --- a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c +++ b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c @@ -1,6 +1,6 @@ ---- nfs-utils-1.2.1.orig/utils/mountd/fsloc.c 2009-11-04 12:13:56.000000000 +0100 -+++ nfs-utils-1.2.1/utils/mountd/fsloc.c 2009-12-25 19:26:25.000000000 +0100 -@@ -126,7 +126,7 @@ static struct servers *method_list(char +--- nfs-utils-1.2.5.orig/utils/mountd/fsloc.c 2011-09-24 13:55:15.000000000 +0200 ++++ nfs-utils-1.2.5/utils/mountd/fsloc.c 2013-07-11 11:01:30.000000000 +0200 +@@ -126,7 +126,7 @@ static struct servers *method_list(char struct servers *rv=NULL; xlog(L_NOTICE, "method_list(%s)\n", data); diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index 40f9b1bbe..ab3087f4a 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -3,6 +3,13 @@ config ADK_KPACKAGE_KMOD_CIFS tristate select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS select ADK_KERNEL_NETWORK_FILESYSTEMS + select ADK_KPACKAGE_KMOD_CRYPTO_MD4 + select ADK_KPACKAGE_KMOD_CRYPTO_MD5 + select ADK_KPACKAGE_KMOD_CRYPTO_HMAC + select ADK_KPACKAGE_KMOD_CRYPTO_ARC4 + select ADK_KPACKAGE_KMOD_CRYPTO_ECB + select ADK_KPACKAGE_KMOD_CRYPTO_DES + select ADK_KPACKAGE_KMOD_CRYPTO_SHA256 default n help This is the client VFS module for the Common Internet File System -- cgit v1.2.3 From 7a1445acc7cd0eef202341b682391dd22777b553 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 Jul 2013 12:49:53 +0200 Subject: fix video cam support --- mk/modules.mk | 10 +- target/linux/Config.in | 4 +- target/linux/config/Config.in.audio | 132 ++++++++++++++++++++++ target/linux/config/Config.in.multimedia | 184 ------------------------------- target/linux/config/Config.in.video | 64 +++++++++++ 5 files changed, 203 insertions(+), 191 deletions(-) create mode 100644 target/linux/config/Config.in.audio delete mode 100644 target/linux/config/Config.in.multimedia create mode 100644 target/linux/config/Config.in.video (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index 70a17f429..4085a4c7d 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1208,23 +1208,23 @@ $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\ ,70)) $(eval $(call KMOD_template,USB_GSPCA,usb-gspca,\ - $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_main \ + $(MODULES_DIR)/kernel/drivers/media/usb/gspca/gspca_main \ ,75)) $(eval $(call KMOD_template,USB_GSPCA_PAC207,usb-gspca-pac207,\ - $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_pac207 \ + $(MODULES_DIR)/kernel/drivers/media/usb/gspca/gspca_pac207 \ ,80)) $(eval $(call KMOD_template,USB_GSPCA_PAC7311,usb-gspca-pac7311,\ - $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_pac7311 \ + $(MODULES_DIR)/kernel/drivers/media/usb/gspca/gspca_pac7311 \ ,80)) $(eval $(call KMOD_template,USB_GSPCA_SPCA561,usb-gspca-spca561,\ - $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_spca561 \ + $(MODULES_DIR)/kernel/drivers/media/usb/gspca/gspca_spca561 \ ,80)) $(eval $(call KMOD_template,USB_PWC,usb-pwc,\ - $(MODULES_DIR)/kernel/drivers/media/video/pwc/pwc \ + $(MODULES_DIR)/kernel/drivers/media/usb/pwc/pwc \ ,80)) # diff --git a/target/linux/Config.in b/target/linux/Config.in index d7d9b5355..e4b81dd2f 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -10,14 +10,14 @@ source target/linux/config/Config.in.input source target/linux/config/Config.in.pcmcia source target/linux/config/Config.in.network source target/linux/config/Config.in.netfilter -source target/linux/config/Config.in.multimedia +source target/linux/config/Config.in.audio +source target/linux/config/Config.in.video source target/linux/config/Config.in.crypto source target/linux/config/Config.in.bluetooth #source target/linux/config/Config.in.isdn source target/linux/config/Config.in.watchdog source target/linux/config/Config.in.leds source target/linux/config/Config.in.misc -#source target/linux/config/Config.in.arm source target/linux/config/Config.in.mips source target/linux/config/Config.in.lib source target/linux/config/Config.in.pm diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio new file mode 100644 index 000000000..a7e8f4751 --- /dev/null +++ b/target/linux/config/Config.in.audio @@ -0,0 +1,132 @@ +menu "Audio devices support" +depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND + +config ADK_KERNEL_SND_ARM + boolean + +config ADK_KERNEL_SND_SOC + boolean + +config ADK_KERNEL_SND_PXA2XX_AC97 + boolean + +config ADK_KERNEL_SND_TIMER + boolean + +config ADK_KERNEL_SND_PCM + boolean + +config ADK_KERNEL_SND_HWDEP + boolean + +config ADK_KERNEL_SND_OSSEMUL + boolean + +config ADK_KERNEL_SND_MIXER_OSS + boolean + +config ADK_KERNEL_SND_PCM_OSS + boolean + +config ADK_KPACKAGE_KMOD_SOUND + tristate + +config ADK_KPACKAGE_KMOD_SND_RAWMIDI + tristate + +config ADK_KPACKAGE_KMOD_SND_AC97_CODEC + tristate + depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_SOUND + +config ADK_KPACKAGE_KMOD_SND + prompt "kmod-snd...................... ALSA sound support" + tristate + select ADK_KPACKAGE_KMOD_SOUND + select ADK_KERNEL_SND_OSSEMUL + select ADK_KERNEL_SND_TIMER + select ADK_KERNEL_SND_PCM + select ADK_KERNEL_SND_HWDEP + default n + help + Basic ALSA sound support. + +config ADK_KPACKAGE_KMOD_SND_OSSEMUL + prompt "kmod-snd-ossemul.............. ALSA OSS Emulation" + tristate + select ADK_KERNEL_SND_MIXER_OSS + select ADK_KERNEL_SND_PCM_OSS + select ADK_KPACKAGE_KMOD_SND + default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 + default n + help + ALSA OSS Emulation + +config ADK_KPACKAGE_KMOD_SND_INTEL8X0 + prompt "kmod-snd-intel8x0............. Intel AC97 driver" + tristate + select ADK_KPACKAGE_KMOD_SND_AC97_CODEC + select ADK_KPACKAGE_KMOD_SND + default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 + default n + depends on ADK_TARGET_WITH_PCI + help + Driver for intel chipsets. + +config ADK_KPACKAGE_KMOD_SND_VIA82XX + prompt "kmod-snd-via82xx.............. ALSA VIA82XX driver" + tristate + select ADK_KPACKAGE_KMOD_SND + default n + depends on ADK_TARGET_WITH_PCI + help + ALSA VIA82XX driver + +config ADK_KPACKAGE_KMOD_SND_ENS1370 + prompt "kmod-snd-ens1370.............. ALSA Ensoniq 1370 driver" + tristate + select ADK_KPACKAGE_KMOD_SND + default n + depends on ADK_TARGET_WITH_PCI + help + ALSA Ensonique 1370 driver + +config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO + prompt "kmod-snd-cs5535audio.......... ALSA AMD CS5535 driver" + tristate + select ADK_KPACKAGE_KMOD_SND_AC97_CODEC + select ADK_KPACKAGE_KMOD_SND + default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C + default n + depends on ADK_TARGET_WITH_PCI + help + ALSA AMD CS5535 driver + +config ADK_KERNEL_SND_PXA2XX_SOC + tristate + default n + +config ADK_KPACKAGE_KMOD_SND_PXA2XX_SOC_SPITZ + prompt "kmod-snd-pxa2xx-soc-spitz..... ALSA SOC Sharp Zaurus" + tristate + select ADK_KERNEL_SND_ARM + select ADK_KERNEL_SND_SOC + select ADK_KERNEL_SND_PXA2XX_AC97 + select ADK_KPACKAGE_KMOD_SND_AC97_CODEC + select ADK_KPACKAGE_KMOD_SND + select ADK_KERNEL_SND_PXA2XX_SOC + depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS + default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS + default n + +config ADK_KPACKAGE_KMOD_SND_BCM2835 + prompt "kmod-snd-bcm2835............... ALSA SOC Raspberry PI" + tristate + select ADK_KERNEL_SND_ARM + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n + +endmenu diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia deleted file mode 100644 index 1dafff357..000000000 --- a/target/linux/config/Config.in.multimedia +++ /dev/null @@ -1,184 +0,0 @@ -menu "Multimedia devices support" -depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND - -config ADK_KERNEL_SND_ARM - boolean - -config ADK_KERNEL_SND_SOC - boolean - -config ADK_KERNEL_SND_PXA2XX_AC97 - boolean - -config ADK_KERNEL_SND_TIMER - boolean - -config ADK_KERNEL_SND_PCM - boolean - -config ADK_KERNEL_SND_HWDEP - boolean - -config ADK_KERNEL_SND_OSSEMUL - boolean - -config ADK_KERNEL_SND_MIXER_OSS - boolean - -config ADK_KERNEL_SND_PCM_OSS - boolean - -config ADK_KPACKAGE_KMOD_SOUND - tristate - -config ADK_KPACKAGE_KMOD_SND_RAWMIDI - tristate - -config ADK_KPACKAGE_KMOD_SND_AC97_CODEC - tristate - depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_SOUND - -menu "Audio devices support" - -config ADK_KPACKAGE_KMOD_SND - prompt "kmod-snd...................... ALSA sound support" - tristate - select ADK_KPACKAGE_KMOD_SOUND - select ADK_KERNEL_SND_OSSEMUL - select ADK_KERNEL_SND_TIMER - select ADK_KERNEL_SND_PCM - select ADK_KERNEL_SND_HWDEP - default n - help - Basic ALSA sound support. - -config ADK_KPACKAGE_KMOD_SND_OSSEMUL - prompt "kmod-snd-ossemul.............. ALSA OSS Emulation" - tristate - select ADK_KERNEL_SND_MIXER_OSS - select ADK_KERNEL_SND_PCM_OSS - select ADK_KPACKAGE_KMOD_SND - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_NATIVE_SYSTEM_IBM_X40 - default n - help - ALSA OSS Emulation - -config ADK_KPACKAGE_KMOD_SND_INTEL8X0 - prompt "kmod-snd-intel8x0............. Intel AC97 driver" - tristate - select ADK_KPACKAGE_KMOD_SND_AC97_CODEC - select ADK_KPACKAGE_KMOD_SND - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_NATIVE_SYSTEM_IBM_X40 - default n - depends on ADK_TARGET_WITH_PCI - help - Driver for intel chipsets. - -config ADK_KPACKAGE_KMOD_SND_VIA82XX - prompt "kmod-snd-via82xx.............. ALSA VIA82XX driver" - tristate - select ADK_KPACKAGE_KMOD_SND - default n - depends on ADK_TARGET_WITH_PCI - help - ALSA VIA82XX driver - -config ADK_KPACKAGE_KMOD_SND_ENS1370 - prompt "kmod-snd-ens1370.............. ALSA Ensoniq 1370 driver" - tristate - select ADK_KPACKAGE_KMOD_SND - default n - depends on ADK_TARGET_WITH_PCI - help - ALSA Ensonique 1370 driver - -config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO - prompt "kmod-snd-cs5535audio.......... ALSA AMD CS5535 driver" - tristate - select ADK_KPACKAGE_KMOD_SND_AC97_CODEC - select ADK_KPACKAGE_KMOD_SND - default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default n - depends on ADK_TARGET_WITH_PCI - help - ALSA AMD CS5535 driver - -config ADK_KERNEL_SND_PXA2XX_SOC - tristate - default n - -config ADK_KPACKAGE_KMOD_SND_PXA2XX_SOC_SPITZ - prompt "kmod-snd-pxa2xx-soc-spitz..... ALSA SOC Sharp Zaurus" - tristate - select ADK_KERNEL_SND_ARM - select ADK_KERNEL_SND_SOC - select ADK_KERNEL_SND_PXA2XX_AC97 - select ADK_KPACKAGE_KMOD_SND_AC97_CODEC - select ADK_KPACKAGE_KMOD_SND - select ADK_KERNEL_SND_PXA2XX_SOC - depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default n - -config ADK_KPACKAGE_KMOD_SND_BCM2835 - prompt "kmod-snd-bcm2835............... ALSA SOC Raspberry PI" - tristate - select ADK_KERNEL_SND_ARM - depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI - default n - -endmenu - -menu "Video devices support" -config ADK_KPACKAGE_KMOD_MEDIA_SUPPORT - prompt "kmod-media-support............... Multimedia support" - tristate - default n - help - -config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS - prompt "kmod-usb-video-class............ Kernel driver for USB video webcams" - tristate - depends on ADK_KPACKAGE_KMOD_USB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG - select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT - default n - help - -config ADK_KPACKAGE_KMOD_USB_GSPCA - prompt "kmod-usb-gspca................... GSPCA webcam framework" - depends on ADK_TARGET_WITH_USB - tristate - help - GSPCA webcam framework - -config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC207 - prompt "kmod-usb-gpsca-pac207............ Pixart PAC207 USB Camera Driver" - tristate - depends on ADK_KPACKAGE_KMOD_USB_GSPCA - help - -config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC7311 - prompt "kmod-usb-gpsca-pac7311........... Pixart PAC7311 USB Camera Driver" - tristate - depends on ADK_KPACKAGE_KMOD_USB_GSPCA - help - -config ADK_KPACKAGE_KMOD_USB_GSPCA_SPCA561 - prompt "kmod-usb-gpsca-spca561........... SPCA561 USB Camera Driver" - tristate - depends on ADK_KPACKAGE_KMOD_USB_GSPCA - help - -config ADK_KPACKAGE_KMOD_USB_PWC - prompt "kmod-usb-pwc..................... Kernel driver for USB Philips Cameras" - tristate - depends on ADK_KPACKAGE_KMOD_USB - default n - help - -endmenu -endmenu diff --git a/target/linux/config/Config.in.video b/target/linux/config/Config.in.video new file mode 100644 index 000000000..6182ea6cf --- /dev/null +++ b/target/linux/config/Config.in.video @@ -0,0 +1,64 @@ +config ADK_KERNEL_VIDEO_DEV + boolean + +config ADK_KERNEL_VIDEO_V4L2 + boolean + select ADK_KERNEL_VIDEO_DEV + +config ADK_KERNEL_MEDIA_USB_SUPPORT + boolean + +config ADK_KERNEL_MEDIA_CAMERA_SUPPORT + boolean + +menu "Video devices support" +config ADK_KPACKAGE_KMOD_MEDIA_SUPPORT + tristate + default n + help + +config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS + prompt "kmod-usb-video-class............ Kernel driver for USB video webcams" + tristate + depends on ADK_KPACKAGE_KMOD_USB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG + select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT + default n + help + +config ADK_KPACKAGE_KMOD_USB_GSPCA + prompt "kmod-usb-gspca................... GSPCA webcam framework" + depends on ADK_TARGET_WITH_USB + select ADK_KERNEL_VIDEO_V4L2 + select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT + select ADK_KERNEL_MEDIA_USB_SUPPORT + select ADK_KERNEL_MEDIA_CAMERA_SUPPORT + tristate + help + GSPCA webcam framework + +config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC207 + prompt "kmod-usb-gpsca-pac207............ Pixart PAC207 USB Camera Driver" + tristate + depends on ADK_KPACKAGE_KMOD_USB_GSPCA + help + +config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC7311 + prompt "kmod-usb-gpsca-pac7311........... Pixart PAC7311 USB Camera Driver" + tristate + depends on ADK_KPACKAGE_KMOD_USB_GSPCA + help + +config ADK_KPACKAGE_KMOD_USB_GSPCA_SPCA561 + prompt "kmod-usb-gpsca-spca561........... SPCA561 USB Camera Driver" + tristate + depends on ADK_KPACKAGE_KMOD_USB_GSPCA + help + +config ADK_KPACKAGE_KMOD_USB_PWC + prompt "kmod-usb-pwc..................... Kernel driver for USB Philips Cameras" + tristate + depends on ADK_TARGET_WITH_USB + default n + help + +endmenu -- cgit v1.2.3