diff options
| -rw-r--r-- | package/oprofile/Makefile | 2 | ||||
| -rw-r--r-- | package/util-linux/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.debug | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.network | 4 | ||||
| -rw-r--r-- | target/m68k/kernel.config | 69 |
5 files changed, 13 insertions, 67 deletions
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index d0bfbea2d..7a7ef934e 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= popt binutils PKG_URL:= http://oprofile.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/} -PKG_ARCH_DEPENDS:= !cris !avr32 +PKG_ARCH_DEPENDS:= !cris !avr32 !m68k PKG_CFLINE_OPROFILE:= select BUSYBOX_EXPR diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 8ca5eec63..76d482629 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -13,6 +13,8 @@ PKG_BUILDDEP:= ncurses PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.23/ PKG_NOPARALLEL:= 1 +PKG_ARCH_DEPENDS:= !m68k + DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SUBPKGS:= FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 50c173321..cea0198d1 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -90,7 +90,8 @@ config ADK_KPACKAGE_KMOD_OPROFILE prompt "kernel support for oprofile" tristate select ADK_KERNEL_PROFILING - depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX + depends on !ADK_LINUX_CRIS + depends on !ADK_LINUX_M68K default n help use oprofile package to make use of the kernel support. diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index c0fae6e1e..00d05dcd4 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -4,6 +4,10 @@ config ADK_KERNEL_INET boolean default y +config ADK_KERNEL_NET_CORE + boolean + default y + config ADK_KERNEL_IP_FIB_HASH boolean default y diff --git a/target/m68k/kernel.config b/target/m68k/kernel.config index f20c2239a..bf7ba4f8a 100644 --- a/target/m68k/kernel.config +++ b/target/m68k/kernel.config @@ -331,9 +331,7 @@ CONFIG_GENERIC_CPU_DEVICES=y CONFIG_BLK_DEV=y # CONFIG_ATARI_FLOPPY is not set # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 -# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_DRBD is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_RAM is not set @@ -363,76 +361,17 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # Altera FPGA firmware download module # CONFIG_HAVE_IDE=y -CONFIG_IDE=y - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_ATAPI=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=y -CONFIG_IDE_GD_ATA=y -# CONFIG_IDE_GD_ATAPI is not set -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_IDE_TASK_IOCTL is not set -# CONFIG_IDE_PROC_FS is not set - -# -# IDE chipset support/bugfixes -# -# CONFIG_BLK_DEV_PLATFORM is not set -# CONFIG_BLK_DEV_FALCON_IDE is not set -# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDE is not set # # SCSI device support # CONFIG_SCSI_MOD=y # CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_DMA is not set # CONFIG_SCSI_NETLINK is not set -# CONFIG_SCSI_PROC_FS is not set - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -# CONFIG_CHR_DEV_ST is not set -# CONFIG_CHR_DEV_OSST is not set -CONFIG_BLK_DEV_SR=y -CONFIG_BLK_DEV_SR_VENDOR=y -# CONFIG_CHR_DEV_SG is not set -# 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 - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=y -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_ATTRS is not set -# CONFIG_SCSI_SAS_LIBSAS is not set -# CONFIG_SCSI_SRP_ATTRS is not set -CONFIG_SCSI_LOWLEVEL=y -# CONFIG_ISCSI_TCP is not set -# CONFIG_ISCSI_BOOT_SYSFS is not set -# CONFIG_SCSI_UFSHCD is not set -# CONFIG_LIBFC is not set -# CONFIG_LIBFCOE is not set -# CONFIG_SCSI_DEBUG is not set -# CONFIG_ATARI_SCSI is not set -# CONFIG_SCSI_DH is not set -# CONFIG_SCSI_OSD_INITIATOR is not set # CONFIG_MD is not set -# CONFIG_TARGET_CORE is not set CONFIG_NETDEVICES=y # CONFIG_NET_CORE is not set |