From bc924b61431ffa6c76db5fefa7a5a09951fe6ccb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 28 Apr 2010 20:30:39 +0200 Subject: fix some pkg dependencies --- mk/build.mk | 1 + package/MesaLib/Makefile | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mk/build.mk b/mk/build.mk index cc6c447ff..9bbe15510 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -16,6 +16,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_MAKE_PARALLEL=n \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_GRUB=n \ + ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \ ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_GCC=n \ diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 41506092d..26201ba0d 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -9,9 +9,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 62e8e47cbd63741b4bbe634dcdc8a56a PKG_DESCR:= MESA library PKG_SECTION:= libs -PKG_DEPENDS:= libxdamage libxfixes -PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm -PKG_URL:= add project url +PKG_DEPENDS:= libxdamage libxfixes libdrm +PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm libdrm +PKG_BUILDDEP+= dri2proto glproto +PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/ WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} -- cgit v1.2.3 From c7918465e6c9834556eb9238271951f2184e058a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 May 2010 11:42:21 +0200 Subject: fix firefox build for eglibc/glibc builds --- package/firefox/Makefile | 2 +- package/firefox/patches/patch-gfx_qcms_iccread_c | 18 ++++++++++++++++++ package/firefox/patches/patch-gfx_qcms_qcmstypes_h | 5 +++-- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 package/firefox/patches/patch-gfx_qcms_iccread_c diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 8c6db24be..b8d667241 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -19,7 +19,7 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-1.9.2 -PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle +PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle ibmx40 include $(TOPDIR)/mk/package.mk diff --git a/package/firefox/patches/patch-gfx_qcms_iccread_c b/package/firefox/patches/patch-gfx_qcms_iccread_c new file mode 100644 index 000000000..ea9ab6234 --- /dev/null +++ b/package/firefox/patches/patch-gfx_qcms_iccread_c @@ -0,0 +1,18 @@ +--- mozilla-1.9.2.orig/gfx/qcms/iccread.c 2010-04-02 18:02:27.000000000 +0200 ++++ mozilla-1.9.2/gfx/qcms/iccread.c 2010-04-30 14:00:52.430967966 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include "qcmsint.h" + + //XXX: use a better typename +@@ -771,7 +772,6 @@ void qcms_profile_release(qcms_profile * + qcms_profile_fini(profile); + } + +-#include + qcms_profile* qcms_profile_from_file(FILE *file) + { + uint32_t length, remaining_length; diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h index 436b1a452..80f68661a 100644 --- a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h +++ b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h @@ -1,6 +1,6 @@ --- mozilla-1.9.2.orig/gfx/qcms/qcmstypes.h 2010-04-02 18:02:27.000000000 +0200 -+++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-11 14:57:54.000000000 +0200 -@@ -11,22 +11,11 @@ ++++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-30 17:58:33.490975825 +0200 +@@ -11,22 +11,12 @@ /* int_types.h gets included somehow, so avoid redefining the types differently */ #include #else @@ -13,6 +13,7 @@ -typedef PRInt64 int64_t; -typedef PRUint64 uint64_t; - ++#include #ifdef __OS2__ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ #include -- cgit v1.2.3 From d6bcad0afc7bccdc355d4aeab35ffd35c704fc69 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 May 2010 11:42:44 +0200 Subject: mesa is ibmx40 only right now --- package/MesaLib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 26201ba0d..9d673613f 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -17,7 +17,7 @@ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/ WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} -PKG_TARGET_DEPENDS:= x86 x86_64 +PKG_TARGET_DEPENDS:= ibmx40 include $(TOPDIR)/mk/package.mk -- cgit v1.2.3 From eb6db01362bbbb6664697635fc7057d712e966da Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 May 2010 11:43:07 +0200 Subject: update to latest upstream version --- package/openvpn/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index e8af513fe..330b25124 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= openvpn -PKG_VERSION:= 2.1.0 +PKG_VERSION:= 2.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 452a83326ae198cf961e9ae02539c8fb +PKG_MD5SUM:= b273ed2b5ec8616fb9834cde8634bce7 PKG_DESCR:= Open Source VPN solution using SSL PKG_SECTION:= net PKG_DEPENDS:= kmod-tun -- cgit v1.2.3 From 5ebef62334e54209fe6852d4fd2dca4b0ece6d5a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 May 2010 11:44:00 +0200 Subject: do not select fuse on a bool symbol --- package/davfs2/Config.in.kernel | 4 ---- package/davfs2/Makefile | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/davfs2/Config.in.kernel b/package/davfs2/Config.in.kernel index 3ef8e77d7..70e3c3ea4 100644 --- a/package/davfs2/Config.in.kernel +++ b/package/davfs2/Config.in.kernel @@ -4,13 +4,9 @@ depends on ADK_PACKAGE_DAVFS2 config ADK_PACKAGE_DAVFS2_FUSE bool "use the FUSE filesystem interface" - select ADK_PACKAGE_FUSE_UTILS config ADK_PACKAGE_DAVFS2_CODA bool "use the CODA filesystem interface" - select ADK_KPACKAGE_KMOD_CODA_FS config ADK_PACKAGE_DAVFS2_BOTH bool "use both filesystem interfaces" - select ADK_PACKAGE_FUSE_UTILS - select ADK_KPACKAGE_KMOD_CODA_FS endchoice diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index b3e63f2c9..b6c026739 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -16,8 +16,6 @@ endif PKG_URL:= http://savannah.nongnu.org/projects/davfs2 PKG_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/} -include ${TOPDIR}/mk/package.mk - ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y) PKG_DEPENDS:= fuse-utils kmod-fuse-fs libiconv neon else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y) @@ -26,6 +24,8 @@ else PKG_DEPENDS:= kmod-coda-fs fuse-utils kmod-fuse-fs libiconv neon endif +include ${TOPDIR}/mk/package.mk + $(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --with-neon -- cgit v1.2.3 From 4ef1a744af6d9fe1ab993c19a9e58cd83c37c2f1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 May 2010 18:04:12 +0200 Subject: fix make bulkallmod for some packages and target combinations --- mk/build.mk | 3 ++- package/gdb/Makefile | 2 ++ package/gdbserver/Makefile | 2 ++ package/nspr/Makefile | 7 ++++++- .../patch-mozilla_nsprpub_config_Makefile_in | 4 ++-- .../nspr/patches/patch-mozilla_nsprpub_configure | 21 +++++++++++++++++++++ package/nss/Makefile | 6 +++--- target/Config.in | 3 +++ target/foxg20/uclibc.config | 20 +++++--------------- target/linux/config/Config.in.misc | 1 + target/linux/config/Config.in.multimedia | 10 +++++++++- target/linux/config/Config.in.usb | 6 +++--- target/linux/patches/2.6.33.1/cris-sound.patch | 12 ++++++++++++ target/linux/patches/2.6.33.2/cris-sound.patch | 12 ++++++++++++ target/linux/patches/2.6.33/cris-sound.patch | 12 ++++++++++++ 15 files changed, 95 insertions(+), 26 deletions(-) create mode 100644 package/nspr/patches/patch-mozilla_nsprpub_configure create mode 100644 target/linux/patches/2.6.33.1/cris-sound.patch create mode 100644 target/linux/patches/2.6.33.2/cris-sound.patch create mode 100644 target/linux/patches/2.6.33/cris-sound.patch diff --git a/mk/build.mk b/mk/build.mk index 9bbe15510..f6f764c87 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -13,7 +13,8 @@ CONFIG = config DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_DEBUG=n \ ADK_STATIC=n \ - ADK_MAKE_PARALLEL=n \ + ADK_MAKE_PARALLEL=y \ + ADK_MAKE_JOBS=4 \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \ diff --git a/package/gdb/Makefile b/package/gdb/Makefile index e01721222..d98546426 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -10,6 +10,8 @@ PKG_DEPENDS:= libthread-db libncurses libiconv PKG_BUILDDEP+= ncurses readline libiconv PKG_TARGET_DEPENDS:= !foxboard !ag241 +PKG_NOPARALLEL:= 1 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index cfbed5260..32ce9fd59 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -8,6 +8,8 @@ PKG_DESCR:= GNU debugger (small server) PKG_SECTION:= comp PKG_DEPENDS:= libthread-db +PKG_TARGET_DEPENDS:= !foxboard + include ${TOPDIR}/mk/package.mk WRKSRC= ${WRKDIST}/gdb/gdbserver diff --git a/package/nspr/Makefile b/package/nspr/Makefile index 9072977a1..9383c8c5f 100644 --- a/package/nspr/Makefile +++ b/package/nspr/Makefile @@ -20,7 +20,12 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,NSPR,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ENV+= OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" +CONFIGURE_ENV+= OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \ + cross_compiling=yes + +ifeq (${ADK_LINUX_64},y) +CONFIGURE_ARGS+= --enable-64bit +endif post-install: $(INSTALL_DIR) $(IDIR_NSPR)/usr/lib diff --git a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in index 40d15376f..f667eeb61 100644 --- a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in +++ b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in @@ -1,11 +1,11 @@ --- nspr-4.8.2.orig/mozilla/nsprpub/config/Makefile.in 2009-03-03 23:04:23.000000000 +0100 -+++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in 2010-02-06 02:01:27.321836181 +0100 ++++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in 2010-05-02 12:25:27.673464050 +0200 @@ -145,7 +145,7 @@ endif $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) - $(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ -+ $(CC_FOR_BUILD) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ ++ $(CC_FOR_BUILD) $(HOSTCFLAGS) $< $(HOSTLDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ install:: nspr.m4 $(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal diff --git a/package/nspr/patches/patch-mozilla_nsprpub_configure b/package/nspr/patches/patch-mozilla_nsprpub_configure new file mode 100644 index 000000000..3d048970b --- /dev/null +++ b/package/nspr/patches/patch-mozilla_nsprpub_configure @@ -0,0 +1,21 @@ +--- nspr-4.8.2.orig/mozilla/nsprpub/configure 2009-10-04 02:57:00.000000000 +0200 ++++ nspr-4.8.2/mozilla/nsprpub/configure 2010-05-02 12:55:21.842224375 +0200 +@@ -1129,8 +1129,8 @@ EOF + fi + + if test -z "$SKIP_COMPILER_CHECKS"; then +-if test "$target" != "$host"; then +- echo "cross compiling from $host to $target" ++if test "$target" != "$build"; then ++ echo "cross compiling from $build to $target" + cross_compiling=yes + + _SAVE_CC="$CC" +@@ -2593,6 +2593,7 @@ case "$build:$target" in + ;; + esac + ++cross_compiling=yes + if test "$cross_compiling" = "yes"; then + CROSS_COMPILE=1 + else diff --git a/package/nss/Makefile b/package/nss/Makefile index 28e4da1f8..7acbacbe4 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -26,7 +26,7 @@ CONFIG_STYLE:= manual ifeq ($(ADK_LINUX_64),y) TCFLAGS+= -DUSE_64 -MAKE_FLAGS+= USE_64=1 +XAKE_FLAGS+= USE_64=1 endif MAKE_FLAGS+= NATIVE_CC="${HOSTCC}" NATIVE_FLAGS="${HOSTCFLAGS}" @@ -34,10 +34,10 @@ TCPPFLAGS+= -I${STAGING_DIR}/usr/include/nspr TCFLAGS+= -I${STAGING_DIR}/usr/include/nspr TLDFLAGS:= '' -MAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \ +XAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \ ARCHFLAG="${TCFLAGS} ${TCPPFLAGS} -ldl" ALL_TARGET:= build_coreconf all -XAKE_FLAGS+= OS_TEST=${ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 +XAKE_FLAGS+= OS_TEST=${CPU_ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 post-install: $(INSTALL_DIR) $(IDIR_NSS)/usr/lib diff --git a/target/Config.in b/target/Config.in index 488c8230d..06638ad4d 100644 --- a/target/Config.in +++ b/target/Config.in @@ -238,6 +238,7 @@ config ADK_LINUX_ARM_FOXG20 select ADK_EABI select ADK_KERNEL_NLS select ADK_KERNEL_EXT2_FS + select ADK_KERNEL_USB select ADK_KPACKAGE_KMOD_VFAT_FS select ADK_PACKAGE_KMOD_USB_CONTROLLER select ADK_KERNEL_NETDEVICES @@ -254,6 +255,7 @@ config ADK_LINUX_CRIS_FOXBOARD bool "Foxboard (ETRAX LX100)" select ADK_foxboard select ADK_PACKAGE_KMOD_USB_CONTROLLER + select ADK_KERNEL_USB select ADK_KERNEL_NLS select ADK_TARGET_WITH_USB help @@ -589,6 +591,7 @@ config ADK_LINUX_X86_QEMU config ADK_LINUX_X86_64_QEMU bool "x86_64" select ADK_x86_64_qemu + select ADK_LINUX_64 select ADK_KERNEL_NETDEV_1000 select ADK_KPACKAGE_KMOD_E1000 select ADK_KERNEL_INPUT_KEYBOARD diff --git a/target/foxg20/uclibc.config b/target/foxg20/uclibc.config index 69ecdf827..ed774f20f 100644 --- a/target/foxg20/uclibc.config +++ b/target/foxg20/uclibc.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Version: 0.9.31 -# Sun Apr 4 10:16:38 2010 +# Version: 0.9.30.3 +# Sat May 1 19:16:40 2010 # # TARGET_alpha is not set TARGET_arm=y @@ -69,7 +69,6 @@ UCLIBC_HAS_FLOATS=y # UCLIBC_HAS_FPU is not set UCLIBC_HAS_SOFT_FLOAT=y DO_C99_MATH=y -# DO_XSI_MATH is not set UCLIBC_HAS_FENV=y KERNEL_HEADERS="" HAVE_DOT_CONFIG=y @@ -89,14 +88,12 @@ LDSO_CACHE_SUPPORT=y LDSO_BASE_FILENAME="ld.so" # UCLIBC_STATIC_LDCONFIG is not set # LDSO_RUNPATH is not set -LDSO_SEARCH_INTERP_PATH=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y -# LINUXTHREADS_NEW is not set UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y # MALLOC is not set @@ -107,7 +104,6 @@ UCLIBC_DYNAMIC_ATEXIT=y COMPAT_ATEXIT=y # UCLIBC_SUSV3_LEGACY is not set # UCLIBC_SUSV3_LEGACY_MACROS is not set -# UCLIBC_SUSV4_LEGACY is not set # UCLIBC_HAS_STUBS is not set UCLIBC_HAS_SHADOW=y UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y @@ -116,7 +112,6 @@ UCLIBC_HAS_PTY=y ASSUME_DEVPTS=y UNIX98PTY_ONLY=y # UCLIBC_HAS_GETPT is not set -# UCLIBC_HAS_LIBUTIL is not set UCLIBC_HAS_TM_EXTENSIONS=y UCLIBC_HAS_TZ_CACHING=y UCLIBC_HAS_TZ_FILE=y @@ -158,10 +153,6 @@ UCLIBC_HAS_REENTRANT_RPC=y UCLIBC_USE_NETLINK=y UCLIBC_SUPPORT_AI_ADDRCONFIG=y UCLIBC_HAS_BSD_RES_CLOSE=y -UCLIBC_HAS_COMPAT_RES_STATE=y -# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set -# UCLIBC_HAS_LIBRESOLV_STUB is not set -# UCLIBC_HAS_LIBNSL_STUB is not set # # String and Stdio Support @@ -212,17 +203,16 @@ UCLIBC_HAS_REGEX_OLD=y UCLIBC_HAS_FNMATCH=y UCLIBC_HAS_FNMATCH_OLD=y UCLIBC_HAS_WORDEXP=y -# UCLIBC_HAS_NFTW is not set +UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y UCLIBC_HAS_GNU_GLOB=y # # Library Installation Options # +SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib" RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/" -MULTILIB_DIR="lib" -HARDWIRED_ABSPATH=y # # Security options diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 4e2406e85..eb2737eed 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -79,6 +79,7 @@ config ADK_KPACKAGE_KMOD_EEPROM_93CX6 prompt "kmod-eeprom-93cx6................. 93cx6 eeprom support" tristate depends on ADK_KPACKAGE_KMOD_MAC80211 + depends on !ADK_LINUX_CRIS_FOXBOARD default n help diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index f224dc31b..ef10e4832 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -1,5 +1,9 @@ menu "Multimedia devices support" -depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB && !ADK_LINUX_CRIS_FOXBOARD +depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB + +config ADK_KERNEL_SND_AC97_CODEC + boolean + default n config ADK_KERNEL_SND_TIMER boolean @@ -56,6 +60,8 @@ config ADK_KPACKAGE_KMOD_SND_OSSEMUL config ADK_KPACKAGE_KMOD_SND_AC97_CODEC prompt "kmod-sound-alsa-ac97-codec..... ALSA AC97 codec" depends on ADK_KPACKAGE_KMOD_SND + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 ) + select ADK_KERNEL_SND_AC97_CODEC tristate default n help @@ -64,6 +70,7 @@ config ADK_KPACKAGE_KMOD_SND_AC97_CODEC config ADK_KPACKAGE_KMOD_SND_VIA82XX prompt "kmod-sound-alsa-via82xx........ ALSA VIA82XX driver" depends on ADK_KPACKAGE_KMOD_SND + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 ) select ADK_KPACKAGE_KMOD_SND_AC97_CODEC tristate default n @@ -73,6 +80,7 @@ config ADK_KPACKAGE_KMOD_SND_VIA82XX config ADK_KPACKAGE_KMOD_SND_ENS1370 prompt "kmod-sound-alsa-ens1370........ ALSA Ensoniq 1370 driver" depends on ADK_KPACKAGE_KMOD_SND + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 ) tristate default n help diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 62bafd99b..b3c48c9ea 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -101,7 +101,7 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD prompt "kmod-usb-isp116x................ ISP116X HCD support" tristate default n - depends on !ADK_LINUX_CRIS_FOXBOARD + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20) depends on ADK_KPACKAGE_KMOD_USB select ADK_PACKAGE_KMOD_USB_CONTROLLER help @@ -114,7 +114,7 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD prompt "kmod-usb-sl811.................. SL811HS HCD support" tristate default n - depends on !ADK_LINUX_CRIS_FOXBOARD + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20) depends on ADK_KPACKAGE_KMOD_USB select ADK_PACKAGE_KMOD_USB_CONTROLLER help @@ -154,7 +154,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD config ADK_PACKAGE_KMOD_USB_CONTROLLER tristate - depends on ADK_KPACKAGE_KMOD_USB_UHCI_HCD || ADK_KPACKAGE_KMOD_USB_OHCI_HCD || ADK_KPACKAGE_KMOD_EHCI_HCD || ADK_LINUX_CRIS_FOXBOARD + depends on ADK_KPACKAGE_KMOD_USB_UHCI_HCD || ADK_KPACKAGE_KMOD_USB_OHCI_HCD || ADK_KPACKAGE_KMOD_EHCI_HCD || ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 default n config ADK_KPACKAGE_KMOD_USB_ACM diff --git a/target/linux/patches/2.6.33.1/cris-sound.patch b/target/linux/patches/2.6.33.1/cris-sound.patch new file mode 100644 index 000000000..259b3ee60 --- /dev/null +++ b/target/linux/patches/2.6.33.1/cris-sound.patch @@ -0,0 +1,12 @@ +diff -Nur linux-2.6.33.orig/arch/cris/Kconfig linux-2.6.33/arch/cris/Kconfig +--- linux-2.6.33.orig/arch/cris/Kconfig 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/arch/cris/Kconfig 2010-04-28 21:41:58.831386913 +0200 +@@ -677,6 +688,8 @@ + + source "fs/Kconfig" + ++source "sound/Kconfig" ++ + source "drivers/usb/Kconfig" + + source "drivers/uwb/Kconfig" diff --git a/target/linux/patches/2.6.33.2/cris-sound.patch b/target/linux/patches/2.6.33.2/cris-sound.patch new file mode 100644 index 000000000..259b3ee60 --- /dev/null +++ b/target/linux/patches/2.6.33.2/cris-sound.patch @@ -0,0 +1,12 @@ +diff -Nur linux-2.6.33.orig/arch/cris/Kconfig linux-2.6.33/arch/cris/Kconfig +--- linux-2.6.33.orig/arch/cris/Kconfig 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/arch/cris/Kconfig 2010-04-28 21:41:58.831386913 +0200 +@@ -677,6 +688,8 @@ + + source "fs/Kconfig" + ++source "sound/Kconfig" ++ + source "drivers/usb/Kconfig" + + source "drivers/uwb/Kconfig" diff --git a/target/linux/patches/2.6.33/cris-sound.patch b/target/linux/patches/2.6.33/cris-sound.patch new file mode 100644 index 000000000..259b3ee60 --- /dev/null +++ b/target/linux/patches/2.6.33/cris-sound.patch @@ -0,0 +1,12 @@ +diff -Nur linux-2.6.33.orig/arch/cris/Kconfig linux-2.6.33/arch/cris/Kconfig +--- linux-2.6.33.orig/arch/cris/Kconfig 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/arch/cris/Kconfig 2010-04-28 21:41:58.831386913 +0200 +@@ -677,6 +688,8 @@ + + source "fs/Kconfig" + ++source "sound/Kconfig" ++ + source "drivers/usb/Kconfig" + + source "drivers/uwb/Kconfig" -- cgit v1.2.3 From 8a325b2af866300353e500e9693fc08991df52b7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 16 May 2010 13:15:00 +0200 Subject: add preliminary support for my pcmcia smartcard reader --- mk/modules.mk | 14 +- package/Config.in | 4 + package/base-files/src/lib/mdev/init | 6 + package/ccid/Makefile | 28 + package/opensc/Makefile | 5 +- package/pcmciautils/Makefile | 32 + package/pcmciautils/files/config.opts | 34 + package/pcmciautils/patches/patch-Makefile | 11 + package/pcsc-lite/Makefile | 36 + package/pcsc-lite/files/pcscd.init | 27 + package/pcsc-lite/files/pcscd.postinst | 3 + package/pcsc-lite/files/reader.conf | 16 + package/sysfsutils/Makefile | 27 + scripts/scan-pkgs.sh | 9 +- target/ibmx40/kernel.config | 1919 +- target/ibmx40/target.mk | 4 +- target/linux/config/Config.in.pcmcia | 17 +- target/linux/patches/2.6.33.3/aufs2.patch | 24455 +++++++++++++++++++ .../linux/patches/2.6.33.3/bsd-compatibility.patch | 2513 ++ target/linux/patches/2.6.33.3/cc-abstract.patch | 14 + target/linux/patches/2.6.33.3/cris-initrd.patch | 14 + target/linux/patches/2.6.33.3/cygwin-compat.patch | 14 + target/linux/patches/2.6.33.3/exmap.patch | 11 + target/linux/patches/2.6.33.3/freebsd-compat.patch | 11 + target/linux/patches/2.6.33.3/mtd-root.patch | 62 + target/linux/patches/2.6.33.3/ocf.patch | 23653 ++++++++++++++++++ target/linux/patches/2.6.33.3/startup.patch | 20 + target/linux/patches/2.6.33.3/swconfig.patch | 1075 + target/linux/patches/2.6.33.3/yaffs2.patch | 15066 ++++++++++++ 29 files changed, 68877 insertions(+), 223 deletions(-) create mode 100644 package/ccid/Makefile create mode 100644 package/pcmciautils/Makefile create mode 100644 package/pcmciautils/files/config.opts create mode 100644 package/pcmciautils/patches/patch-Makefile create mode 100644 package/pcsc-lite/Makefile create mode 100644 package/pcsc-lite/files/pcscd.init create mode 100644 package/pcsc-lite/files/pcscd.postinst create mode 100644 package/pcsc-lite/files/reader.conf create mode 100644 package/sysfsutils/Makefile create mode 100644 target/linux/patches/2.6.33.3/aufs2.patch create mode 100644 target/linux/patches/2.6.33.3/bsd-compatibility.patch create mode 100644 target/linux/patches/2.6.33.3/cc-abstract.patch create mode 100644 target/linux/patches/2.6.33.3/cris-initrd.patch create mode 100644 target/linux/patches/2.6.33.3/cygwin-compat.patch create mode 100644 target/linux/patches/2.6.33.3/exmap.patch create mode 100644 target/linux/patches/2.6.33.3/freebsd-compat.patch create mode 100644 target/linux/patches/2.6.33.3/mtd-root.patch create mode 100644 target/linux/patches/2.6.33.3/ocf.patch create mode 100644 target/linux/patches/2.6.33.3/startup.patch create mode 100644 target/linux/patches/2.6.33.3/swconfig.patch create mode 100644 target/linux/patches/2.6.33.3/yaffs2.patch diff --git a/mk/modules.mk b/mk/modules.mk index fce15c190..a7fc49d8c 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1047,18 +1047,18 @@ $(eval $(call KMOD_template,PCCARD,pccard,\ $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core \ ,40)) -$(eval $(call KMOD_template,PCMCIA,pcmcia,\ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia \ -,50)) - -$(eval $(call KMOD_template,CARDBUS,cardbus,\ +$(eval $(call KMOD_template,YENTA,yenta,\ $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic \ $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket \ ,50)) -$(eval $(call KMOD_template,PCMCIA_SERIAL_CS,pcmcia-serial-cs,\ +$(eval $(call KMOD_template,PCMCIA,pcmcia,\ + $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia \ +,60)) + +$(eval $(call KMOD_template,SERIAL_8250_CS,serial-8250-cs,\ $(MODULES_DIR)/kernel/drivers/serial/serial_cs \ -,55)) +,70)) # # Input diff --git a/package/Config.in b/package/Config.in index 5f1a0bdd4..265e222fd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -56,6 +56,7 @@ source "package/xz/Config.in" endmenu menu "Cryptography" +source "package/ccid/Config.in" source "package/cryptsetup/Config.in" source "package/gnupg/Config.in" source "package/gnutls/Config.in" @@ -65,6 +66,7 @@ source "package/openct/Config.in" source "package/opensc/Config.in" source "package/openssl/Config.in" source "package/openssl-pkcs11/Config.in" +source "package/pcsc-lite/Config.in" source "package/rng-tools/Config.in" endmenu @@ -579,9 +581,11 @@ source "package/hdparm/Config.in" source "package/usbutils/Config.in" source "package/patch/Config.in" source "package/pciutils/Config.in" +source "package/pcmciautils/Config.in" source "package/procps/Config.in" source "package/sispmctl/Config.in" source "package/stress/Config.in" +source "package/sysfsutils/Config.in" source "package/sysstat/Config.in" source "package/swconfig/Config.in" source "package/udev/Config.in" diff --git a/package/base-files/src/lib/mdev/init b/package/base-files/src/lib/mdev/init index de368c80c..eec8242a1 100644 --- a/package/base-files/src/lib/mdev/init +++ b/package/base-files/src/lib/mdev/init @@ -14,3 +14,9 @@ if [ "$SUBSYSTEM" == "firmware" ];then fi fi fi +if [ "$SUBSYSTEM" == "pcmcia_socket" ];then + logger "Setting up PCMCIA socket resource database" + if [ "$ACTION" == "add" ];then + /usr/sbin/pcmcia-socket-startup + fi +fi diff --git a/package/ccid/Makefile b/package/ccid/Makefile new file mode 100644 index 000000000..2e63a888c --- /dev/null +++ b/package/ccid/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= ccid +PKG_VERSION:= 1.3.12 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 7fcdbacacd955659286f988fa9b6e0be +PKG_DESCR:= a generic USB CCID and ICCD driver +PKG_SECTION:= security +PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html +PKG_SITES:= https://alioth.debian.org/frs/download.php/3281/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,CCID,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --enable-twinserial + +post-install: + $(INSTALL_DIR) $(IDIR_CCID)/usr/pcsc/drivers/serial + $(CP) $(WRKINST)/usr/pcsc/drivers/serial/libccidtwin.so* \ + $(IDIR_CCID)/usr/pcsc/drivers/serial + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 702a38751..2cf89050e 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -4,11 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= opensc -PKG_VERSION:= 0.11.8 +PKG_VERSION:= 0.11.13 PKG_RELEASE:= 1 -PKG_MD5SUM:= a269b478b18dddb648b9bd930206b5a8 +PKG_MD5SUM:= 98fa151e947941f9c3f27420fdf47c11 PKG_DESCR:= a set of libraries and utilities to access smart cards PKG_SECTION:= crypto +PKG_BUILDDEP+= libtool PKG_URL:= http://www.opensc-project.org/opensc PKG_SITES:= http://www.opensc-project.org/files/opensc/ diff --git a/package/pcmciautils/Makefile b/package/pcmciautils/Makefile new file mode 100644 index 000000000..d99b1a7d1 --- /dev/null +++ b/package/pcmciautils/Makefile @@ -0,0 +1,32 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= pcmciautils +PKG_VERSION:= 017 +PKG_RELEASE:= 1 +PKG_MD5SUM:= ee5837214d297661c8b8189055a351fc +PKG_DESCR:= Utilities for PCMCIA subsystem +PKG_SECTION:= utils +PKG_BUILDDEP+= sysfsutils +PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html +PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PCMCIAUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE= manual + +post-install: + $(INSTALL_DIR) $(IDIR_PCMCIAUTILS)/etc/pcmcia + $(INSTALL_DATA) ./files/config.opts \ + $(IDIR_PCMCIAUTILS)/etc/pcmcia + $(INSTALL_DIR) $(IDIR_PCMCIAUTILS)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/sbin/pccardctl \ + $(IDIR_PCMCIAUTILS)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/lib/udev/pcmcia-socket-startup \ + $(IDIR_PCMCIAUTILS)/usr/sbin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcmciautils/files/config.opts b/package/pcmciautils/files/config.opts new file mode 100644 index 000000000..868ab48c4 --- /dev/null +++ b/package/pcmciautils/files/config.opts @@ -0,0 +1,34 @@ +# +# Local PCMCIA Configuration File +# +#---------------------------------------------------------------------- +# +# System resources available for PCMCIA cards +# +# NOTE: these settings have no effect on resources assigned to a +# CardBus bridge device itself; this file only affects resources +# assigned to cards. Also, interrupt settings here will only affect +# ISA bus interrupts assigned to 16-bit cards. PCI interrupts +# generally can't be reconfigured. +# +# With the kernel PCMCIA subsystem, these settings also have no effect +# at all on resources used for 32-bit CardBus cards. Those are set by +# the PCI hotplug subsystem. +# + +include port 0x100-0x3af +include port 0x3e0-0x4ff +include port 0x820-0x8ff +include port 0xc00-0xcf7 + +include memory 0xc0000-0xfffff +include memory 0xa0000000-0xa0ffffff +include memory 0x60000000-0x60ffffff + +# These may hurt on FSC. +# include port 0x3c0-0x3d2 +# Exclude 0x3d3 as Radeon IGP MCE's if you touch these ports +# include port 0x3d4-0x3df + +# High port numbers do not always work... +# include port 0x1000-0x17ff diff --git a/package/pcmciautils/patches/patch-Makefile b/package/pcmciautils/patches/patch-Makefile new file mode 100644 index 000000000..821753ddc --- /dev/null +++ b/package/pcmciautils/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- pcmciautils-017.orig/Makefile 2010-01-06 16:47:45.000000000 +0100 ++++ pcmciautils-017/Makefile 2010-05-13 14:06:30.741613760 +0200 +@@ -94,7 +94,7 @@ PWD = $(shell pwd) + # If you are running a cross compiler, you may want to set this + # to something more interesting, like "arm-linux-". If you want + # to compile vs uClibc, that can be done here as well. +-CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- ++CROSS ?= #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- + CC = $(CROSS)gcc + LD = $(CROSS)gcc + AR = $(CROSS)ar diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile new file mode 100644 index 000000000..b81a64d27 --- /dev/null +++ b/package/pcsc-lite/Makefile @@ -0,0 +1,36 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= pcsc-lite +PKG_VERSION:= 1.6.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= fc3fd0e83090ecc81e5b32700fa246c2 +PKG_DESCR:= middleware for smartcards +PKG_SECTION:= security +PKG_BUILDDEP+= libusb libusb-compat +PKG_DEPENDS:= libusb libusb-compat libpthread ccid +PKG_URL:= http://pcsclite.alioth.debian.org/ +PKG_SITES:= https://alioth.debian.org/frs/download.php/3279/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PCSC_LITE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --disable-libhal + +post-install: + $(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc + $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/sbin + $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/lib + $(INSTALL_DATA) ./files/reader.conf \ + $(IDIR_PCSC_LITE)/etc + $(INSTALL_BIN) $(WRKINST)/usr/sbin/pcscd \ + $(IDIR_PCSC_LITE)/usr/sbin + $(CP) $(WRKINST)/usr/lib/libpcsclite.so* \ + $(IDIR_PCSC_LITE)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcsc-lite/files/pcscd.init b/package/pcsc-lite/files/pcscd.init new file mode 100644 index 000000000..557762eca --- /dev/null +++ b/package/pcsc-lite/files/pcscd.init @@ -0,0 +1,27 @@ +#!/bin/sh +#PKG pcscd +#INIT 80 + +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${pcscd:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + pcscd + ;; +stop) + pkill pcscd + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "usage: $0 {start | stop | restart}" + ;; +esac +exit $? diff --git a/package/pcsc-lite/files/pcscd.postinst b/package/pcsc-lite/files/pcscd.postinst new file mode 100644 index 000000000..1b27f479d --- /dev/null +++ b/package/pcsc-lite/files/pcscd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf pcscd pcscd NO diff --git a/package/pcsc-lite/files/reader.conf b/package/pcsc-lite/files/reader.conf new file mode 100644 index 000000000..f56f290fb --- /dev/null +++ b/package/pcsc-lite/files/reader.conf @@ -0,0 +1,16 @@ +# FRIENDLYNAME Any name +# DEVICENAME device filename used by the reader: +# /dev/ttyS0 for the first serial port +# or /dev/null if this is not used by the driver +# LIBPATH Location of the driver library for your reader +# CHANNELID +# 0x0103F8 or 1 for /dev/ttyS0 (COM1) +# 0x0102F8 or 2 for /dev/ttyS1 (COM2) +# 0x0103E8 or 3 for /dev/ttyS2 (COM3) +# 0x0102E8 or 4 for /dev/ttyS3 (COM4) +# + +FRIENDLYNAME "GemPCTwin serial" +DEVICENAME /dev/ttyS0 +LIBPATH /usr/pcsc/drivers/serial/libccidtwin.so +CHANNELID 0 diff --git a/package/sysfsutils/Makefile b/package/sysfsutils/Makefile new file mode 100644 index 000000000..33bc0b905 --- /dev/null +++ b/package/sysfsutils/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= sysfsutils +PKG_VERSION:= 2.1.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 14e7dcd0436d2f49aa403f67e1ef7ddc +PKG_DESCR:= utilites built upon sysfs +PKG_SECTION:= utils +PKG_URL:= http://linux-diag.sourceforge.net/Sysfsutils.html +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-diag/sysfsutils/2.1.0/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,SYSFSUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +post-install: + $(INSTALL_DIR) $(IDIR_SYSFSUTILS)/usr/bin + $(INSTALL_DIR) $(IDIR_SYSFSUTILS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsysfs.so* \ + $(IDIR_SYSFSUTILS)/usr/lib + $(INSTALL_BIN) $(WRKINST)/usr/bin/systool \ + $(IDIR_SYSFSUTILS)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 854712190..c3724740f 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -38,14 +38,15 @@ if [[ -n $ADK_PACKAGE_FIREFOX ]]; then NEED_LIBIDL="$NEED_LIBIDL firefox" fi -if [[ -n $ADK_PACKAGE_LIBUSB ]]; then - NEED_BISON="$NEED_BISON libusb" -fi - if [[ -n $ADK_COMPILE_HEIMDAL ]]; then NEED_BISON="$NEED_BISON heimdal-server" fi +if [[ -n $ADK_COMPILE_PCMCIAUTILS ]]; then + NEED_BISON="$NEED_BISON pcmciautils" + NEED_FLEX="$NEED_FLEX pcmciautils" +fi + if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config" fi diff --git a/target/ibmx40/kernel.config b/target/ibmx40/kernel.config index c1190ba62..ff04d19be 100644 --- a/target/ibmx40/kernel.config +++ b/target/ibmx40/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.33.2 -# Mon Apr 12 21:50:04 2010 +# Linux kernel version: 2.6.33-rc2-zen1 "Blue Chair" +# Sun Jan 10 23:31:23 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -46,7 +46,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_X86_32_LAZY_GS=y CONFIG_KTIME_SCALAR=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y @@ -54,28 +53,30 @@ CONFIG_CONSTRUCTORS=y # # General setup # +# CONFIG_SCHED_BFS is not set CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION="-zen-nuty" +CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -# CONFIG_KERNEL_GZIP is not set +CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_BZIP2 is not set -CONFIG_KERNEL_LZMA=y -# CONFIG_KERNEL_LZO is not set -# CONFIG_SWAP is not set +# CONFIG_KERNEL_LZMA is not set +CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set -# CONFIG_AUDIT is not set +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_TREE=y # # RCU Subsystem @@ -89,31 +90,42 @@ CONFIG_RCU_FANOUT=32 # CONFIG_TREE_RCU_TRACE is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=15 +CONFIG_LOG_BUF_SHIFT=16 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set -# CONFIG_RELAY is not set -# CONFIG_NAMESPACES is not set +CONFIG_RELAY=y +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" -# CONFIG_RD_GZIP is not set -# CONFIG_RD_BZIP2 is not set +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y -# CONFIG_RD_LZO is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set + +# +# Custom Build Flags +# +CONFIG_CUSTOM_CFLAGS="" +CONFIG_CUSTOM_MAKEFLAGS="" CONFIG_SYSCTL=y CONFIG_ANON_INODES=y -CONFIG_EMBEDDED=y +# CONFIG_EMBEDDED is not set CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -# CONFIG_ELF_CORE is not set -# CONFIG_PCSPKR_PLATFORM is not set +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -129,14 +141,17 @@ CONFIG_HAVE_PERF_EVENTS=y # CONFIG_PERF_EVENTS=y # CONFIG_PERF_COUNTERS is not set -# CONFIG_VM_EVENT_COUNTERS is not set +CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y -# CONFIG_SLUB is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLQB is not set # CONFIG_SLOB is not set # CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -150,7 +165,7 @@ CONFIG_HAVE_USER_RETURN_NOTIFIER=y # # GCOV-based kernel profiling # -# CONFIG_SLOW_WORK is not set +CONFIG_SLOW_WORK=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -162,7 +177,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y -# CONFIG_LBDAF is not set +CONFIG_LBDAF=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set @@ -172,10 +187,12 @@ CONFIG_BLOCK=y CONFIG_IOSCHED_NOOP=y # CONFIG_IOSCHED_DEADLINE is not set CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_BFQ=y # CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_BFQ=y # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEFAULT_IOSCHED="bfq" # CONFIG_INLINE_SPIN_TRYLOCK is not set # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set # CONFIG_INLINE_SPIN_LOCK is not set @@ -205,7 +222,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set # CONFIG_MUTEX_SPIN_ON_OWNER is not set -# CONFIG_FREEZER is not set +CONFIG_FREEZER=y # # Processor type and features @@ -215,9 +232,9 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y # CONFIG_SMP is not set -# CONFIG_SPARSE_IRQ is not set -CONFIG_X86_MPPARSE=y +# CONFIG_X86_MPPARSE is not set # CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_PARAVIRT_GUEST is not set # CONFIG_MEMTEST is not set @@ -234,6 +251,7 @@ CONFIG_MPENTIUMM=y # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set +# CONFIG_MK10 is not set # CONFIG_MCRUSOE is not set # CONFIG_MEFFICEON is not set # CONFIG_MWINCHIPC6 is not set @@ -248,8 +266,10 @@ CONFIG_MPENTIUMM=y # CONFIG_MATOM is not set # CONFIG_GENERIC_CPU is not set # CONFIG_X86_GENERIC is not set +CONFIG_X86_MARCH_NATIVE=y CONFIG_X86_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_INTERNODE_CACHE_BYTES=X86_L1_CACHE_BYTES CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_XADD=y @@ -272,8 +292,9 @@ CONFIG_CPU_SUP_INTEL=y # CONFIG_CPU_SUP_TRANSMETA_32 is not set # CONFIG_CPU_SUP_UMC_32 is not set # CONFIG_X86_DS is not set -# CONFIG_HPET_TIMER is not set -# CONFIG_DMI is not set +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y # CONFIG_IOMMU_HELPER is not set # CONFIG_IOMMU_API is not set CONFIG_NR_CPUS=1 @@ -284,8 +305,14 @@ CONFIG_X86_UP_APIC=y CONFIG_X86_UP_IOAPIC=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y -CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -# CONFIG_X86_MCE is not set +# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +# CONFIG_X86_MCE_AMD is not set +# CONFIG_X86_ANCIENT_MCE is not set +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y CONFIG_VM86=y # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set @@ -296,6 +323,7 @@ CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=y CONFIG_X86_CPUID=y +CONFIG_X86_CPU_DEBUG=y # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set @@ -307,19 +335,17 @@ CONFIG_VMSPLIT_3G=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_NEED_NODE_MEMMAP_SIZE=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_SELECT_MEMORY_MODEL=y -# CONFIG_FLATMEM_MANUAL is not set +CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_HAVE_MEMORY_PRESENT=y +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPARSEMEM_STATIC=y -# CONFIG_MEMORY_HOTPLUG is not set +CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 @@ -327,44 +353,148 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +# CONFIG_MEMORY_FAILURE is not set # CONFIG_HIGHPTE is not set -# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_RESERVE_LOW_64K=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y -# CONFIG_MTRR_SANITIZER is not set +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y -# CONFIG_SECCOMP is not set -# CONFIG_CC_STACKPROTECTOR is not set +# CONFIG_EFI is not set +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set -CONFIG_HZ_250=y +# CONFIG_HZ_250_NODEFAULT is not set # CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=250 +CONFIG_HZ_1000=y +# CONFIG_HZ_1500 is not set +# CONFIG_HZ_2000 is not set +# CONFIG_HZ_3000 is not set +# CONFIG_HZ_4000 is not set +# CONFIG_HZ_5000 is not set +# CONFIG_HZ_7500 is not set +# CONFIG_HZ_10000 is not set +CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y # CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set -CONFIG_PHYSICAL_START=0x200000 +CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set -CONFIG_PHYSICAL_ALIGN=0x200000 +CONFIG_PHYSICAL_ALIGN=0x100000 # CONFIG_COMPAT_VDSO is not set -CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0,115200 console=tty0" -# CONFIG_CMDLINE_OVERRIDE is not set +# CONFIG_CMDLINE_BOOL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # # Power management and ACPI options # -# CONFIG_PM is not set +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATION_NVS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="/dev/mapper/swap" +CONFIG_TOI_CORE=y + +# +# Image Storage (you need at least one allocator) +# +# CONFIG_TOI_FILE is not set +CONFIG_TOI_SWAP=y + +# +# General Options +# +CONFIG_TOI_CRYPTO=y +CONFIG_TOI_USERUI=y +CONFIG_TOI_USERUI_DEFAULT_PATH="/sbin/tuxoniceui_text" +# CONFIG_TOI_KEEP_IMAGE is not set +CONFIG_TOI_REPLACE_SWSUSP=y +CONFIG_TOI_IGNORE_LATE_INITCALL=y +CONFIG_TOI_DEFAULT_WAIT=-1 +CONFIG_TOI_DEFAULT_EXTRA_PAGES_ALLOWANCE=500 +CONFIG_TOI_CHECKSUM=y +CONFIG_TOI=y +CONFIG_PM_RUNTIME=y +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_PROCFS=y +CONFIG_ACPI_PROCFS_POWER=y +# CONFIG_ACPI_POWER_METER is not set +CONFIG_ACPI_SYSFS_POWER=y +CONFIG_ACPI_PROC_EVENT=y +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_VIDEO=y +CONFIG_ACPI_FAN=y +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR=y +# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set +CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_CUSTOM_DSDT_FILE="" +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +# CONFIG_ACPI_PCI_SLOT is not set +CONFIG_X86_PM_TIMER=y +# CONFIG_ACPI_CONTAINER is not set +# CONFIG_ACPI_SBS is not set # CONFIG_SFI is not set +# CONFIG_APM is not set # # CPU Frequency scaling # -# CONFIG_CPU_FREQ is not set -# CONFIG_CPU_IDLE is not set +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set + +# +# CPUFreq processor drivers +# +CONFIG_X86_ACPI_CPUFREQ=y +# CONFIG_X86_POWERNOW_K6 is not set +# CONFIG_X86_POWERNOW_K7 is not set +# CONFIG_X86_POWERNOW_K8 is not set +# CONFIG_X86_GX_SUSPMOD is not set +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +# CONFIG_X86_SPEEDSTEP_ICH is not set +# CONFIG_X86_SPEEDSTEP_SMI is not set +# CONFIG_X86_P4_CLOCKMOD is not set +# CONFIG_X86_CPUFREQ_NFORCE2 is not set +# CONFIG_X86_LONGRUN is not set +# CONFIG_X86_LONGHAUL is not set +# CONFIG_X86_E_POWERSAVER is not set +# CONFIG_X86_CPUFREQ_EEEPC900 is not set + +# +# shared options +# +# CONFIG_X86_SPEEDSTEP_LIB is not set +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y # # Bus options (PCI etc.) @@ -377,27 +507,50 @@ CONFIG_PCI=y CONFIG_PCI_GOANY=y CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y CONFIG_PCI_DOMAINS=y # CONFIG_PCIEPORTBUS is not set CONFIG_ARCH_SUPPORTS_MSI=y -CONFIG_PCI_MSI=y +# CONFIG_PCI_MSI is not set # CONFIG_PCI_LEGACY is not set # CONFIG_PCI_STUB is not set # CONFIG_HT_IRQ is not set -# CONFIG_PCI_IOV is not set +CONFIG_PCI_IOV=y +CONFIG_PCI_IOAPIC=y CONFIG_ISA_DMA_API=y -# CONFIG_ISA is not set +CONFIG_ISA=y +# CONFIG_EISA is not set # CONFIG_MCA is not set # CONFIG_SCx200 is not set # CONFIG_OLPC is not set -CONFIG_K8_NB=y -# CONFIG_PCCARD is not set +CONFIG_PCCARD=y +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +# CONFIG_PCMCIA_IOCTL is not set +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +# CONFIG_PD6729 is not set +# CONFIG_I82092 is not set +# CONFIG_I82365 is not set +# CONFIG_TCIC is not set +CONFIG_PCMCIA_PROBE=y +CONFIG_PCCARD_NONSTATIC=m # CONFIG_HOTPLUG_PCI is not set # # Executable file formats / Emulations # CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_HAVE_AOUT=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set @@ -410,42 +563,203 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y -# CONFIG_NET_KEY is not set +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set +CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y # CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set # CONFIG_ARPD is not set CONFIG_SYN_COOKIES=y -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_XFRM_TUNNEL is not set -# CONFIG_INET_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -# CONFIG_IPV6 is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=y +CONFIG_INET6_ESP=y +CONFIG_INET6_IPCOMP=m +# CONFIG_IPV6_MIP6 is not set +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=y +CONFIG_INET6_XFRM_MODE_TUNNEL=y +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +# CONFIG_IPV6_SIT is not set +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# CONFIG_IPV6_MROUTE is not set # CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +# CONFIG_BRIDGE_NETFILTER is not set + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +# CONFIG_NF_CT_ACCT is not set +# CONFIG_NF_CONNTRACK_MARK is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CT_PROTO_DCCP is not set +# CONFIG_NF_CT_PROTO_SCTP is not set +# CONFIG_NF_CT_PROTO_UDPLITE is not set +# CONFIG_NF_CONNTRACK_AMANDA is not set +# CONFIG_NF_CONNTRACK_FTP is not set +# CONFIG_NF_CONNTRACK_H323 is not set +# CONFIG_NF_CONNTRACK_IRC is not set +# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set +# CONFIG_NF_CONNTRACK_PPTP is not set +# CONFIG_NF_CONNTRACK_SANE is not set +# CONFIG_NF_CONNTRACK_SIP is not set +# CONFIG_NF_CONNTRACK_TFTP is not set +# CONFIG_NF_CT_NETLINK is not set +# CONFIG_NETFILTER_TPROXY is not set +CONFIG_NETFILTER_XTABLES=y +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +CONFIG_NETFILTER_XT_TARGET_DSCP=m +# CONFIG_NETFILTER_XT_TARGET_HL is not set +# CONFIG_NETFILTER_XT_TARGET_LED is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set +# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set +# CONFIG_NETFILTER_XT_MATCH_HL is not set +# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +CONFIG_NETFILTER_XT_MATCH_LIMIT=y +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +CONFIG_NETFILTER_XT_MATCH_POLICY=m +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_TIME is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_OSF is not set +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=y +# CONFIG_IP_NF_MATCH_ADDRTYPE is not set +# CONFIG_IP_NF_MATCH_AH is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_TTL is not set +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +# CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +# CONFIG_IP_NF_TARGET_NETMAP is not set +CONFIG_IP_NF_TARGET_REDIRECT=m +# CONFIG_NF_NAT_SNMP_BASIC is not set +# CONFIG_NF_NAT_FTP is not set +# CONFIG_NF_NAT_IRC is not set +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +# CONFIG_NF_NAT_H323 is not set +# CONFIG_NF_NAT_SIP is not set +CONFIG_IP_NF_MANGLE=m +# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration +# +# CONFIG_NF_CONNTRACK_IPV6 is not set +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=y +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_TARGET_HL is not set +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_TARGET_REJECT=m +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=m +CONFIG_BRIDGE=m # CONFIG_NET_DSA is not set -# CONFIG_VLAN_8021Q is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=m # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -461,21 +775,114 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # # Network testing # -# CONFIG_NET_PKTGEN is not set +CONFIG_NET_PKTGEN=m # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set -# CONFIG_AF_RXRPC is not set -CONFIG_WIRELESS=y -# CONFIG_CFG80211 is not set -# CONFIG_LIB80211 is not set +CONFIG_IRDA=y + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# # -# CFG80211 needs to be enabled for MAC80211 +# SIR device drivers # +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +# CONFIG_DONGLE is not set +# CONFIG_KINGSUN_DONGLE is not set +# CONFIG_KSDAZZLE_DONGLE is not set +# CONFIG_KS959_DONGLE is not set + +# +# FIR device drivers +# +# CONFIG_USB_IRDA is not set +# CONFIG_SIGMATEL_FIR is not set +CONFIG_NSC_FIR=m +# CONFIG_WINBOND_FIR is not set +# CONFIG_TOSHIBA_FIR is not set +# CONFIG_SMC_IRCC_FIR is not set +# CONFIG_ALI_FIR is not set +# CONFIG_VLSI_FIR is not set +# CONFIG_VIA_FIR is not set +# CONFIG_MCS_FIR is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +# CONFIG_BT_HCIBTSDIO is not set +# CONFIG_BT_HCIUART is not set +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIDTL1 is not set +# CONFIG_BT_HCIBT3C is not set +# CONFIG_BT_HCIBLUECARD is not set +# CONFIG_BT_HCIBTUART is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_BT_MRVL is not set +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_WIRELESS_OLD_REGULATORY is not set +CONFIG_CFG80211_WEXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=y +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set -# CONFIG_RFKILL is not set +CONFIG_RFKILL=y +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y # CONFIG_NET_9P is not set # @@ -486,36 +893,81 @@ CONFIG_WIRELESS=y # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_DEVTMPFS is not set # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y -# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" # CONFIG_SYS_HYPERVISOR is not set -# CONFIG_CONNECTOR is not set +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y # CONFIG_MTD is not set -# CONFIG_PARPORT is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +# CONFIG_PARPORT_SERIAL is not set +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_PCMCIA is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +CONFIG_PARPORT_1284=y +CONFIG_PNP=y +CONFIG_PNP_DEBUG_MESSAGES=y + +# +# Protocols +# +CONFIG_ISAPNP=y +CONFIG_PNPBIOS=y +CONFIG_PNPBIOS_PROC_FS=y +CONFIG_PNPACPI=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set -# CONFIG_BLK_DEV_LOOP is not set - -# -# DRBD disabled because PROC_FS, INET or CONNECTOR not selected -# +CONFIG_BLK_DEV_LOOP=m +# CONFIG_BLK_DEV_LOOP_AES is not set +# CONFIG_BLK_DEV_LOOP_KEYSCRUB is not set +# CONFIG_BLK_DEV_DRBD is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set +# CONFIG_BLK_DEV_RAMZSWAP is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_BLK_DEV_HD is not set -# CONFIG_MISC_DEVICES is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_IBM_ASM is not set +# CONFIG_PHANTOM is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_CS5535_MFGPT is not set +# CONFIG_HP_ILO is not set +# CONFIG_ISL29003 is not set +# CONFIG_DS1682 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=y +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_CB710_CORE is not set +# CONFIG_IWMC3200TOP is not set +CONFIG_THINKPAD_EC=y +CONFIG_TP_SMAPI=y CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -532,16 +984,16 @@ CONFIG_SCSI_DMA=y # # SCSI support type (disk, tape, CD-ROM) # -# CONFIG_BLK_DEV_SD is not set +CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set -# CONFIG_CHR_DEV_SG is not set +CONFIG_CHR_DEV_SG=y # CONFIG_CHR_DEV_SCH is not set # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_WAIT_SCAN=m # @@ -553,11 +1005,13 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set # CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set -# CONFIG_ATA_VERBOSE_ERROR is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y # CONFIG_SATA_PMP is not set # CONFIG_SATA_AHCI is not set # CONFIG_SATA_SIL24 is not set @@ -576,6 +1030,7 @@ CONFIG_ATA_PIIX=y # CONFIG_SATA_VIA is not set # CONFIG_SATA_VITESSE is not set # CONFIG_SATA_INIC162X is not set +# CONFIG_PATA_ACPI is not set # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set @@ -594,9 +1049,11 @@ CONFIG_ATA_PIIX=y # CONFIG_PATA_HPT37X is not set # CONFIG_PATA_HPT3X2N is not set # CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_ISAPNP is not set # CONFIG_PATA_IT821X is not set # CONFIG_PATA_IT8213 is not set # CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_LEGACY is not set # CONFIG_PATA_TRIFLEX is not set # CONFIG_PATA_MARVELL is not set # CONFIG_PATA_MPIIX is not set @@ -607,8 +1064,10 @@ CONFIG_ATA_PIIX=y # CONFIG_PATA_NS87415 is not set # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PCMCIA is not set # CONFIG_PATA_PDC2027X is not set # CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_QDI is not set # CONFIG_PATA_RADISYS is not set # CONFIG_P