diff options
author | waldemar brodkorb <wbx@debian-lenny-amd64.foo.bar> | 2010-01-20 21:31:08 +0100 |
---|---|---|
committer | waldemar brodkorb <wbx@debian-lenny-amd64.foo.bar> | 2010-01-20 21:31:08 +0100 |
commit | 68bb17312be33ae09255737dde26a93663cfc2ba (patch) | |
tree | 71b0c26cf47124fe20e95d5eebeef5c300f28c66 | |
parent | a154a4cae1b78e68f4421142e7f2e77c85db4754 (diff) |
fix allmodconfig for foxboard
-rw-r--r-- | package/cryptsetup/Makefile | 2 | ||||
-rw-r--r-- | package/nss/Makefile | 2 | ||||
-rw-r--r-- | package/openswan/patches/patch-lib_libopenswan_alg_info_c | 6 | ||||
-rw-r--r-- | package/openswan/patches/patch-programs_eroute_eroute_c | 11 | ||||
-rw-r--r-- | package/quagga/Makefile | 1 | ||||
-rw-r--r-- | package/rpm/Makefile | 4 | ||||
-rw-r--r-- | package/sdl-image/Makefile | 4 | ||||
-rw-r--r-- | package/util-linux-ng/Makefile | 3 | ||||
-rw-r--r-- | scripts/scan-pkgs.sh | 4 | ||||
-rw-r--r-- | target/foxboard/kernel.config | 153 | ||||
-rw-r--r-- | target/linux/config/Config.in.aufs | 3 | ||||
-rw-r--r-- | target/linux/config/Config.in.block | 9 | ||||
-rw-r--r-- | target/linux/config/Config.in.bluetooth | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.fs | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.input | 3 | ||||
-rw-r--r-- | target/linux/config/Config.in.isdn | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.multimedia | 2 |
17 files changed, 133 insertions, 81 deletions
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 3a51fdf54..7e41abe3b 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP+= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com PKG_SITES:= http://cryptsetup.googlecode.com/files/ +PKG_TARGET_DEPENDS:= !foxboard + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/nss/Makefile b/package/nss/Makefile index 19f53ea3a..f84afc8ab 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -14,6 +14,8 @@ PKG_NOPARALLEL:= 1 PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/ PKG_SITES:= https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/ +PKG_TARGET_DEPENDS:= !foxboard + WRKSRC= ${WRKDIST}/mozilla/security/nss include $(TOPDIR)/mk/package.mk diff --git a/package/openswan/patches/patch-lib_libopenswan_alg_info_c b/package/openswan/patches/patch-lib_libopenswan_alg_info_c index 0c616e07c..0da5f9ad1 100644 --- a/package/openswan/patches/patch-lib_libopenswan_alg_info_c +++ b/package/openswan/patches/patch-lib_libopenswan_alg_info_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- openswan-2.6.18.orig/lib/libopenswan/alg_info.c 2008-10-06 18:52:49.000000000 +0200 -+++ openswan-2.6.18/lib/libopenswan/alg_info.c 2008-10-14 13:08:49.000000000 +0200 -@@ -749,7 +749,7 @@ alg_info_discover_pfsgroup_hack(struct a +--- openswan-2.6.24.orig/lib/libopenswan/alg_info.c 2010-01-10 02:34:38.000000000 +0100 ++++ openswan-2.6.24/lib/libopenswan/alg_info.c 2010-01-19 23:28:18.000000000 +0100 +@@ -765,7 +765,7 @@ alg_info_discover_pfsgroup_hack(struct a static char err_buf[256]; int ret; diff --git a/package/openswan/patches/patch-programs_eroute_eroute_c b/package/openswan/patches/patch-programs_eroute_eroute_c new file mode 100644 index 000000000..f2d2c52b2 --- /dev/null +++ b/package/openswan/patches/patch-programs_eroute_eroute_c @@ -0,0 +1,11 @@ +--- openswan-2.6.24.orig/programs/eroute/eroute.c 2010-01-10 02:34:38.000000000 +0100 ++++ openswan-2.6.24/programs/eroute/eroute.c 2010-01-20 08:43:00.000000000 +0100 +@@ -268,7 +268,7 @@ main(int argc, char **argv) + exit (1); + } + if(ntohl(said.spi) < 0x100) { +- fprintf(stderr, "%s: Illegal reserved spi: %s => 0x%x Must be larger than 0x100.\n", ++ fprintf(stderr, "%s: Illegal reserved spi: %s => 0x%lx Must be larger than 0x100.\n", + progname, optarg, ntohl(said.spi)); + exit(1); + } diff --git a/package/quagga/Makefile b/package/quagga/Makefile index b5985255d..0f57fb919 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -41,6 +41,7 @@ CONFIGURE_ARGS+= --localstatedir=/var/run/quagga \ --enable-vtysh \ --enable-user=quagga \ --enable-group=quagga \ + --disable-pie \ --enable-multipath=8 BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/rpm/Makefile b/package/rpm/Makefile index 89b50a647..49c7f8339 100644 --- a/package/rpm/Makefile +++ b/package/rpm/Makefile @@ -6,13 +6,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= rpm PKG_VERSION:= 4.7.2 PKG_RELEASE:= 1 -PKG_BUILDDEP+= nss libdb PKG_MD5SUM:= 224715646325df4cd3904e3ac9e16186 PKG_DESCR:= Package Manager PKG_SECTION:= base +PKG_BUILDDEP+= nss libdb PKG_URL:= http://www.rpm.org PKG_SITES:= http://rpm.org/releases/rpm-4.7.x/ +PKG_TARGET_DEPENDS:= !foxboard + DISTFILES:= ${PKG_NAME}-$(PKG_VERSION).tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index da8872763..1840817c6 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 6c06584b31559e2b59f2b982d0d1f628 PKG_DESCR:= Simple DirectMedia Layer PKG_SECTION:= libs -PKG_DEPENDS:= libpng libtiff libjpeg -PKG_BUILDDEP:= libpng libtiff jpeg +PKG_DEPENDS:= libpng libtiff libjpeg libsdl +PKG_BUILDDEP:= libpng libtiff jpeg sdl PKG_URL:= http://www.libsdl.org PKG_SITES:= http://www.libsdl.org/projects/SDL_image/release/ diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile index 4de64d7b0..b73689687 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux-ng/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux-ng PKG_VERSION:= 2.16.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= fc57e5fd5be9e569b026b5077fafe84f PKG_DESCR:= Linux utilities PKG_SECTION:= admin @@ -29,6 +29,7 @@ $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKG_D CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-use-tty-group \ + --disable-schedutils \ --disable-cramfs \ --disable-libblkid \ --disable-libuuid diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index fcc64ac94..9af693c08 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -31,9 +31,6 @@ if [[ -n $ADK_NATIVE ]];then if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then NEED_RPM="$NEED_RPM rpm" fi - if [[ -n $ADK_PACKAGE_SQUID ]]; then - NEED_GXX="$NEED_GXX squid" - fi fi if [[ -n $ADK_PACKAGE_RUBY ]]; then @@ -58,6 +55,7 @@ fi if [[ -n $ADK_PACKAGE_SQUID ]]; then NEED_SSLDEV="$NEED_SSLDEV squid" + NEED_GXX="$NEED_GXX squid" fi if [[ -n $ADK_PACKAGE_DANSGUARDIAN ]]; then diff --git a/target/foxboard/kernel.config b/target/foxboard/kernel.config index e4f870878..9a76abe76 100644 --- a/target/foxboard/kernel.config +++ b/target/foxboard/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.28 -# Tue Dec 30 19:37:01 2008 +# Linux kernel version: 2.6.32 +# Tue Jan 19 21:38:01 2010 # CONFIG_MMU=y CONFIG_ZONE_DMA=y @@ -17,6 +17,7 @@ CONFIG_FORCE_MAX_ZONEORDER=6 CONFIG_CRIS=y CONFIG_HZ=100 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y # # General setup @@ -33,16 +34,27 @@ CONFIG_SYSVIPC_SYSCTL=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_CGROUPS is not set # 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_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y @@ -51,26 +63,32 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_ELF_CORE is not set -# CONFIG_COMPAT_BRK is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y -CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y # CONFIG_AIO is not set + +# +# Kernel Performance Events And Counters +# # CONFIG_VM_EVENT_COUNTERS is not set +# CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set # CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set + +# +# GCOV-based kernel profiling +# +# CONFIG_SLOW_WORK is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y -# CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set @@ -78,11 +96,8 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_KMOD=y CONFIG_BLOCK=y -# CONFIG_LBD is not set -# CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_LSF is not set +# CONFIG_LBDAF is not set # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set @@ -98,19 +113,18 @@ CONFIG_IOSCHED_NOOP=y # CONFIG_DEFAULT_CFQ is not set CONFIG_DEFAULT_NOOP=y CONFIG_DEFAULT_IOSCHED="noop" -CONFIG_CLASSIC_RCU=y # CONFIG_FREEZER is not set # # General setup # CONFIG_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_HAVE_AOUT is not set # CONFIG_BINFMT_MISC is not set CONFIG_GENERIC_HARDIRQS=y CONFIG_ETRAX_CMDLINE="console=ttyS0,115200" -# CONFIG_ETRAX_WATCHDOG is not set +CONFIG_ETRAX_WATCHDOG=y +# CONFIG_ETRAX_WATCHDOG_NICE_DOGGY is not set CONFIG_ETRAX_FAST_TIMER=y # CONFIG_ETRAX_KMALLOCED_MODULES is not set # CONFIG_OOM_REBOOT is not set @@ -125,12 +139,14 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_RESOURCES_64BIT is not set # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y -CONFIG_UNEVICTABLE_LRU=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # # Hardware setup @@ -144,6 +160,7 @@ CONFIG_ETRAX100LX_V2=y CONFIG_ETRAX_ARCH_V10=y # CONFIG_ETRAX_ARCH_V32 is not set CONFIG_ETRAX_DRAM_SIZE=16 +CONFIG_ETRAX_MTD_SIZE=0x00800000 CONFIG_ETRAX_FLASH_BUSWIDTH=2 CONFIG_ETRAX_NANDFLASH_BUSWIDTH=1 CONFIG_ETRAX_FLASH1_SIZE=0 @@ -194,14 +211,12 @@ CONFIG_UNIX=y CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set -# CONFIG_ASK_IP_FIB_HASH is not set -# CONFIG_IP_FIB_TRIE 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_ARPD is not set -CONFIG_SYN_COOKIES=y +# CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set @@ -214,12 +229,6 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y -# CONFIG_DEFAULT_BIC is not set -# CONFIG_DEFAULT_CUBIC is not set -# CONFIG_DEFAULT_HTCP is not set -# CONFIG_DEFAULT_VEGAS is not set -# CONFIG_DEFAULT_WESTWOOD is not set -# CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set @@ -227,6 +236,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_NETFILTER 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 @@ -240,7 +250,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_LAPB is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set # CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set # # Network testing @@ -251,8 +264,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -# CONFIG_PHONET is not set # CONFIG_WIRELESS is not set +# CONFIG_WIMAX is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -312,16 +325,17 @@ CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN=y # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set # CONFIG_SYS_HYPERVISOR is not set CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set CONFIG_MTD_CONCAT=y CONFIG_MTD_PARTITIONS=y CONFIG_MTD_ROOTFS_ROOT_DEV=y -CONFIG_MTD_ROOTFS_SPLIT=y # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_CMDLINE_PARTS is not set # CONFIG_MTD_AR7_PARTS is not set @@ -395,6 +409,11 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y # CONFIG_MTD_ONENAND is not set # +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# # UBI - Unsorted block images # # CONFIG_MTD_UBI is not set @@ -418,22 +437,7 @@ CONFIG_HAVE_IDE=y # CONFIG_SCSI is not set # CONFIG_SCSI_DMA is not set # CONFIG_SCSI_NETLINK is not set - -# -# Multimedia devices -# - -# -# Multimedia core support -# -# CONFIG_VIDEO_DEV is not set -# CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set - -# -# Multimedia drivers -# -# CONFIG_DAB is not set +# CONFIG_MEDIA_SUPPORT is not set CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set @@ -444,6 +448,8 @@ CONFIG_NETDEVICES=y # CONFIG_PHYLIB is not set CONFIG_NET_ETHERNET=y CONFIG_MII=y +# CONFIG_ETHOC is not set +# CONFIG_DNET is not set # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set @@ -451,15 +457,17 @@ CONFIG_MII=y # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set +CONFIG_WLAN=y +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set # -# Wireless LAN +# Enable WiMAX (Networking options) to see the WiMAX drivers # -# CONFIG_WLAN_PRE80211 is not set -# CONFIG_WLAN_80211 is not set -# CONFIG_IWLWIFI_LEDS is not set # # USB Network Adapters @@ -505,6 +513,7 @@ CONFIG_USB_CATC=m # Non-8250 serial port support # CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set @@ -527,17 +536,27 @@ CONFIG_UNIX98_PTYS=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set -CONFIG_FILE_LOCKING=y # CONFIG_XFS_FS is not set # CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_AUFS_FS is not set +CONFIG_FILE_LOCKING=y +# CONFIG_FSNOTIFY is not set # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY is not set +# CONFIG_INOTIFY_USER is not set # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set # +# Caches +# +# CONFIG_FSCACHE is not set + +# # CD-ROM/DVD Filesystems # # CONFIG_ISO9660_FS is not set @@ -562,10 +581,7 @@ CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_CONFIGFS_FS=y - -# -# Miscellaneous filesystems -# +CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set @@ -620,7 +636,10 @@ CONFIG_USB=y # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_HWA_HCD is not set @@ -634,11 +653,11 @@ CONFIG_USB=y # CONFIG_USB_TMC is not set # -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may # # -# see USB_STORAGE Help for more information +# also be needed; see USB_STORAGE Help for more info # # CONFIG_USB_LIBUSUAL is not set @@ -666,26 +685,33 @@ CONFIG_USB=y # CONFIG_USB_LED is not set # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGET is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_VST is not set # CONFIG_USB_GADGET is not set # +# OTG and related infrastructure +# +# CONFIG_NOP_USB_XCEIV is not set +# CONFIG_STAGING is not set + +# # Kernel hacking # # CONFIG_SYSTEM_PROFILER is not set -# CONFIG_PRINTK_TIME is not set -CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_PRINTK_TIME=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y +# CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set @@ -693,11 +719,6 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set - -# -# Tracers -# -# CONFIG_DYNAMIC_PRINTK_DEBUG is not set # CONFIG_SAMPLES is not set # @@ -712,7 +733,6 @@ CONFIG_CRYPTO=y # # Crypto core or helper # -# CONFIG_CRYPTO_FIPS is not set # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set # CONFIG_CRYPTO_GF128MUL is not set @@ -744,11 +764,13 @@ CONFIG_CRYPTO=y # # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set # # Digest # # CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_GHASH is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set @@ -785,6 +807,7 @@ CONFIG_CRYPTO=y # Compression # # CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set # CONFIG_CRYPTO_LZO is not set # @@ -797,11 +820,13 @@ CONFIG_CRYPTO=y # OCF Configuration # # CONFIG_OCF_OCF is not set +# CONFIG_BINARY_PRINTF is not set # # Library routines # CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set # CONFIG_CRC_T10DIF is not set @@ -810,6 +835,6 @@ CONFIG_CRC32=y # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y -CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_DMA=y +CONFIG_NLATTR=y diff --git a/target/linux/config/Config.in.aufs b/target/linux/config/Config.in.aufs index fb63ac931..7956f31c1 100644 --- a/target/linux/config/Config.in.aufs +++ b/target/linux/config/Config.in.aufs @@ -1,8 +1,7 @@ config ADK_KPACKAGE_KMOD_AUFS_FS prompt "Aufs (Advanced multi layered unification filesystem) support" + depends on !ADK_LINUX_CRIS_FOXBOARD tristate - select ADK_KERNEL_EXPERIMENTAL - select FWRT_KPACKAGE_KMOD_EXPORTFS if ADK_KERNEL_AUFS_EXPORT help Aufs is a stackable unification filesystem such as Unionfs, which unifies several directories and provides a merged single diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index d9c997b8d..cf5e7a270 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -46,6 +46,7 @@ config ADK_KERNEL_DM_CRYPT config ADK_KERNEL_BLK_DEV_DM select ADK_KERNEL_MD + depends on !ADK_LINUX_CRIS_FOXBOARD boolean default n @@ -214,12 +215,14 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SR config ADK_KERNEL_BLK_DEV_MD tristate select ADK_KERNEL_MD + depends on !ADK_LINUX_CRIS_FOXBOARD default n config ADK_KPACKAGE_KMOD_BLK_DEV_MD prompt "kmod-md........................... RAID support" tristate depends on !ADK_KERNEL_BLK_DEV_MD + depends on !ADK_LINUX_CRIS_FOXBOARD select ADK_KERNEL_MD help @@ -254,7 +257,7 @@ config ADK_KPACKAGE_KMOD_MD_RAID456 config ADK_KPACKAGE_KMOD_BLK_DEV_DM prompt "kmod-dm........................... Device Mapper support" select ADK_KERNEL_MD - depends on !ADK_KERNEL_BLK_DEV_DM + depends on !(ADK_KERNEL_BLK_DEV_DM || ADK_LINUX_CRIS_FOXBOARD) tristate help Device-mapper is a low level volume manager. It works by allowing @@ -266,8 +269,8 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM config ADK_KPACKAGE_KMOD_DM_CRYPT prompt "kmod-dm-crypt................... Crypt target support" + depends on !(ADK_KERNEL_DM_CRYPT || ADK_LINUX_CRIS_FOXBOARD) select ADK_KPACKAGE_KMOD_BLK_DEV_DM - depends on !ADK_KERNEL_DM_CRYPT select ADK_KERNEL_MD select ADK_KERNEL_CRYPTO select ADK_KPACKAGE_KMOD_CRYPTO_CBC @@ -285,6 +288,7 @@ config ADK_KPACKAGE_KMOD_DM_CRYPT config ADK_KPACKAGE_KMOD_DM_SNAPSHOT prompt "kmod-dm-snapshot................ Snapshot target" select ADK_KPACKAGE_KMOD_BLK_DEV_DM + depends on !ADK_LINUX_CRIS_FOXBOARD tristate help Allow volume managers to take writable snapshots of a device. @@ -292,6 +296,7 @@ config ADK_KPACKAGE_KMOD_DM_SNAPSHOT config ADK_KPACKAGE_KMOD_DM_MIRROR prompt "kmod-dm-mirror.................. Mirror target" select ADK_KPACKAGE_KMOD_BLK_DEV_DM + depends on !ADK_LINUX_CRIS_FOXBOARD tristate help Allow volume managers to mirror logical volumes, also diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth index 5f4dca821..748a6b280 100644 --- a/target/linux/config/Config.in.bluetooth +++ b/target/linux/config/Config.in.bluetooth @@ -68,6 +68,8 @@ config ADK_KPACKAGE_KMOD_BT_HIDP prompt "kmod-bluetooth-hidp............... HIDP protocol support" tristate default n + depends on !ADK_LINUX_CRIS_FOXBOARD + select ADK_KERNEL_INPUT select ADK_KERNEL_HID depends on ADK_KPACKAGE_KMOD_BT depends on ADK_KPACKAGE_KMOD_BT_L2CAP diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 3721c7584..8541065f0 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -70,12 +70,14 @@ config ADK_KPACKAGE_KMOD_EXT3_FS config ADK_KERNEL_EXT4_FS boolean select ADK_KERNEL_CRC16 + depends on !ADK_LINUX_CRIS_FOXBOARD default n config ADK_KPACKAGE_KMOD_EXT4_FS prompt "kmod-fs-ext4...................... EXT4 filesystem support" tristate - depends on !ADK_KERNEL_EXT4_FS + depends on !ADK_KERNEL_EXT4_FS + depends on !ADK_LINUX_CRIS_FOXBOARD select ADK_KPACKAGE_KMOD_CRC16 default n help diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index e281290a2..c320c43a7 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -14,7 +14,7 @@ config ADK_KERNEL_HID_SUPPORT default n config ADK_KERNEL_HID - tristate + bool select ADK_KERNEL_HID_SUPPORT default n @@ -25,6 +25,7 @@ config ADK_KPACKAGE_KMOD_USB_HID select ADK_KERNEL_HID select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_TARGET_WITH_USB + depends on !ADK_LINUX_CRIS_FOXBOARD default n config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD diff --git a/target/linux/config/Config.in.isdn b/target/linux/config/Config.in.isdn index 596160e54..e876fd5ef 100644 --- a/target/linux/config/Config.in.isdn +++ b/target/linux/config/Config.in.isdn @@ -38,6 +38,7 @@ config ADK_KPACKAGE_KMOD_ISDN_CAPI tristate select ADK_KERNEL_ISDN_CAPI_CAPI20 select ADK_KERNEL_ISDN + depends on !ADK_LINUX_CRIS_FOXBOARD default n help Kernel support for CAPI 2.0 and /dev/capi20 diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index 6c0e91517..b24ac2fa3 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -1,5 +1,5 @@ menu "Multimedia devices support" -depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB +depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB && !ADK_LINUX_CRIS_FOXBOARD config ADK_KERNEL_SND_TIMER boolean |