diff options
Diffstat (limited to 'target')
62 files changed, 1080 insertions, 1264 deletions
diff --git a/target/Makefile b/target/Makefile index 83e4e5ca6..22b989581 100644 --- a/target/Makefile +++ b/target/Makefile @@ -10,25 +10,16 @@ all: install # The following target combines all kernel-related variables and # config files into a single one to be used as the final kernel # configuration when building. This is how it's done: -# 1) fetch all ADK_KPACKAGE_KMOD_* vars into -# .kernelconfig.modules and set them to "m", -# fetch all ADK_KERNEL_MOD_* vars into -# .kernelconfig.modules and set them to "m" -# 2) fetch all enabled ADK_KERNEL_* vars into -# .kernelconfig.kernel (no conversion, as they are booleans) -# 3) get the global and device-specific static kernel config and place it into +# 1) fetch all enabled ADK_KERNEL_* vars into +# .kernelconfig.kernel +# 2) get the global and device-specific static kernel config and place it into # .kernelconfig.board -# 4) prepare for merging: -# * if a variable is disabled in .kernelconfig.board and -# enabled in either of .kernelconfig.{modules,kernel}, -# remove it from .kernelconfig.board -# * append ${FS_CMDLINE} to the kernel commandline inside -# .kernelconfig.board -# 5) merge (cat) it all together into .kernelconfig.tmp -# 6) check if .kernelconfig.tmp differs from the current one +# 3) append ${FS_CMDLINE} to the kernel commandline inside .kernelconfig.board +# 4) merge both together into .kernelconfig.tmp +# 5) check if .kernelconfig.tmp differs from the current one # (.kernelconfig) at all, overwriting the current one # only if it does (so the timestamp stays intact) -# 7) remove the temporary .kernelconfig.tmp +# 6) remove the temporary .kernelconfig.tmp ### ADK_PACKAGE_CRYPTINIT_ROOT:=$(strip $(subst ",, $(ADK_PACKAGE_CRYPTINIT_ROOT))) ADK_PACKAGE_CRYPTINIT_SWAP:=$(strip $(subst ",, $(ADK_PACKAGE_CRYPTINIT_SWAP))) @@ -36,10 +27,6 @@ ADK_PACKAGE_CMDLINE:=root=$(ADK_PACKAGE_CRYPTINIT_ROOT) swap=$(ADK_PACKAGE_CRYPT ifeq (${ADK_TARGET_KERNEL_CUSTOMISING},y) config-prepare: $(TOPDIR)/.config - @sed -n '/^ADK_KPACKAGE_KMOD/s//CONFIG/p' ${TOPDIR}/.config | \ - sed 's/=y/=m/' >${BUILD_DIR}/.kernelconfig.modules - @sed -n '/^ADK_KERNEL_MOD/s//CONFIG/p' ${TOPDIR}/.config | \ - sed 's/=y/=m/' >>${BUILD_DIR}/.kernelconfig.modules @sed -n '/^ADK_KERNEL/s//CONFIG/p' ${TOPDIR}/.config \ >${BUILD_DIR}/.kernelconfig.kernel @if [ -f ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} ];then \ @@ -49,10 +36,6 @@ config-prepare: $(TOPDIR)/.config echo "no miniconfig found for target system"; \ exit 1; \ fi - @(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \ - while IFS='=' read symbol value; do \ - sed -i -e "/^# $$symbol/d" ${BUILD_DIR}/.kernelconfig.board; \ - done;) ifeq ($(ADK_TARGET_ROOTFS_NFSROOT),) @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ro"#' \ ${BUILD_DIR}/.kernelconfig.board @@ -83,8 +66,7 @@ ifeq ($(ADK_KERNEL_NETCONSOLE),y) @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 netconsole=@$(ADK_PARAMETER_NETCONSOLE_SRC_IP)/,@$(ADK_PARAMETER_NETCONSOLE_DST_IP)/"#' \ ${BUILD_DIR}/.kernelconfig.board endif - @cd ${BUILD_DIR} && cat .kernelconfig.board \ - .kernelconfig.kernel .kernelconfig.modules \ + @cd ${BUILD_DIR} && cat .kernelconfig.board .kernelconfig.kernel \ >.kernelconfig.tmp @cd ${BUILD_DIR} && cmp -s .kernelconfig.tmp .kernelconfig || \ cp .kernelconfig.tmp .kernelconfig diff --git a/target/aarch64/kernel/arm-fm b/target/aarch64/kernel/arm-fm index db8edb12d..291b4093e 100644 --- a/target/aarch64/kernel/arm-fm +++ b/target/aarch64/kernel/arm-fm @@ -1,7 +1,5 @@ CONFIG_ARM64=y CONFIG_ARCH_VEXPRESS=y CONFIG_AEABI=y -CONFIG_NET_VENDOR_SMSC=y -CONFIG_SMC91X=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y diff --git a/target/arm/kernel/cubox-i b/target/arm/kernel/cubox-i index 0b56db7d7..02b35f76b 100644 --- a/target/arm/kernel/cubox-i +++ b/target/arm/kernel/cubox-i @@ -15,9 +15,5 @@ CONFIG_NEON=y CONFIG_PCI_IMX6=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y -CONFIG_NET_VENDOR_FREESCALE=y -CONFIG_FEC=y -CONFIG_PHYLIB=y -CONFIG_AT803X_PHY=y CONFIG_ATAGS=y CONFIG_CMDLINE_FORCE=y diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index ec76019d4..56ce4b98c 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -11,15 +11,8 @@ CONFIG_KUSER_HELPERS=y CONFIG_CPU_ARM926T=y CONFIG_CPU_32v5=y CONFIG_ARM_AMBA=y -CONFIG_PCI=y -CONFIG_PCI_SYSCALL=y CONFIG_AEABI=y CONFIG_USE_OF=y CONFIG_ATAGS=y -CONFIG_DTC=y -CONFIG_OF=y -CONFIG_MII=y -CONFIG_NET_VENDOR_SMSC=y -CONFIG_SMC91X=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9 index b89b87337..9c2194631 100644 --- a/target/arm/kernel/qemu-arm-vexpress-a9 +++ b/target/arm/kernel/qemu-arm-vexpress-a9 @@ -13,9 +13,5 @@ CONFIG_ATAGS=y CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y -CONFIG_OF=y -CONFIG_DTC=y -CONFIG_NET_VENDOR_SMSC=y -CONFIG_SMSC911X=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi index 486ec929b..86af8de40 100644 --- a/target/arm/kernel/raspberry-pi +++ b/target/arm/kernel/raspberry-pi @@ -9,6 +9,4 @@ CONFIG_BCM2708_VCMEM=y CONFIG_BCM2708_DMAER=y CONFIG_AEABI=y CONFIG_VFP=y -CONFIG_DTC=y -CONFIG_OF=y CONFIG_BCM2708_VCHIQ=y diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 3c0d02dbf..be067302d 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -25,82 +25,82 @@ config ADK_KERNEL_SND_SOC_IMX_HDMI config ADK_KERNEL_SND_PXA2XX_AC97 boolean -config ADK_KPACKAGE_KMOD_SND_TIMER +config ADK_KERNEL_SND_TIMER boolean -config ADK_KPACKAGE_KMOD_SND_PCM +config ADK_KERNEL_SND_PCM boolean -config ADK_KPACKAGE_KMOD_SND_HWDEP +config ADK_KERNEL_SND_HWDEP tristate -config ADK_KPACKAGE_KMOD_SOUND +config ADK_KERNEL_SOUND tristate -config ADK_KPACKAGE_KMOD_SND_RAWMIDI +config ADK_KERNEL_SND_RAWMIDI tristate -config ADK_KPACKAGE_KMOD_SND_AC97_CODEC +config ADK_KERNEL_SND_AC97_CODEC tristate -config ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE +config ADK_KERNEL_SND_PCM_DMAENGINE tristate -config ADK_KPACKAGE_KMOD_SND_COMPRESS +config ADK_KERNEL_SND_COMPRESS tristate -config ADK_KPACKAGE_KMOD_SND +config ADK_KERNEL_SND tristate - select ADK_KPACKAGE_KMOD_SOUND - select ADK_KPACKAGE_KMOD_SND_PCM - select ADK_KPACKAGE_KMOD_SND_TIMER - select ADK_KPACKAGE_KMOD_SND_HWDEP + select ADK_KERNEL_SOUND + select ADK_KERNEL_SND_PCM + select ADK_KERNEL_SND_TIMER + select ADK_KERNEL_SND_HWDEP default n -config ADK_KPACKAGE_KMOD_SND_INTEL8X0 +config ADK_KERNEL_SND_INTEL8X0 prompt "Intel AC97 driver" tristate select ADK_KERNEL_SND_PCI - select ADK_KPACKAGE_KMOD_SND_AC97_CODEC - select ADK_KPACKAGE_KMOD_SND - default y if ADK_TARGET_SYSTEM_IBM_X40 + select ADK_KERNEL_SND_AC97_CODEC + select ADK_KERNEL_SND + default m if ADK_TARGET_SYSTEM_IBM_X40 default n depends on ADK_TARGET_WITH_PCI help Driver for intel chipsets. -config ADK_KPACKAGE_KMOD_SND_VIA82XX +config ADK_KERNEL_SND_VIA82XX prompt "VIA82XX driver" tristate - select ADK_KPACKAGE_KMOD_SND + select ADK_KERNEL_SND default n depends on ADK_TARGET_WITH_PCI help ALSA VIA82XX driver -config ADK_KPACKAGE_KMOD_SND_ENS1370 +config ADK_KERNEL_SND_ENS1370 prompt "Ensoniq 1370 driver" tristate - select ADK_KPACKAGE_KMOD_SND + select ADK_KERNEL_SND default n depends on ADK_TARGET_WITH_PCI help ALSA Ensonique 1370 driver -config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO +config ADK_KERNEL_SND_CS5535AUDIO prompt "AMD CS5535 driver" tristate select ADK_KERNEL_SND_PCI - 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 + select ADK_KERNEL_SND_AC97_CODEC + select ADK_KERNEL_SND + default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default n depends on ADK_TARGET_WITH_PCI help ALSA AMD CS5535 driver -config ADK_KPACKAGE_KMOD_SND_SOC +config ADK_KERNEL_SND_SOC tristate default n @@ -108,72 +108,72 @@ config ADK_KERNEL_SND_PXA2XX_SOC tristate default n -config ADK_KPACKAGE_KMOD_SND_PXA2XX_SOC_SPITZ +config ADK_KERNEL_SND_PXA2XX_SOC_SPITZ prompt "Sharp Zaurus SoC" tristate select ADK_KERNEL_SND_ARM select ADK_KERNEL_SND_PXA2XX_AC97 - select ADK_KPACKAGE_KMOD_SND - select ADK_KPACKAGE_KMOD_SND_AC97_CODEC - select ADK_KPACKAGE_KMOD_SND_SOC + select ADK_KERNEL_SND + select ADK_KERNEL_SND_AC97_CODEC + select ADK_KERNEL_SND_SOC select ADK_KERNEL_SND_PXA2XX_SOC depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS + default m if ADK_TARGET_SYSTEM_SHARP_ZAURUS default n -config ADK_KPACKAGE_KMOD_SND_BCM2835 +config ADK_KERNEL_SND_BCM2835 prompt "Raspberry PI SoC" tristate - select ADK_KPACKAGE_KMOD_SND + select ADK_KERNEL_SND select ADK_KERNEL_SND_ARM depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default m if ADK_TARGET_SYSTEM_RASPBERRY_PI default n -config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S +config ADK_KERNEL_SND_BCM2708_SOC_I2S prompt "Raspberry PI I2S driver" tristate - select ADK_KPACKAGE_KMOD_SND + select ADK_KERNEL_SND select ADK_KERNEL_SND_ARM - select ADK_KPACKAGE_KMOD_SND_SOC - select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37 - select ADK_KPACKAGE_KMOD_SND_COMPRESS + select ADK_KERNEL_SND_SOC + select ADK_KERNEL_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37 + select ADK_KERNEL_SND_COMPRESS depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n -config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC +config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC prompt "Raspberry PI hifiberry DAC" tristate - select ADK_KPACKAGE_KMOD_DMA_BCM2708 - select ADK_KPACKAGE_KMOD_REGMAP_MMIO - select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S + select ADK_KERNEL_DMA_BCM2708 + select ADK_KERNEL_REGMAP_MMIO + select ADK_KERNEL_SND_BCM2708_SOC_I2S depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n -config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DIGI +config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI prompt "Raspberry PI hifiberry DIGI" tristate - select ADK_KPACKAGE_KMOD_DMA_BCM2708 - select ADK_KPACKAGE_KMOD_REGMAP_MMIO - select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S + select ADK_KERNEL_DMA_BCM2708 + select ADK_KERNEL_REGMAP_MMIO + select ADK_KERNEL_SND_BCM2708_SOC_I2S depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n -config ADK_KPACKAGE_KMOD_SND_IMX_SOC +config ADK_KERNEL_SND_IMX_SOC prompt "Cubox-i SoC sound chip" tristate depends on ADK_TARGET_SYSTEM_CUBOX_I - select ADK_KPACKAGE_KMOD_SND - select ADK_KPACKAGE_KMOD_SND_SOC - select ADK_KPACKAGE_KMOD_SND_COMPRESS - select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37 + select ADK_KERNEL_SND + select ADK_KERNEL_SND_SOC + select ADK_KERNEL_SND_COMPRESS + select ADK_KERNEL_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37 select ADK_KERNEL_SND_SOC_IMX_PCM_DMA select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA select ADK_KERNEL_SND_SOC_IMX_HDMI select ADK_KERNEL_SND_SOC_IMX_SPDIF - select ADK_KPACKAGE_KMOD_REGMAP_SPI - select ADK_KPACKAGE_KMOD_REGMAP_I2C - default y if ADK_TARGET_SYSTEM_CUBOX_I + select ADK_KERNEL_REGMAP_SPI + select ADK_KERNEL_REGMAP_I2C + default m if ADK_TARGET_SYSTEM_CUBOX_I default n endmenu diff --git a/target/linux/config/Config.in.aufs b/target/linux/config/Config.in.aufs index 524133061..fe6c60b52 100644 --- a/target/linux/config/Config.in.aufs +++ b/target/linux/config/Config.in.aufs @@ -1,4 +1,4 @@ -config ADK_KPACKAGE_KMOD_AUFS_FS +config ADK_KERNEL_AUFS_FS prompt "Aufs (Advanced multi layered unification filesystem) support" tristate help @@ -10,7 +10,7 @@ config ADK_KPACKAGE_KMOD_AUFS_FS original ideas, approaches and improvements, it becomes totally different from Unionfs while keeping the basic features. -if ADK_KPACKAGE_KMOD_AUFS_FS +if ADK_KERNEL_AUFS_FS choice boolean "Maximum number of branches" @@ -75,7 +75,7 @@ config ADK_KERNEL_AUFS_BR_RAMFS config ADK_KERNEL_AUFS_BR_FUSE bool "Fuse fs as an aufs branch" select ADK_KERNEL_AUFS_POLL - select ADK_KPACKAGE_KMOD_FUSE_FS + select ADK_KERNEL_FUSE_FS help If you want to use fuse-based userspace filesystem as an aufs branch fs, then enable this option. diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index a188981f3..9ca6e0d50 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -1,3 +1,5 @@ +menu "Block devices support" + config ADK_KERNEL_MD boolean @@ -19,9 +21,6 @@ config ADK_KERNEL_IOSCHED_DEADLINE config ADK_KERNEL_IOSCHED_CFQ boolean -config ADK_KERNEL_SCSI - boolean - config ADK_KERNEL_SCSI_DMA boolean @@ -37,25 +36,12 @@ config ADK_KERNEL_SCSI_LOGGING config ADK_KERNEL_SCSI_SCAN_ASYNC boolean -config ADK_KERNEL_BLK_DEV_SD - boolean - -config ADK_KERNEL_BLK_DEV_SR - boolean - config ADK_KERNEL_ISCSI_TCP boolean -config ADK_KERNEL_DM_CRYPT - boolean - config ADK_KERNEL_BLK_DEV boolean -config ADK_KERNEL_BLK_DEV_DM - boolean - select ADK_KERNEL_MD - config ADK_KERNEL_ATA boolean @@ -102,6 +88,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA boolean config ADK_KERNEL_ATA_PIIX + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_SCSI_DMA select ADK_KERNEL_ATA @@ -109,49 +96,49 @@ config ADK_KERNEL_ATA_PIIX select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD - boolean config ADK_KERNEL_SCSI_SYM53C8XX_2 + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD - boolean config ADK_KERNEL_SCSI_IBMVSCSI + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD - boolean config ADK_KERNEL_SCSI_SUNESP + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD - boolean config ADK_KERNEL_PATA_MACIO + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD - boolean config ADK_KERNEL_PATA_PLATFORM + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD - boolean config ADK_KERNEL_PATA_PCMCIA - boolean + tristate config ADK_KERNEL_PATA_IMX - boolean + prompt "eSATA driver for Cubox-i" + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF @@ -166,7 +153,7 @@ config ADK_KERNEL_PATA_IMX default n config ADK_KERNEL_PATA_PXA - boolean + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF @@ -178,7 +165,7 @@ config ADK_KERNEL_PATA_PXA default n config ADK_KERNEL_MMC_AT91 - boolean + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_MMC select ADK_KERNEL_MMC_BLOCK @@ -188,7 +175,7 @@ config ADK_KERNEL_MMC_AT91 default n config ADK_KERNEL_MMC_SDHCI_BCM2708 - boolean + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_MMC select ADK_KERNEL_MMC_BLOCK @@ -202,7 +189,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708 default n config ADK_KERNEL_MMC_SDHCI_ESDHC_IMX - boolean + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_SCSI_DMA select ADK_KERNEL_SCSI_MULTI_LUN @@ -222,7 +209,8 @@ config ADK_KERNEL_MMC_SDHCI_ESDHC_IMX default n config ADK_KERNEL_PATA_RB532 - boolean + prompt "CF disk driver for Mikrotik RB532" + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF @@ -233,7 +221,7 @@ config ADK_KERNEL_PATA_RB532 default n config ADK_KERNEL_PATA_AMD - boolean + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF @@ -247,7 +235,7 @@ config ADK_KERNEL_PATA_AMD default n config ADK_KERNEL_PATA_SC1200 - boolean + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF @@ -258,7 +246,7 @@ config ADK_KERNEL_PATA_SC1200 default n config ADK_KERNEL_PATA_JMICRON - boolean + tristate select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF @@ -268,6 +256,7 @@ config ADK_KERNEL_PATA_JMICRON default n config ADK_KERNEL_SATA_AHCI + prompt "AHCI SATA driver" tristate select ADK_KERNEL_SCSI select ADK_KERNEL_ATA @@ -276,24 +265,14 @@ config ADK_KERNEL_SATA_AHCI depends on ADK_TARGET_WITH_SATA default y if ADK_TARGET_SYSTEM_VBOX_I686 default n - -menu "Block devices support" - -config ADK_KPACKAGE_KMOD_SATA_AHCI - prompt "AHCI SATA driver" - tristate - select ADK_KERNEL_ATA - select ADK_KERNEL_BLK_DEV_SD - depends on !ADK_KERNEL_SATA_AHCI - depends on ADK_TARGET_WITH_SATA - default n help Enables support for AHCI Serial ATA. -config ADK_KPACKAGE_KMOD_BLK_DEV_LOOP +config ADK_KERNEL_BLK_DEV_LOOP prompt "Loop mount support" tristate select ADK_KERNEL_BLK_DEV + default m if ADK_PACKAGE_LOSETUP default n help Saying Y here will allow you to use a regular file as a block @@ -331,7 +310,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_LOOP Note that this loop device has nothing to do with the loopback device used for network connections from the machine to itself. -config ADK_KPACKAGE_KMOD_BLK_DEV_NBD +config ADK_KERNEL_BLK_DEV_NBD prompt "Network Block Device support" tristate default n @@ -354,13 +333,12 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_NBD Note that this has nothing to do with the network file systems NFS or Coda; you can say N here even if you intend to use NFS or Coda. -config ADK_KPACKAGE_KMOD_SCSI +config ADK_KERNEL_SCSI prompt "SCSI support" + tristate select ADK_KERNEL_LBD select ADK_KERNEL_LSF select ADK_KERNEL_IOSCHED_AS - depends on !ADK_KERNEL_SCSI - tristate help If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or any other SCSI device under Linux, say Y and make sure that you know @@ -373,11 +351,10 @@ config ADK_KPACKAGE_KMOD_SCSI version of the IOMEGA ZIP drive, USB storage devices, Fibre Channel, FireWire storage and the IDE-SCSI emulation driver. -config ADK_KPACKAGE_KMOD_BLK_DEV_SD +config ADK_KERNEL_BLK_DEV_SD prompt "SCSI disk support" - select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI - depends on !ADK_KERNEL_BLK_DEV_SD tristate + select ADK_KERNEL_SCSI help If you want to use SCSI hard disks, Fibre Channel disks, USB storage or the SCSI or parallel port version of @@ -386,12 +363,10 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SD <http://www.tldp.org/docs.html#howto>. This is NOT for SCSI CD-ROMs. -config ADK_KPACKAGE_KMOD_BLK_DEV_SR +config ADK_KERNEL_BLK_DEV_SR prompt "SCSI CDROM support" - depends on !ADK_KERNEL_SCSI - depends on !ADK_KERNEL_BLK_DEV_SR - depends on ADK_KPACKAGE_KMOD_SCSI tristate + select ADK_KERNEL_SCSI help If you want to use a SCSI or FireWire CD-ROM under Linux, say Y and read the SCSI-HOWTO and the CDROM-HOWTO at @@ -399,51 +374,33 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SR Y or M to "ISO 9660 CD-ROM file system support" later. config ADK_KERNEL_BLK_DEV_MD - boolean - select ADK_KERNEL_MD - default n - -config ADK_KPACKAGE_KMOD_BLK_DEV_MD prompt "RAID support" tristate - depends on !ADK_KERNEL_BLK_DEV_MD select ADK_KERNEL_MD help config ADK_KERNEL_MD_RAID0 - boolean - depends on ADK_KERNEL_BLK_DEV_MD - help - -config ADK_KPACKAGE_KMOD_MD_RAID0 prompt "RAID0 support" tristate - depends on ADK_KPACKAGE_KMOD_BLK_DEV_MD - depends on !ADK_KERNEL_MD_RAID0 - help - -config ADK_KERNEL_MD_RAID1 - boolean depends on ADK_KERNEL_BLK_DEV_MD help -config ADK_KPACKAGE_KMOD_MD_RAID1 +config ADK_KERNEL_MD_RAID1 prompt "RAID1 support" tristate - depends on ADK_KPACKAGE_KMOD_BLK_DEV_MD + depends on ADK_KERNEL_BLK_DEV_MD help -config ADK_KPACKAGE_KMOD_MD_RAID456 +config ADK_KERNEL_MD_RAID456 prompt "RAID456 support" tristate - depends on ADK_KPACKAGE_KMOD_BLK_DEV_MD + depends on ADK_KERNEL_BLK_DEV_MD help -config ADK_KPACKAGE_KMOD_BLK_DEV_DM +config ADK_KERNEL_BLK_DEV_DM prompt "Device Mapper support" - select ADK_KERNEL_MD - depends on !ADK_KERNEL_BLK_DEV_DM tristate + select ADK_KERNEL_MD help Device-mapper is a low level volume manager. It works by allowing people to specify mappings for ranges of logical sectors. Various @@ -452,15 +409,16 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM Higher level volume managers such as LVM2 use this driver. -config ADK_KPACKAGE_KMOD_DM_CRYPT +config ADK_KERNEL_DM_CRYPT prompt "Crypt target support" - depends on !ADK_KERNEL_DM_CRYPT - depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM + tristate select ADK_KERNEL_MD select ADK_KERNEL_CRYPTO - select ADK_KPACKAGE_KMOD_CRYPTO_CBC - select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER - tristate + select ADK_KERNEL_CRYPTO_CBC + select ADK_KERNEL_CRYPTO_BLKCIPHER + depends on ADK_KERNEL_BLK_DEV_DM + default m if ADK_PACKAGE_CRYPTSETUP + default n help This device-mapper target allows you to create a device that transparently encrypts the data on it. You'll need to activate @@ -470,22 +428,22 @@ config ADK_KPACKAGE_KMOD_DM_CRYPT <http://www.saout.de/misc/dm-crypt/> -config ADK_KPACKAGE_KMOD_DM_SNAPSHOT +config ADK_KERNEL_DM_SNAPSHOT prompt "Devicemapper Snapshot target" - depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM tristate + depends on ADK_KERNEL_BLK_DEV_DM help Allow volume managers to take writable snapshots of a device. -config ADK_KPACKAGE_KMOD_DM_MIRROR +config ADK_KERNEL_DM_MIRROR prompt "Devicemapper Mirror target" - depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM tristate + depends on ADK_KERNEL_BLK_DEV_DM help Allow volume managers to mirror logical volumes, also needed for live data migration tools such as 'pvmove'. -config ADK_KPACKAGE_KMOD_BLK_DEV_DRBD +config ADK_KERNEL_BLK_DEV_DRBD prompt "DRBD support (Network RAID 1)" tristate select ADK_KERNEL_BLK_DEV diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth index 82b55bf49..b639676c1 100644 --- a/target/linux/config/Config.in.bluetooth +++ b/target/linux/config/Config.in.bluetooth @@ -1,7 +1,7 @@ menu "Bluetooth support and drivers" depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_SDIO -config ADK_KPACKAGE_KMOD_BT +config ADK_KERNEL_BT prompt "Bluetooth network stack" tristate default n @@ -25,7 +25,7 @@ config ADK_KPACKAGE_KMOD_BT config ADK_KERNEL_BT_L2CAP prompt "L2CAP protocol support" boolean - select ADK_KPACKAGE_KMOD_BT + select ADK_KERNEL_BT default n help L2CAP (Logical Link Control and Adaptation Protocol) provides @@ -36,63 +36,63 @@ config ADK_KERNEL_BT_L2CAP config ADK_KERNEL_BT_SCO prompt "SCO link support" boolean - select ADK_KPACKAGE_KMOD_BT + select ADK_KERNEL_BT default n help SCO link provides voice transport over Bluetooth. SCO support is required for voice applications like Headset and Audio. -config ADK_KPACKAGE_KMOD_BT_RFCOMM +config ADK_KERNEL_BT_RFCOMM prompt "RFCOMM protocol support" tristate - select ADK_KPACKAGE_KMOD_BT - depends on ADK_KPACKAGE_KMOD_BT_L2CAP + select ADK_KERNEL_BT + depends on ADK_KERNEL_BT_L2CAP default n help RFCOMM provides connection oriented stream transport. RFCOMM support is required for Dialup Networking, OBEX and other Bluetooth applications. -config ADK_KPACKAGE_KMOD_BT_BNEP +config ADK_KERNEL_BT_BNEP prompt "BNEP protocol support" tristate - select ADK_KPACKAGE_KMOD_BT - depends on ADK_KPACKAGE_KMOD_BT_L2CAP + select ADK_KERNEL_BT + depends on ADK_KERNEL_BT_L2CAP default n help BNEP (Bluetooth Network Encapsulation Protocol) is Ethernet emulation layer on top of Bluetooth. BNEP is required for Bluetooth PAN (Personal Area Network). -config ADK_KPACKAGE_KMOD_BT_HIDP +config ADK_KERNEL_BT_HIDP prompt "HIDP protocol support" tristate select ADK_KERNEL_INPUT select ADK_KERNEL_HID - select ADK_KPACKAGE_KMOD_BT - depends on ADK_KPACKAGE_KMOD_BT_L2CAP + select ADK_KERNEL_BT + depends on ADK_KERNEL_BT_L2CAP default n help HIDP (Human Interface Device Protocol) is a transport layer for HID reports. HIDP is required for the Bluetooth Human Interface Device Profile. -config ADK_KPACKAGE_KMOD_BT_HCIBTSDIO +config ADK_KERNEL_BT_HCIBTSDIO prompt "HCI SDIO driver" tristate - select ADK_KPACKAGE_KMOD_BT + select ADK_KERNEL_BT depends on ADK_TARGET_WITH_SDIO - default y if ADK_TARGET_SYSTEM_CUBOX_I + default m if ADK_TARGET_SYSTEM_CUBOX_I default n help Bluetooth HCI SDIO driver. This driver is required if you want to use Bluetooth devices with SDIO interface. -config ADK_KPACKAGE_KMOD_BT_HCIBTUSB +config ADK_KERNEL_BT_HCIBTUSB prompt "HCI USB driver" tristate - select ADK_KPACKAGE_KMOD_BT + select ADK_KERNEL_BT depends on ADK_TARGET_WITH_USB default n help @@ -100,10 +100,10 @@ config ADK_KPACKAGE_KMOD_BT_HCIBTUSB This driver is required if you want to use Bluetooth devices with USB interface. -config ADK_KPACKAGE_KMOD_BT_HCIUART +config ADK_KERNEL_BT_HCIUART prompt "HCI UART driver" tristate - select ADK_KPACKAGE_KMOD_BT + select ADK_KERNEL_BT default n help Bluetooth HCI UART driver. @@ -112,33 +112,33 @@ config ADK_KPACKAGE_KMOD_BT_HCIUART UART based Bluetooth PCMCIA and CF devices like Xircom Credit Card adapter and BrainBoxes Bluetooth PC Card. -config ADK_KPACKAGE_KMOD_BT_MRVL +config ADK_KERNEL_BT_MRVL prompt "Marvell driver" tristate - select ADK_KPACKAGE_KMOD_BT + select ADK_KERNEL_BT select ADK_PACKAGE_BRCM_BLUETOOTH - default y if ADK_TARGET_SYSTEM_CUBOX_I + default m if ADK_TARGET_SYSTEM_CUBOX_I default n help Bluetooth Marvell driver. -config ADK_KPACKAGE_KMOD_BT_MRVL_SDIO +config ADK_KERNEL_BT_MRVL_SDIO prompt "Marvell SDIO driver" tristate - depends on ADK_KPACKAGE_KMOD_BT_MRVL - depends on ADK_KPACKAGE_KMOD_BT_HCIBTSDIO + depends on ADK_KERNEL_BT_MRVL + depends on ADK_KERNEL_BT_HCIBTSDIO depends on ADK_TARGET_WITH_SDIO - default y if ADK_TARGET_SYSTEM_CUBOX_I + default m if ADK_TARGET_SYSTEM_CUBOX_I default n help Bluetooth Marvell driver. -config ADK_KPACKAGE_KMOD_BT_HCIBCM203X +config ADK_KERNEL_BT_HCIBCM203X prompt "HCI BCM203x USB driver" tristate - select ADK_KPACKAGE_KMOD_FW_LOADER - select ADK_KPACKAGE_KMOD_BT_HCIBTUSB - select ADK_KPACKAGE_KMOD_BT + select ADK_KERNEL_FW_LOADER + select ADK_KERNEL_BT_HCIBTUSB + select ADK_KERNEL_BT depends on ADK_TARGET_WITH_USB default n help @@ -146,11 +146,11 @@ config ADK_KPACKAGE_KMOD_BT_HCIBCM203X This driver provides the firmware loading mechanism for the Broadcom Blutonium based devices. -config ADK_KPACKAGE_KMOD_BT_HCIBPA10X +config ADK_KERNEL_BT_HCIBPA10X prompt "HCI BPA10x USB driver" tristate - select ADK_KPACKAGE_KMOD_BT - select ADK_KPACKAGE_KMOD_BT_HCIBTUSB + select ADK_KERNEL_BT + select ADK_KERNEL_BT_HCIBTUSB default n help Bluetooth HCI BPA10x USB driver. diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu index 075d46565..71b32b963 100644 --- a/target/linux/config/Config.in.cpu +++ b/target/linux/config/Config.in.cpu @@ -9,11 +9,6 @@ config ADK_KERNEL_PM_SLEEP_SMP default y if ADK_TARGET_CPU_WITH_HT default n -config ADK_KERNEL_SMP - boolean - default y if ADK_TARGET_CPU_WITH_HT - default n - config ADK_KERNEL_X86_HT boolean default y if ADK_TARGET_CPU_WITH_HT @@ -57,15 +52,17 @@ config ADK_KERNEL_ARM_IMX6_CPUFREQ select ADK_KERNEL_REGULATOR select ADK_KERNEL_REGULATOR_FIXED_VOLTAGE select ADK_KERNEL_REGULATOR_ANATOP - default y if ADK_TARGET_SYSTEM_CUBOX_I depends on ADK_TARGET_SYSTEM_CUBOX_I + default y if ADK_TARGET_SYSTEM_CUBOX_I + default n config ADK_KERNEL_ARM_BCM2835_CPUFREQ prompt "CPU frequency support for raspberry-pi" boolean select ADK_KERNEL_CPU_FREQ - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n choice prompt "Governor" diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto index 01404e9bd..5b25a288c 100644 --- a/target/linux/config/Config.in.crypto +++ b/target/linux/config/Config.in.crypto @@ -5,27 +5,18 @@ config ADK_KERNEL_CRYPTO config ADK_KERNEL_CRYPTO_HW tristate -config ADK_KERNEL_CRYPTO_AES - boolean - -config ADK_KERNEL_CRYPTO_SHA256 - boolean - -config ADK_KERNEL_CRYPTO_CBC - boolean - comment "Hardware cryptography" menu "Hardware crypto devices" depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_GEODE_CRYPTO -config ADK_KPACKAGE_KMOD_CRYPTO_DEV_GEODE +config ADK_KERNEL_CRYPTO_DEV_GEODE prompt "Support for the Geode LX/GX AES engine" tristate select ADK_KERNEL_CRYPTO select ADK_KERNEL_CRYPTO_HW - select ADK_KPACKAGE_KMOD_CRYPTO_ECB - select ADK_KPACKAGE_KMOD_CRYPTO_CBC + select ADK_KERNEL_CRYPTO_ECB + select ADK_KERNEL_CRYPTO_CBC depends on ADK_TARGET_WITH_GEODE_CRYPTO default y if ADK_TARGET_WITH_GEODE_CRYPTO default n @@ -33,13 +24,13 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_GEODE Say 'Y' here to use the AMD Geode LX processor on-board AES engine for the CryptoAPI AES algorithm. -config ADK_KPACKAGE_KMOD_CRYPTO_DEV_HIFN_795X +config ADK_KERNEL_CRYPTO_DEV_HIFN_795X prompt "Driver for HIFN 795x crypto accelerator chips" tristate depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI select ADK_KERNEL_CRYPTO select ADK_KERNEL_CRYPTO_HW - select ADK_KPACKAGE_KMOD_CRYPTO_DES + select ADK_KERNEL_CRYPTO_DES default n help This option allows you to have support for HIFN 795x crypto adapters. @@ -53,18 +44,18 @@ menu "Crypto core / Block and Hash modes" config ADK_KERNEL_MOD_CRYPTO_PCOMP tristate -config ADK_KPACKAGE_KMOD_CRYPTO_PCOMP2 +config ADK_KERNEL_CRYPTO_PCOMP2 tristate select ADK_KERNEL_CRYPTO select ADK_KERNEL_MOD_CRYPTO_PCOMP - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help config ADK_KERNEL_MOD_CRYPTO_ALGAPI tristate -config ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 +config ADK_KERNEL_CRYPTO_ALGAPI2 tristate select ADK_KERNEL_CRYPTO select ADK_KERNEL_MOD_CRYPTO_ALGAPI @@ -74,10 +65,10 @@ config ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 config ADK_KERNEL_MOD_CRYPTO_AEAD tristate -config ADK_KPACKAGE_KMOD_CRYPTO_AEAD2 +config ADK_KERNEL_CRYPTO_AEAD2 tristate select ADK_KERNEL_CRYPTO - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 select ADK_KERNEL_MOD_CRYPTO_AEAD default n help @@ -85,9 +76,9 @@ config ADK_KPACKAGE_KMOD_CRYPTO_AEAD2 config ADK_KERNEL_MOD_CRYPTO_HASH tristate -config ADK_KPACKAGE_KMOD_CRYPTO_HASH2 +config ADK_KERNEL_CRYPTO_HASH2 tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 select ADK_KERNEL_MOD_CRYPTO_HASH default n help @@ -95,10 +86,10 @@ config ADK_KPACKAGE_KMOD_CRYPTO_HASH2 config ADK_KERNEL_MOD_CRYPTO_BLKCIPHER tristate -config ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2 +config ADK_KERNEL_CRYPTO_BLKCIPHER2 tristate - #select ADK_KPACKAGE_KMOD_CRYPTO_RNG2 - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + #select ADK_KERNEL_CRYPTO_RNG2 + select ADK_KERNEL_CRYPTO_ALGAPI2 select ADK_KERNEL_MOD_CRYPTO_BLKCIPHER default n help @@ -109,25 +100,25 @@ config ADK_KERNEL_MOD_CRYPTO_WORKQUEUE config ADK_KERNEL_MOD_CRYPTO_MANAGER tristate -config ADK_KPACKAGE_KMOD_CRYPTO_AUTHENC +config ADK_KERNEL_CRYPTO_AUTHENC prompt "AuthENC (IPsec)" tristate default n help -config ADK_KPACKAGE_KMOD_CRYPTO_SEQIV +config ADK_KERNEL_CRYPTO_SEQIV prompt "Sequence Number IV Generator" tristate - #select ADK_KPACKAGE_KMOD_CRYPTO_RNG2 - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + #select ADK_KERNEL_CRYPTO_RNG2 + select ADK_KERNEL_CRYPTO_ALGAPI2 help This IV generator generates an IV based on a sequence number by xoring it with a salt. This algorithm is mainly useful for CTR -config ADK_KPACKAGE_KMOD_CRYPTO_CTS +config ADK_KERNEL_CRYPTO_CTS prompt "CTS support" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2 + select ADK_KERNEL_CRYPTO_BLKCIPHER2 default n help CTS: Cipher Text Stealing @@ -137,65 +128,69 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CTS This mode is required for Kerberos gss mechanism support for AES encryption. -config ADK_KPACKAGE_KMOD_CRYPTO_CBC +config ADK_KERNEL_CRYPTO_CBC prompt "CBC support" tristate - depends on !ADK_KERNEL_CRYPTO_CBC - select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2 + select ADK_KERNEL_CRYPTO_BLKCIPHER2 + default m if ADK_PACKAGE_CRYPTSETUP + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help CBC: Cipher Block Chaining mode This block cipher algorithm is required for IPSec. -config ADK_KPACKAGE_KMOD_CRYPTO_CCM +config ADK_KERNEL_CRYPTO_CCM prompt "CCM support" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_CTR + select ADK_KERNEL_CRYPTO_CTR default n help Support for Counter with CBC MAC. Required for IPsec. -config ADK_KPACKAGE_KMOD_CRYPTO_GCM +config ADK_KERNEL_CRYPTO_GCM prompt "GCM support" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_CTR + select ADK_KERNEL_CRYPTO_CTR default n help Support for Galois/Counter Mode (GCM) and Galois Message Authentication Code (GMAC). Required for IPSec. -config ADK_KPACKAGE_KMOD_CRYPTO_CTR +config ADK_KERNEL_CRYPTO_CTR prompt "CTR support" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_SEQIV + select ADK_KERNEL_CRYPTO_SEQIV default n help CTR: Counter mode This block cipher algorithm is required for IPSec. -config ADK_KPACKAGE_KMOD_CRYPTO_ECB +config ADK_KERNEL_CRYPTO_ECB prompt "ECB support" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2 + select ADK_KERNEL_CRYPTO_BLKCIPHER2 default n help ECB: Electronic CodeBook mode This is the simplest block cipher algorithm. It simply encrypts the input block by block. -config ADK_KPACKAGE_KMOD_CRYPTO_HMAC +config ADK_KERNEL_CRYPTO_HMAC prompt "HMAC support" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_HASH2 + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help HMAC: Keyed-Hashing for Message Authentication (RFC2104). This is required for IPSec. -config ADK_KPACKAGE_KMOD_CRYPTO_XCBC +config ADK_KERNEL_CRYPTO_XCBC prompt "XCBC support" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_HASH2 default n help XCBC: Keyed-Hashing with encryption algorithm @@ -207,39 +202,43 @@ endmenu menu "Digest algorithms" -config ADK_KPACKAGE_KMOD_CRYPTO_MD4 +config ADK_KERNEL_CRYPTO_MD4 prompt "MD4 digest algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 - select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_HASH2 default n help MD4 message digest algorithm (RFC1320). -config ADK_KPACKAGE_KMOD_CRYPTO_MD5 +config ADK_KERNEL_CRYPTO_MD5 prompt "MD5 digest algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 - select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_HASH2 + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help MD5 message digest algorithm (RFC1321). -config ADK_KPACKAGE_KMOD_CRYPTO_SHA1 +config ADK_KERNEL_CRYPTO_SHA1 prompt "SHA1 digest algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 - select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_HASH2 + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2). -config ADK_KPACKAGE_KMOD_CRYPTO_SHA256 +config ADK_KERNEL_CRYPTO_SHA256 prompt "SHA256 digest algorithm" tristate - depends on !ADK_KERNEL_CRYPTO_SHA256 - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 - select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_HASH2 + default m if ADK_PACKAGE_CRYPTSETUP default n help SHA256 secure hash standard (DFIPS 180-2). @@ -247,11 +246,11 @@ config ADK_KPACKAGE_KMOD_CRYPTO_SHA256 This version of SHA implements a 256 bit hash with 128 bits of security against collision attacks. -config ADK_KPACKAGE_KMOD_CRYPTO_SHA512 +config ADK_KERNEL_CRYPTO_SHA512 prompt "SHA512 digest algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 - select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_HASH2 default n help SHA512 secure hash standard (DFIPS 180-2). @@ -262,11 +261,11 @@ config ADK_KPACKAGE_KMOD_CRYPTO_SHA512 This code also includes SHA-384, a 384 bit hash with 192 bits of security against collision attacks. -config ADK_KPACKAGE_KMOD_CRYPTO_WP512 +config ADK_KERNEL_CRYPTO_WP512 prompt "Whirlpool digest algorithms" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 - select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_HASH2 default n help Whirlpool hash algorithm 512, 384 and 256-bit hashes @@ -277,11 +276,11 @@ config ADK_KPACKAGE_KMOD_CRYPTO_WP512 See also: <http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html> -config ADK_KPACKAGE_KMOD_CRYPTO_TGR192 +config ADK_KERNEL_CRYPTO_TGR192 prompt "Tiger digest algorithms" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 - select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_HASH2 default n help Tiger hash algorithm 192, 160 and 128-bit hashes @@ -296,11 +295,13 @@ endmenu menu "Cipher algoritms" -config ADK_KPACKAGE_KMOD_CRYPTO_AES +config ADK_KERNEL_CRYPTO_AES prompt "AES cipher algorithms" tristate - depends on !ADK_KERNEL_CRYPTO_AES - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 + default m if ADK_PACKAGE_CRYPTSETUP + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help AES cipher algorithms (FIPS-197). AES uses the Rijndael @@ -319,11 +320,11 @@ config ADK_KPACKAGE_KMOD_CRYPTO_AES See <http://csrc.nist.gov/CryptoToolkit/aes/> for more information. -config ADK_KPACKAGE_KMOD_CRYPTO_AES_586 +config ADK_KERNEL_CRYPTO_AES_586 prompt "AES cipher algorithms (i586)" tristate depends on ADK_x86 - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help AES cipher algorithms (FIPS-197). AES uses the Rijndael @@ -342,10 +343,10 @@ config ADK_KPACKAGE_KMOD_CRYPTO_AES_586 See <http://csrc.nist.gov/CryptoToolkit/aes/> for more information. -config ADK_KPACKAGE_KMOD_CRYPTO_ANUBIS +config ADK_KERNEL_CRYPTO_ANUBIS prompt "Anubis cipher algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help Anubis cipher algorithm. @@ -358,10 +359,10 @@ config ADK_KPACKAGE_KMOD_CRYPTO_ANUBIS <https://www.cosic.esat.kuleuven.ac.be/nessie/reports/> <http://planeta.terra.com.br/informatica/paulobarreto/AnubisPage.html> -config ADK_KPACKAGE_KMOD_CRYPTO_ARC4 +config ADK_KERNEL_CRYPTO_ARC4 prompt "ARC4 cipher algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help ARC4 cipher algorithm. @@ -371,10 +372,10 @@ config ADK_KPACKAGE_KMOD_CRYPTO_ARC4 WEP, but it should not be for other purposes because of the weakness of the algorithm. -config ADK_KPACKAGE_KMOD_CRYPTO_BLOWFISH +config ADK_KERNEL_CRYPTO_BLOWFISH prompt "Blowfish cipher algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help Blowfish cipher algorithm, by Bruce Schneier. @@ -386,10 +387,10 @@ config ADK_KPACKAGE_KMOD_CRYPTO_BLOWFISH See also: <http://www.schneier.com/blowfish.html> -config ADK_KPACKAGE_KMOD_CRYPTO_CAMELLIA +config ADK_KERNEL_CRYPTO_CAMELLIA prompt "Camellia cipher algorithms" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help Camellia cipher algorithms module. @@ -402,44 +403,46 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CAMELLIA See also: <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html> -config ADK_KPACKAGE_KMOD_CRYPTO_CAST5 +config ADK_KERNEL_CRYPTO_CAST5 prompt "CAST5 (CAST-128) cipher algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help The CAST5 encryption algorithm (synonymous with CAST-128) is described in RFC2144. -config ADK_KPACKAGE_KMOD_CRYPTO_CAST6 +config ADK_KERNEL_CRYPTO_CAST6 prompt "CAST6 (CATS-256) cipher algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help The CAST6 encryption algorithm (synonymous with CAST-256) is described in RFC2612. -config ADK_KPACKAGE_KMOD_CRYPTO_DES +config ADK_KERNEL_CRYPTO_DES prompt "DES and Triple DES EDE cipher algorithms" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). -config ADK_KPACKAGE_KMOD_CRYPTO_FCRYPT +config ADK_KERNEL_CRYPTO_FCRYPT prompt "FCrypt cipher algorithms" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help FCrypt algorithm used by RxRPC. -config ADK_KPACKAGE_KMOD_CRYPTO_KHAZAD +config ADK_KERNEL_CRYPTO_KHAZAD prompt "Khazad cipher algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help Khazad cipher algorithm. @@ -451,10 +454,10 @@ config ADK_KPACKAGE_KMOD_CRYPTO_KHAZAD See also: <http://planeta.terra.com.br/informatica/paulobarreto/KhazadPage.html> -config ADK_KPACKAGE_KMOD_CRYPTO_SERPENT +config ADK_KERNEL_CRYPTO_SERPENT prompt "Serpent cipher algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help Serpent cipher algorithm, by Anderson, Biham & Knudsen. @@ -466,10 +469,10 @@ config ADK_KPACKAGE_KMOD_CRYPTO_SERPENT See also: <http://www.cl.cam.ac.uk/~rja14/serpent.html> -config ADK_KPACKAGE_KMOD_CRYPTO_TEA +config ADK_KERNEL_CRYPTO_TEA prompt "TEA, XTEA and XETA cipher algorithms" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help TEA cipher algorithm. @@ -485,10 +488,10 @@ config ADK_KPACKAGE_KMOD_CRYPTO_TEA Xtendend Encryption Tiny Algorithm is a mis-implementation of the XTEA algorithm for compatibility purposes. -config ADK_KPACKAGE_KMOD_CRYPTO_TWOFISH +config ADK_KERNEL_CRYPTO_TWOFISH prompt "Twofish cipher algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 default n help Twofish cipher algorithm. @@ -501,10 +504,10 @@ config ADK_KPACKAGE_KMOD_CRYPTO_TWOFISH See also: <http://www.schneier.com/twofish.html> -config ADK_KPACKAGE_KMOD_CRYPTO_TWOFISH_586 +config ADK_KERNEL_CRYPTO_TWOFISH_586 prompt "Twofish cipher algorithm (i586)" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_ALGAPI2 depends on ADK_x86 default n help @@ -518,11 +521,13 @@ config ADK_KPACKAGE_KMOD_CRYPTO_TWOFISH_586 See also: <http://www.schneier.com/twofish.html> -config ADK_KPACKAGE_KMOD_CRYPTO_NULL +config ADK_KERNEL_CRYPTO_NULL prompt "Null algorithms" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2 - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_BLKCIPHER2 + select ADK_KERNEL_CRYPTO_ALGAPI2 + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help These are 'Null' algorithms, used by IPsec, which do nothing. @@ -531,7 +536,7 @@ endmenu menu "Compression" -config ADK_KPACKAGE_KMOD_CRYPTO_DEFLATE +config ADK_KERNEL_CRYPTO_DEFLATE prompt "Deflate compression algorithm" tristate select ADK_KERNEL_CRYPTO @@ -542,18 +547,18 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEFLATE You will most probably want this if using IPSec. -config ADK_KPACKAGE_KMOD_CRYPTO_LZO +config ADK_KERNEL_CRYPTO_LZO prompt "LZO compression algorithm" tristate select ADK_KERNEL_CRYPTO default n help -config ADK_KPACKAGE_KMOD_CRYPTO_MICHAEL_MIC +config ADK_KERNEL_CRYPTO_MICHAEL_MIC prompt "Michael MIC keyed digest algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2 - select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 + select ADK_KERNEL_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_HASH2 default n help Michael MIC is used for message integrity protection in TKIP @@ -561,11 +566,11 @@ config ADK_KPACKAGE_KMOD_CRYPTO_MICHAEL_MIC should not be used for other purposes because of the weakness of the algorithm. -config ADK_KPACKAGE_KMOD_CRYPTO_CRC32C +config ADK_KERNEL_CRYPTO_CRC32C prompt "CRC32c CRC algorithm" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_HASH2 - select ADK_KPACKAGE_KMOD_LIBCRC32C + select ADK_KERNEL_CRYPTO_HASH2 + select ADK_KERNEL_LIBCRC32C default n help Castagnoli, et al Cyclic Redundancy-Check Algorithm. Used diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index e25a0a733..1d66ba986 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -114,11 +114,12 @@ config ADK_KERNEL_DEBUG_WITH_KGDB ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK default n -config ADK_KPACKAGE_KMOD_OPROFILE +config ADK_KERNEL_OPROFILE prompt "Oprofile support" tristate select ADK_KERNEL_PROFILING depends on !ADK_LINUX_M68K + default m if ADK_PACKAGE_OPROFILE default n help use oprofile package to make use of the kernel support. diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma index 350299568..b83cc3af2 100644 --- a/target/linux/config/Config.in.dma +++ b/target/linux/config/Config.in.dma @@ -1,7 +1,7 @@ config ADK_KERNEL_DMADEVICES boolean -config ADK_KPACKAGE_KMOD_DMA_BCM2708 +config ADK_KERNEL_DMA_BCM2708 tristate select ADK_KERNEL_DMADEVICES diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index b6aad8744..b6732a971 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -1,10 +1,18 @@ menu "Ethernet network devices support" -comment "network driver for target system is included into kernel" -config ADK_KERNEL_NET_ETHERNET +# vendor stuff +config ADK_KERNEL_NET_VENDOR_AMD + boolean + +config ADK_KERNEL_NET_VENDOR_IBM + boolean + +config ADK_KERNEL_NET_VENDOR_INTEL + boolean + +config ADK_KERNEL_NET_VENDOR_FREESCALE boolean -# vendor stuff config ADK_KERNEL_NET_VENDOR_NATSEMI boolean @@ -17,13 +25,19 @@ config ADK_KERNEL_NET_VENDOR_REALTEK config ADK_KERNEL_NET_VENDOR_MARVELL boolean -config ADK_KERNEL_PHYLIB +config ADK_KERNEL_NET_VENDOR_VIA boolean -config ADK_KERNEL_MII +config ADK_KERNEL_NET_VENDOR_SMSC + boolean + +config ADK_KERNEL_NET_VENDOR_XILINX + boolean + +config ADK_KERNEL_PHYLIB boolean -config ADK_KERNEL_USB_USBNET +config ADK_KERNEL_MII boolean config ADK_KERNEL_NET_PCI @@ -35,100 +49,190 @@ config ADK_KERNEL_NETDEV_1000 config ADK_KERNEL_VIA_RHINE_MMIO boolean +config ADK_KERNEL_AT803X_PHY + select ADK_KERNEL_PHYLIB + tristate + +config ADK_KERNEL_FEC + prompt "FEC ethernet driver" + tristate + select ADK_KERNEL_NET_VENDOR_FREESCALE + select ADK_KERNEL_AT803X_PHY + default y if ADK_TARGET_SYSTEM_CUBOX_I + default n + help + FEC ethernet driver + +config ADK_KERNEL_KORINA + prompt "Korina ethernet driver" + tristate + default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532 + default n + help + Korina ethernet driver + config ADK_KERNEL_USB_NET_SMSC95XX - boolean - select ADK_KERNEL_NET_ETHERNET + prompt "SMSC95XX USB ethernet driver" + tristate select ADK_KERNEL_USB_USBNET + depends on ADK_TARGET_WITH_USB default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n help + USB SMSC95XX ethernet driver -menu "Ethernet card support" -depends on ADK_TARGET_WITH_PCI +config ADK_KERNEL_SMC91X + prompt "SMC91X ethernet driver" + tristate + select ADK_KERNEL_NET_VENDOR_SMSC + default y if ADK_TARGET_SYSTEM_ARM_FM + default y if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB + default y if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 + default n + help + SMC91X ethernet driver + +config ADK_KERNEL_VIA_RHINE + prompt "VIA Rhine ethernet driver" + tristate + select ADK_KERNEL_NET_VENDOR_VIA + select ADK_KERNEL_VIA_RHINE_MMIO + default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532 + default n + help + VIA Rhine ethernet driver + +config ADK_KERNEL_XILINX_AXI_EMAC + prompt "Xilinx AXI ethernet driver" + tristate + select ADK_KERNEL_NET_VENDOR_XILINX + default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 + default n + help + Xilinx AXI ethernet driver -config ADK_KPACKAGE_KMOD_NE2K_PCI - prompt "kmod-net-ne2k-pci............. NE2000 PCI driver" +config ADK_KERNEL_XILINX_EMACLITE + prompt "Xilinx Emaclite ethernet driver" + tristate + select ADK_KERNEL_NET_VENDOR_XILINX + default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + default n + help + Xilinx Emaclite ethernet driver + +config ADK_KERNEL_NE2K_PCI + prompt "NE2000 PCI driver" tristate - select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_NET_VENDOR_NATSEMI select ADK_KERNEL_NET_VENDOR_8390 select ADK_KERNEL_MII + depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU + default y if ADK_TARGET_SYSTEM_QEMU_PPC default n help - NE2000 pci driver + NE2000 PCI driver -config ADK_KPACKAGE_KMOD_PCNET32 - prompt "kmod-net-pcnet32.............. AMD PCNet32 PCI driver" +config ADK_KERNEL_PCNET32 + prompt "AMD PCNet32 PCI driver" tristate - select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII + depends on ADK_TARGET_WITH_PCI default n help AMD PCnet32 driver -config ADK_KPACKAGE_KMOD_8139CP - prompt "kmod-net-rtl8139cp............ RTL8139C+ PCI driver" +config ADK_KERNEL_8139CP + prompt "RTL8139C+ PCI driver" tristate - select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_NET_VENDOR_REALTEK select ADK_KERNEL_MII + depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU + default y if ADK_TARGET_SYSTEM_QEMU_SH4 + default y if ADK_TARGET_SYSTEM_QEMU_SH4EB default n help RTL8139C+ pci driver -config ADK_KPACKAGE_KMOD_8139TOO - prompt "kmod-net-rtl8139.............. RTL8139 PCI driver" +config ADK_KERNEL_8139TOO + prompt "RTL8139 PCI driver" tristate - select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII + depends on ADK_TARGET_WITH_PCI + default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n help RTL8139 pci driver -config ADK_KPACKAGE_KMOD_E100 - prompt "kmod-net-e100................. Intel(R) PRO/100+ driver" +config ADK_KERNEL_E100 + prompt "Intel(R) PRO/100+ driver" tristate + select ADK_KERNEL_NET_VENDOR_INTEL select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII + depends on ADK_TARGET_WITH_PCI default n help Intel(R) PRO/100+ cards kernel support -config ADK_KPACKAGE_KMOD_E1000 - prompt "kmod-net-e1000................ Intel(R) PRO/1000 Gigabit Ethernet driver" +config ADK_KERNEL_E1000 + prompt "Intel(R) PRO/1000 Gigabit Ethernet driver" tristate - select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_NET_VENDOR_INTEL select ADK_KERNEL_NETDEV_1000 + depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU + default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_QEMU_I486 + default y if ADK_TARGET_SYSTEM_QEMU_I686 + default y if ADK_TARGET_SYSTEM_QEMU_X86_64 + default y if ADK_TARGET_SYSTEM_QEMU_MIPS + default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL + default y if ADK_TARGET_SYSTEM_QEMU_MIPS64 + default y if ADK_TARGET_SYSTEM_QEMU_MIPS64EL + default n + help + Intel(R) PRO/1000 gigabit ethernet driver + +config ADK_KERNEL_SUNLANCE + prompt "AMD Sunlance Ethernet driver" + tristate + select ADK_KERNEL_NET_VENDOR_AMD + depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU + default y if ADK_TARGET_SYSTEM_QEMU_SPARC default n help - This driver supports Intel(R) PRO/1000 gigabit ethernet family of - adapters. For more information on how to identify your adapter, go - to the Adapter & Driver ID Guide at: + AMD Sunlance ethernet driver - <http://support.intel.com/support/network/adapter/pro100/21397.htm> +config ADK_KERNEL_IBMVETH + prompt "IBM Ethernet driver" + tristate + select ADK_KERNEL_NET_VENDOR_IBM + depends on ADK_TARGET_WITH_PCI || ADK_HARDWARE_QEMU + default y if ADK_TARGET_SYSTEM_QEMU_PPC64 + default n + help + IBM ethernet driver -config ADK_KPACKAGE_KMOD_SKY2 - prompt "kmod-net-sky2................. Marvell Yukon driver" +config ADK_KERNEL_SKY2 + prompt "Marvell Yukon SKY2 driver" tristate - select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 select ADK_KERNEL_NET_VENDOR_MARVELL + depends on ADK_TARGET_WITH_PCI default n help -config ADK_KPACKAGE_KMOD_R8169 - prompt "kmod-net-r8169................ RTL8169 driver" +config ADK_KERNEL_R8169 + prompt "RTL8169 driver" tristate - select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 select ADK_KERNEL_MII - select ADK_KPACKAGE_KMOD_FW_LOADER + select ADK_KERNEL_FW_LOADER + depends on ADK_TARGET_WITH_PCI default n help endmenu -endmenu diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 5d958ffdc..f1a5f7afb 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -57,46 +57,35 @@ config ADK_KERNEL_JFFS2_ZLIB default n config ADK_KERNEL_JFFS2_FS + tristate prompt "JFFS2 filesystem" select ADK_KERNEL_MISC_FILESYSTEMS select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS select ADK_KERNEL_JFFS2_ZLIB - boolean config ADK_KERNEL_SQUASHFS prompt "SquashFS filesystem" - boolean + tristate select ADK_KERNEL_MISC_FILESYSTEMS select ADK_KERNEL_SQUASHFS_XZ default n config ADK_KERNEL_EXT2_FS - boolean - default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default n - -config ADK_KPACKAGE_KMOD_EXT2_FS prompt "EXT2 filesystem support" tristate + default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n - depends on !ADK_KERNEL_EXT2_FS help Ext2 is a standard Linux file system for hard disks. -config ADK_KPACKAGE_KMOD_FS_MBCACHE +config ADK_KERNEL_FS_MBCACHE tristate - depends on !ADK_KERNEL_EXT4_FS default n config ADK_KERNEL_EXT3_FS - boolean - default n - -config ADK_KPACKAGE_KMOD_EXT3_FS prompt "EXT3 filesystem support" tristate - select ADK_KPACKAGE_KMOD_FS_MBCACHE if !ADK_KERNEL_EXT4_FS - depends on !ADK_KERNEL_EXT3_FS + select ADK_KERNEL_FS_MBCACHE default n help This is the journalling version of the Second extended file system @@ -123,25 +112,18 @@ config ADK_KPACKAGE_KMOD_EXT3_FS (available at <http://sourceforge.net/projects/e2fsprogs/>). config ADK_KERNEL_EXT4_FS - boolean - select ADK_KERNEL_CRC16 - default n - -config ADK_KPACKAGE_KMOD_EXT4_FS prompt "EXT4 filesystem support" tristate - select ADK_KPACKAGE_KMOD_FS_MBCACHE - select ADK_KPACKAGE_KMOD_CRC16 - depends on !ADK_KERNEL_EXT4_FS + select ADK_KERNEL_FS_MBCACHE + select ADK_KERNEL_CRC16 default n help Ext4 filesystem. -config ADK_KPACKAGE_KMOD_HFSPLUS_FS +config ADK_KERNEL_HFSPLUS_FS prompt "HFS+ filesystem support" tristate - select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS - select ADK_KPACKAGE_KMOD_NLS_UTF8 + select ADK_KERNEL_NLS_UTF8 select ADK_KERNEL_MISC_FILESYSTEMS default n help @@ -153,10 +135,9 @@ config ADK_KPACKAGE_KMOD_HFSPLUS_FS data forks and creator codes, but it also has several UNIX style features such as file ownership and permissions. -config ADK_KPACKAGE_KMOD_NTFS_FS +config ADK_KERNEL_NTFS_FS prompt "NTFS file system support" tristate - select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS default n help NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003. @@ -181,12 +162,11 @@ config ADK_KPACKAGE_KMOD_NTFS_FS Linux on your computer it is safe to say N. Kernel modules for NTFS support -config ADK_KPACKAGE_KMOD_VFAT_FS +config ADK_KERNEL_VFAT_FS prompt "VFAT filesystem support" tristate - select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS - select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850 - select ADK_KPACKAGE_KMOD_NLS_ISO8859_1 + select ADK_KERNEL_NLS_CODEPAGE_850 + select ADK_KERNEL_NLS_ISO8859_1 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n help @@ -200,16 +180,10 @@ config ADK_KPACKAGE_KMOD_VFAT_FS config ADK_KERNEL_XFS_FS - boolean - select ADK_KERNEL_EXPORTFS - default n - -config ADK_KPACKAGE_KMOD_XFS_FS prompt "XFS filesystem support" tristate select ADK_KERNEL_EXPORTFS - select ADK_KPACKAGE_KMOD_CRYPTO_CRC32C - depends on !ADK_KERNEL_XFS_FS + select ADK_KERNEL_CRYPTO_CRC32C default n help XFS is a high performance journaling filesystem which originated @@ -223,9 +197,13 @@ config ADK_KPACKAGE_KMOD_XFS_FS for complete details. This implementation is on-disk compatible with the IRIX version of XFS. -config ADK_KPACKAGE_KMOD_FUSE_FS +config ADK_KERNEL_FUSE_FS prompt "Filesystem in Userspace support" tristate + default m if ADK_PACKAGE_DAVFS2 + default m if ADK_PACKAGE_FUSE + default m if ADK_PACKAGE_NTFS_3G + default m if ADK_PACKAGE_WDFS default n help With FUSE it is possible to implement a fully functional @@ -240,10 +218,6 @@ config ADK_KERNEL_JOLIET default n config ADK_KERNEL_ISO9660_FS - boolean - default n - -config ADK_KPACKAGE_KMOD_ISO9660_FS prompt "ISO 9660 / JOLIET CDROM file system support" tristate select ADK_KERNEL_JOLIET @@ -259,10 +233,10 @@ config ADK_KPACKAGE_KMOD_ISO9660_FS available from <http://www.tldp.org/docs.html#howto>), thereby enlarging your kernel by about 27 KB; otherwise say N. -config ADK_KPACKAGE_KMOD_UDF_FS +config ADK_KERNEL_UDF_FS prompt "UDF file system support" tristate - select ADK_KPACKAGE_KMOD_CRC_ITU_T + select ADK_KERNEL_CRC_ITU_T default n help This is the new file system used on some CD-ROMs and DVDs. Say Y if diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index 01cf25a41..1683bf363 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -1,22 +1,19 @@ -config ADK_KERNEL_FILE_LOCKING - boolean - config ADK_KERNEL_FS_POSIX_ACL boolean default y -config ADK_KPACKAGE_KMOD_CIFS +config ADK_KERNEL_CIFS prompt "CIFS support" 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 + select ADK_KERNEL_CRYPTO_MD4 + select ADK_KERNEL_CRYPTO_MD5 + select ADK_KERNEL_CRYPTO_HMAC + select ADK_KERNEL_CRYPTO_ARC4 + select ADK_KERNEL_CRYPTO_ECB + select ADK_KERNEL_CRYPTO_DES + select ADK_KERNEL_CRYPTO_SHA256 + default m if ADK_PACKAGE_CIFS_UTILS default n help This is the client VFS module for the Common Internet File System @@ -41,7 +38,7 @@ config ADK_KPACKAGE_KMOD_CIFS and Samba 3 servers, and smbfs for accessing old servers). If you need to mount to Samba or Windows from this machine, say Y. -config ADK_KPACKAGE_KMOD_CODA_FS +config ADK_KERNEL_CODA_FS prompt "Support for CODA filesystem" tristate select ADK_KERNEL_NETWORK_FILESYSTEMS @@ -55,21 +52,17 @@ config ADK_KERNEL_NFS_V4 default y if ADK_PACKAGE_NFS_UTILS_V4 default n -config ADK_KERNEL_RPCSEC_GSS_KRB5 - boolean - default n - -config ADK_KPACKAGE_KMOD_NFS_FS +config ADK_KERNEL_NFS_FS prompt "NFS client support" tristate - default n select ADK_KERNEL_NFS_V3 select ADK_KERNEL_FILE_LOCKING select ADK_KERNEL_DNOTIFY - select ADK_KPACKAGE_KMOD_SUNRPC - select ADK_KPACKAGE_KMOD_LOCKD + select ADK_KERNEL_SUNRPC + select ADK_KERNEL_LOCKD select ADK_KERNEL_NETWORK_FILESYSTEMS - depends on !ADK_TARGET_ROOTFS_NFSROOT + default m if ADK_PACKAGE_NFS_UTILS_CLIENT + default n help If you are connected to some other (usually local) Unix computer (using SLIP, PLIP, PPP or Ethernet) and want to mount files residing @@ -110,22 +103,22 @@ config ADK_KERNEL_NFSD_V3 config ADK_KERNEL_NFSD_V4 boolean - select ADK_KPACKAGE_KMOD_SUNRPC_GSS + select ADK_KERNEL_SUNRPC_GSS default y if ADK_PACKAGE_NFS_UTILS_V4 default n -config ADK_KPACKAGE_KMOD_NFSD +config ADK_KERNEL_NFSD prompt "NFS server support" tristate - default n select ADK_KERNEL_EXPORTFS select ADK_KERNEL_NFSD_V3 select ADK_KERNEL_DNOTIFY select ADK_KERNEL_FILE_LOCKING - select ADK_KPACKAGE_KMOD_SUNRPC - select ADK_KPACKAGE_KMOD_LOCKD + select ADK_KERNEL_SUNRPC + select ADK_KERNEL_LOCKD select ADK_KERNEL_NETWORK_FILESYSTEMS - depends on !ADK_TARGET_ROOTFS_NFSROOT + default m if ADK_PACKAGE_NFS_UTILS_SERVER + default n help If you want your Linux box to act as an NFS *server*, so that other computers on your local network which support NFS can access certain @@ -146,33 +139,36 @@ config ADK_KPACKAGE_KMOD_NFSD Please read the NFS-HOWTO, available from <http://www.tldp.org/docs.html#howto>. -config ADK_KPACKAGE_KMOD_LOCKD +config ADK_KERNEL_LOCKD tristate default n -config ADK_KPACKAGE_KMOD_SUNRPC +config ADK_KERNEL_SUNRPC tristate - depends on !ADK_KERNEL_SUNRPC default n -config ADK_KPACKAGE_KMOD_SUNRPC_GSS +config ADK_KERNEL_SUNRPC_GSS tristate - select ADK_KPACKAGE_KMOD_SUNRPC + select ADK_KERNEL_SUNRPC default n -config ADK_KPACKAGE_KMOD_RPCSEC_GSS_KRB5 +config ADK_KERNEL_RPCSEC_GSS_KRB5 + prompt "RPC security support" tristate select ADK_KERNEL_NETWORK_FILESYSTEMS - select ADK_KPACKAGE_KMOD_SUNRPC_GSS - select ADK_KPACKAGE_KMOD_SUNRPC - select ADK_KPACKAGE_KMOD_CRYPTO - select ADK_KPACKAGE_KMOD_CRYPTO_MD5 - select ADK_KPACKAGE_KMOD_CRYPTO_DES - select ADK_KPACKAGE_KMOD_CRYPTO_CBC - select ADK_KPACKAGE_KMOD_CRYPTO_CTS - select ADK_KPACKAGE_KMOD_CRYPTO_ECB - select ADK_KPACKAGE_KMOD_CRYPTO_HMAC - select ADK_KPACKAGE_KMOD_CRYPTO_SHA1 - select ADK_KPACKAGE_KMOD_CRYPTO_AES - select ADK_KPACKAGE_KMOD_CRYPTO_ARC4 + select ADK_KERNEL_SUNRPC_GSS + select ADK_KERNEL_SUNRPC + select ADK_KERNEL_CRYPTO + select ADK_KERNEL_CRYPTO_MD5 + select ADK_KERNEL_CRYPTO_DES + select ADK_KERNEL_CRYPTO_CBC + select ADK_KERNEL_CRYPTO_CTS + select ADK_KERNEL_CRYPTO_ECB + select ADK_KERNEL_CRYPTO_HMAC + select ADK_KERNEL_CRYPTO_SHA1 + select ADK_KERNEL_CRYPTO_AES + select ADK_KERNEL_CRYPTO_ARC4 + default m if ADK_PACKAGE_NFS_UTILS_V4 default n + help + diff --git a/target/linux/config/Config.in.gpio b/target/linux/config/Config.in.gpio index 414a4b0ce..d66bff46f 100644 --- a/target/linux/config/Config.in.gpio +++ b/target/linux/config/Config.in.gpio @@ -13,3 +13,4 @@ config ADK_KERNEL_GPIO_MXC select ADK_KERNEL_GPIO_SYSFS select ADK_KERNEL_GPIO_GENERIC default y if ADK_TARGET_SYSTEM_CUBOX_I + default n diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 874e81017..69412f3b0 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -1,3 +1,6 @@ +menu "Graphic devices support" +depends on ADK_TARGET_WITH_VGA || ADK_HARDWARE_QEMU + config ADK_KERNEL_VT boolean default y if ADK_HARDWARE_VBOX @@ -26,9 +29,9 @@ config ADK_KERNEL_FB boolean config ADK_KERNEL_FRAMEBUFFER_CONSOLE + boolean default y if ADK_TARGET_SYSTEM_ARANYM_M68K default n - boolean config ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY boolean @@ -97,9 +100,6 @@ config ADK_KERNEL_AGP_INTEL config ADK_KERNEL_LOGO boolean -menu "Graphic devices support" -depends on ADK_TARGET_WITH_VGA || ADK_HARDWARE_QEMU - config ADK_KERNEL_LOGO_LINUX_CLUT224 prompt "Enable Linux penguin boot logo" boolean diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c index e8998a18a..b3a3cbed2 100644 --- a/target/linux/config/Config.in.i2c +++ b/target/linux/config/Config.in.i2c @@ -1,18 +1,15 @@ +menu "I2C driver support" +depends on ADK_TARGET_WITH_I2C + config ADK_KERNEL_I2C boolean config ADK_KERNEL_I2C_CHARDEV - boolean - -config ADK_KPACKAGE_KMOD_I2C_CHARDEV tristate -menu "I2C driver support" -depends on ADK_TARGET_WITH_I2C - config ADK_KERNEL_I2C_IMX prompt "I2C driver for Cubox-i" - boolean + tristate depends on ADK_TARGET_SYSTEM_CUBOX_I select ADK_KERNEL_I2C select ADK_KERNEL_I2C_CHARDEV @@ -21,12 +18,12 @@ config ADK_KERNEL_I2C_IMX help I2C driver for Cubox-i. -config ADK_KPACKAGE_KMOD_SCX200_ACB +config ADK_KERNEL_SCX200_ACB prompt "I2C driver for Geode" tristate depends on ADK_CPU_GEODE select ADK_KERNEL_I2C - select ADK_KPACKAGE_KMOD_I2C_CHARDEV + select ADK_KERNEL_I2C_CHARDEV default y if ADK_CPU_GEODE default n help diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 2dad34d1f..8d5b1f1c5 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -1,3 +1,6 @@ +menu "Input devices" +depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCHSCREEN + config ADK_KERNEL_INPUT boolean default y if ADK_TARGET_SYSTEM_ARANYM_M68K @@ -47,12 +50,6 @@ config ADK_KERNEL_TOUCHSCREEN_ADS7846 default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS default n -config ADK_KERNEL_INPUT_EVDEV - boolean - default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI - default n - config ADK_KERNEL_INPUT_KEYBOARD boolean default y if ADK_TARGET_SYSTEM_ARANYM_M68K @@ -64,14 +61,6 @@ config ADK_KERNEL_INPUT_KEYBOARD default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n -config ADK_KERNEL_KEYBOARD_ATKBD - boolean - default y if ADK_TARGET_SYSTEM_VBOX_I686 - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default n - config ADK_KERNEL_INPUT_MOUSE boolean default y if ADK_TARGET_SYSTEM_ARANYM_M68K @@ -83,16 +72,6 @@ config ADK_KERNEL_INPUT_MOUSE default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n -config ADK_KERNEL_INPUT_MOUSEDEV - boolean - default y if ADK_TARGET_SYSTEM_VBOX_I686 - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI - default n - config ADK_KERNEL_HID_SUPPORT boolean default n @@ -107,22 +86,17 @@ config ADK_KERNEL_HID_GENERIC select ADK_KERNEL_HID_SUPPORT default n -menu "Input devices" -depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCHSCREEN - -config ADK_KPACKAGE_KMOD_USB_HID +config ADK_KERNEL_USB_HID prompt "USB keyboard/mouse support" tristate - depends on !ADK_KERNEL_USB_HID select ADK_KERNEL_INPUT select ADK_KERNEL_HID select ADK_KERNEL_HID_GENERIC select ADK_KERNEL_INPUT_KEYBOARD select ADK_KERNEL_INPUT_MOUSEDEV select ADK_KERNEL_INPUT_MOUSE - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_TARGET_WITH_USB - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default m if ADK_TARGET_SYSTEM_RASPBERRY_PI default n config ADK_KERNEL_LOGITECH_DINOVO @@ -134,27 +108,26 @@ config ADK_KERNEL_LOGITECH_DINOVO help Support for Logitech DiNovo keyboard/mouse combination. -config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD +config ADK_KERNEL_KEYBOARD_ATKBD prompt "Keyboard support (AT)" tristate select ADK_KERNEL_INPUT select ADK_KERNEL_INPUT_KEYBOARD - depends on !ADK_KERNEL_KEYBOARD_ATKBD depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI default n -config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV +config ADK_KERNEL_INPUT_MOUSEDEV prompt "Mouse support" tristate select ADK_KERNEL_INPUT - depends on !ADK_KERNEL_INPUT_MOUSEDEV default n -config ADK_KPACKAGE_KMOD_INPUT_EVDEV +config ADK_KERNEL_INPUT_EVDEV prompt "Event device support" tristate select ADK_KERNEL_INPUT - depends on !ADK_KERNEL_INPUT_EVDEV + default m if ADK_PACKAGE_XF86_INPUT_EVDEV + default m if ADK_PACKAGE_XF86_INPUT_EVTOUCH default n endmenu diff --git a/target/linux/config/Config.in.ipsec b/target/linux/config/Config.in.ipsec index b8fd67926..8f0323291 100644 --- a/target/linux/config/Config.in.ipsec +++ b/target/linux/config/Config.in.ipsec @@ -1,59 +1,73 @@ menu "IPSec support" -config ADK_KPACKAGE_KMOD_NET_KEY +config ADK_KERNEL_NET_KEY prompt "PF_KEYv2 socket family" tristate + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help PF_KEYv2 socket family, compatible to KAME ones. -config ADK_KPACKAGE_KMOD_XFRM_USER +config ADK_KERNEL_XFRM_USER prompt "IPsec usertools support" tristate + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help -config ADK_KPACKAGE_KMOD_INET_AH +config ADK_KERNEL_INET_AH prompt "IPsec AH support" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_HASH + select ADK_KERNEL_CRYPTO_HASH + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help Support for IPsec AH. -config ADK_KPACKAGE_KMOD_INET_ESP +config ADK_KERNEL_INET_ESP prompt "IPsec ESP support" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_AEAD + select ADK_KERNEL_CRYPTO_AEAD + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help Support for IPsec ESP. -config ADK_KPACKAGE_KMOD_INET_IPCOMP +config ADK_KERNEL_INET_IPCOMP prompt "IP Payload Compression" tristate - select ADK_KPACKAGE_KMOD_CRYPTO_DEFLATE - select ADK_KPACKAGE_KMOD_INET_TUNNEL + select ADK_KERNEL_CRYPTO_DEFLATE + select ADK_KERNEL_INET_TUNNEL + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help Support for IP Payload Compression Protocol (IPComp) (RFC3173), typically needed for IPsec. -config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TRANSPORT +config ADK_KERNEL_INET_XFRM_MODE_TRANSPORT prompt "IPsec transport mode" tristate + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help Support for IPsec transport mode. -config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TUNNEL +config ADK_KERNEL_INET_XFRM_MODE_TUNNEL prompt "IPsec tunnel mode" tristate + default m if ADK_PACKAGE_STRONGSWAN + default m if ADK_PACKAGE_OPENSWAN default n help Support for IPsec tunnel mode. -config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_BEET +config ADK_KERNEL_INET_XFRM_MODE_BEET prompt "IPsec BEET mode" tristate default n diff --git a/target/linux/config/Config.in.ipvs b/target/linux/config/Config.in.ipvs index 13e38ece3..16106e7a3 100644 --- a/target/linux/config/Config.in.ipvs +++ b/target/linux/config/Config.in.ipvs @@ -1,20 +1,21 @@ menu "IPVS support" -config ADK_KPACKAGE_KMOD_IP_VS +config ADK_KERNEL_IP_VS prompt "IPVS support" tristate select ADK_KERNEL_NETFILTER - select ADK_KPACKAGE_KMOD_NF_CONNTRACK + select ADK_KERNEL_NF_CONNTRACK + default m if ADK_PACKAGE_IPVSADM default n config ADK_KERNEL_IP_VS_DEBUG prompt "enable debugging support" boolean default n - depends on ADK_KPACKAGE_KMOD_IP_VS + depends on ADK_KERNEL_IP_VS menu "IPVS transport protocol load balancing support" - depends on ADK_KPACKAGE_KMOD_IP_VS + depends on ADK_KERNEL_IP_VS config ADK_KERNEL_IP_VS_PROTO_TCP prompt "TCP load balancing support" @@ -51,54 +52,54 @@ config ADK_KERNEL_IP_VS_PROTO_AH endmenu menu "IPVS Scheduler" - depends on ADK_KPACKAGE_KMOD_IP_VS + depends on ADK_KERNEL_IP_VS -config ADK_KPACKAGE_KMOD_IP_VS_RR +config ADK_KERNEL_IP_VS_RR prompt "round-robin" tristate default n -config ADK_KPACKAGE_KMOD_IP_VS_WRR +config ADK_KERNEL_IP_VS_WRR prompt "weighted round-robin" tristate default n -config ADK_KPACKAGE_KMOD_IP_VS_LC +config ADK_KERNEL_IP_VS_LC prompt "least-connection" tristate default n -config ADK_KPACKAGE_KMOD_IP_VS_WLC +config ADK_KERNEL_IP_VS_WLC prompt "weighted least-connection" tristate default n -config ADK_KPACKAGE_KMOD_IP_VS_LBLC +config ADK_KERNEL_IP_VS_LBLC prompt "locality-based least-connection" tristate default n -config ADK_KPACKAGE_KMOD_IP_VS_LBLCR +config ADK_KERNEL_IP_VS_LBLCR prompt "locality-based least-connection with replication" tristate default n -config ADK_KPACKAGE_KMOD_IP_VS_DH +config ADK_KERNEL_IP_VS_DH prompt "destination hashing" tristate default n -config ADK_KPACKAGE_KMOD_IP_VS_SH +config ADK_KERNEL_IP_VS_SH prompt "source hashing" tristate default n -config ADK_KPACKAGE_KMOD_IP_VS_SED +config ADK_KERNEL_IP_VS_SED prompt "shortest expected delay" tristate default n -config ADK_KPACKAGE_KMOD_IP_VS_NQ +config ADK_KERNEL_IP_VS_NQ prompt "never queue" tristate default n @@ -106,9 +107,9 @@ config ADK_KPACKAGE_KMOD_IP_VS_NQ endmenu menu "IPVS application helper" - depends on ADK_KPACKAGE_KMOD_IP_VS + depends on ADK_KERNEL_IP_VS -config ADK_KPACKAGE_KMOD_IP_VS_FTP +config ADK_KERNEL_IP_VS_FTP prompt "FTP protocol" tristate default n diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index e6dc6d6e9..b75ff9406 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -75,24 +75,12 @@ config ADK_KERNEL_IP_PNP config ADK_KERNEL_IP_PNP_DHCP boolean -config ADK_KERNEL_NFS_FS - boolean - -config ADK_KERNEL_NFS_V3 - boolean - config ADK_KERNEL_ROOT_NFS boolean -config ADK_KERNEL_LOCKD - boolean - config ADK_KERNEL_NFS_COMMON boolean -config ADK_KERNEL_SUNRPC - boolean - config ADK_KERNEL_64BIT boolean default y if ADK_LINUX_64 diff --git a/target/linux/config/Config.in.kvm b/target/linux/config/Config.in.kvm index 44ed992a4..5bba30871 100644 --- a/target/linux/config/Config.in.kvm +++ b/target/linux/config/Config.in.kvm @@ -6,13 +6,8 @@ config ADK_KERNEL_VIRTUALIZATION default n config ADK_KERNEL_KVM - bool - default n - -config ADK_KPACKAGE_KMOD_KVM - prompt "kmod-kvm.......................... Kernel-based Virtual Machine (KVM) support" + prompt "Kernel-based Virtual Machine (KVM) support" tristate - depends on !ADK_KERNEL_KVM select ADK_KERNEL_VIRTUALIZATION default n help @@ -23,20 +18,18 @@ config ADK_KPACKAGE_KMOD_KVM This module provides access to the hardware capabilities through a character device node named /dev/kvm. -config ADK_KPACKAGE_KMOD_KVM_AMD - prompt "kmod-kvm-amd...................... KVM for AMD processors support" +config ADK_KERNEL_KVM_AMD + prompt "KVM for AMD processors support" tristate - depends on !ADK_KERNEL_KVM select ADK_KERNEL_VIRTUALIZATION default n help Provides support for KVM on AMD processors equipped with the AMD-V (SVM) extensions. -config ADK_KPACKAGE_KMOD_KVM_INTEL - prompt "kmod-kvm-intel.................... KVM for Intel processors support" +config ADK_KERNEL_KVM_INTEL + prompt "KVM for Intel processors support" tristate - depends on !ADK_KERNEL_KVM select ADK_KERNEL_VIRTUALIZATION default n help diff --git a/target/linux/config/Config.in.leds b/target/linux/config/Config.in.leds index 54298bc3c..f0001fc41 100644 --- a/target/linux/config/Config.in.leds +++ b/target/linux/config/Config.in.leds @@ -9,14 +9,14 @@ config ADK_KERNEL_LEDS_TRIGGERS boolean select ADK_KERNEL_NEW_LEDS -config ADK_KPACKAGE_KMOD_LEDS_CLASS +config ADK_KERNEL_LEDS_CLASS boolean depends on !ADK_KERNEL_LEDS_CLASS menu "LEDS driver support" depends on ADK_TARGET_WITH_LEDS -config ADK_KPACKAGE_KMOD_LEDS_MIKROTIK_RB532 +config ADK_KERNEL_LEDS_MIKROTIK_RB532 prompt "LED suppport for RB532" tristate select ADK_KERNEL_LEDS_CLASS @@ -24,7 +24,7 @@ config ADK_KPACKAGE_KMOD_LEDS_MIKROTIK_RB532 default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532 default n -config ADK_KPACKAGE_KMOD_LEDS_WRAP +config ADK_KERNEL_LEDS_WRAP prompt "LED suppport for WRAP" tristate select ADK_KERNEL_LEDS_CLASS @@ -32,7 +32,7 @@ config ADK_KPACKAGE_KMOD_LEDS_WRAP default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP default n -config ADK_KPACKAGE_KMOD_LEDS_ALIX2 +config ADK_KERNEL_LEDS_ALIX2 prompt "LED suppport for ALIX2/ALIX3" tristate select ADK_KERNEL_LEDS_CLASS @@ -41,28 +41,28 @@ config ADK_KPACKAGE_KMOD_LEDS_ALIX2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default n -config ADK_KPACKAGE_KMOD_LEDS_TRIGGER_TIMER +config ADK_KERNEL_LEDS_TRIGGER_TIMER prompt "LED Timer trigger" tristate select ADK_KERNEL_LEDS_TRIGGERS select ADK_KERNEL_LEDS_CLASS default n -config ADK_KPACKAGE_KMOD_LEDS_TRIGGER_HEARTBEAT +config ADK_KERNEL_LEDS_TRIGGER_HEARTBEAT prompt "LED Heartbeat trigger" tristate select ADK_KERNEL_LEDS_TRIGGERS select ADK_KERNEL_LEDS_CLASS default n -config ADK_KPACKAGE_KMOD_LEDS_TRIGGER_DEFAULT_ON +config ADK_KERNEL_LEDS_TRIGGER_DEFAULT_ON prompt "LED Default On trigger" tristate select ADK_KERNEL_LEDS_TRIGGERS select ADK_KERNEL_LEDS_CLASS default n -config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_LED +config ADK_KERNEL_NETFILTER_XT_TARGET_LED prompt "LED IPTables trigger" tristate select ADK_KERNEL_LEDS_TRIGGERS diff --git a/target/linux/config/Config.in.lib b/target/linux/config/Config.in.lib index 07dfbcf3d..c69a85797 100644 --- a/target/linux/config/Config.in.lib +++ b/target/linux/config/Config.in.lib @@ -1,14 +1,6 @@ menu "Kernel Library Routines" -config ADK_KERNEL_CRC16 - bool - default n - -config ADK_KERNEL_CRC32 - bool - default y - -config ADK_KPACKAGE_KMOD_CRC_ITU_T +config ADK_KERNEL_CRC_ITU_T prompt "CRC ITU-T V.41 functions" tristate default n @@ -18,14 +10,13 @@ config ADK_KPACKAGE_KMOD_CRC_ITU_T the kernel tree does. Such modules that use library CRC ITU-T V.41 functions require M here. -config ADK_KPACKAGE_KMOD_CRC16 +config ADK_KERNEL_CRC16 prompt "CRC16 library functions" tristate - depends on ! ADK_KERNEL_CRC16 default n help -config ADK_KPACKAGE_KMOD_LIBCRC32C +config ADK_KERNEL_LIBCRC32C prompt "CRC32c Cyclic Redundancy-Check" tristate default n @@ -35,7 +26,7 @@ config ADK_KPACKAGE_KMOD_LIBCRC32C kernel tree does. Such modules that use library CRC32c functions require M here. See Castagnoli93. -config ADK_KPACKAGE_KMOD_CRC_CCITT +config ADK_KERNEL_CRC_CCITT prompt "CRC-CCITT library functions" tristate default n diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 175993155..1b60ef1e8 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -1,8 +1,3 @@ -# for DMA driver required -config ADK_KERNEL_FW_LOADER - boolean - default n - config ADK_KERNEL_FIRMWARE_IN_KERNEL boolean default n @@ -32,7 +27,7 @@ config ADK_KERNEL_KEXEC help You need also kexec-tools to benefit from it. -config ADK_KPACKAGE_KMOD_PARPORT +config ADK_KERNEL_PARPORT prompt "Generic parallel port support" tristate default n @@ -40,20 +35,20 @@ config ADK_KPACKAGE_KMOD_PARPORT help Kernel module for generic parallel port support. -config ADK_KPACKAGE_KMOD_PARPORT_PC +config ADK_KERNEL_PARPORT_PC prompt "PC style parallel port support" tristate default n - depends on ADK_KPACKAGE_KMOD_PARPORT + depends on ADK_KERNEL_PARPORT help Kernel module for PC style parallel port support. -config ADK_KPACKAGE_KMOD_PLIP +config ADK_KERNEL_PLIP prompt "PLIP (internet over parallel port)" tristate default n - depends on ADK_KPACKAGE_KMOD_PARPORT - select ADK_KPACKAGE_KMOD_PARPORT_PC + depends on ADK_KERNEL_PARPORT + select ADK_KERNEL_PARPORT_PC help PLIP: IPv4 over parallel port, using a Turbo Laplink (crossed null-printer) cable. Drivers exist for DOS @@ -61,25 +56,25 @@ config ADK_KPACKAGE_KMOD_PLIP longer compatible with Linux 1.x), FreeBSD and MirBSD. This will enlarge your kernel by about 8 KiB. -config ADK_KPACKAGE_KMOD_PRINTER +config ADK_KERNEL_PRINTER prompt "Line printer support" tristate default n - depends on ADK_KPACKAGE_KMOD_PARPORT - select ADK_KPACKAGE_KMOD_PARPORT_PC + depends on ADK_KERNEL_PARPORT + select ADK_KERNEL_PARPORT_PC help Kernel module for line printer support -config ADK_KPACKAGE_KMOD_PPDEV +config ADK_KERNEL_PPDEV prompt "Userland parallel port driver" tristate default n - depends on ADK_KPACKAGE_KMOD_PARPORT - select ADK_KPACKAGE_KMOD_PARPORT_PC + depends on ADK_KERNEL_PARPORT + select ADK_KERNEL_PARPORT_PC help Kernel module for userland parallel port access -config ADK_KPACKAGE_KMOD_FW_LOADER +config ADK_KERNEL_FW_LOADER prompt "Userspace firmware loading support" tristate depends on !ADK_TARGET_SYSTEM_SHARP_ZAURUS @@ -88,10 +83,10 @@ config ADK_KPACKAGE_KMOD_FW_LOADER This may be necessary when using drivers which require loading of external firmware files. -config ADK_KPACKAGE_KMOD_EEPROM_93CX6 +config ADK_KERNEL_EEPROM_93CX6 prompt "93cx6 eeprom support" tristate - depends on ADK_KPACKAGE_KMOD_MAC80211 + depends on ADK_KERNEL_MAC80211 select ADK_KERNEL_MISC_DEVICES default n help diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter index 94f82ef64..2fc23225c 100644 --- a/target/linux/config/Config.in.netfilter +++ b/target/linux/config/Config.in.netfilter @@ -109,19 +109,19 @@ config ADK_KERNEL_IP_NF_MATCH_HELPER # cannot be ADK_KERNEL_IP_NF_MATCH_STATE because # netfilter is built as a module -> this'll always be # a module, too -config ADK_KPACKAGE_KMOD_IP_NF_MATCH_STATE +config ADK_KERNEL_IP_NF_MATCH_STATE tristate - select ADK_KPACKAGE_KMOD_NETFILTER_XT_MATCH_STATE + select ADK_KERNEL_NETFILTER_XT_MATCH_STATE default n -config ADK_KPACKAGE_KMOD_NETFILTER_XT_MATCH_STATE +config ADK_KERNEL_NETFILTER_XT_MATCH_STATE tristate default n # cannot be ADK_KERNEL_IP_NF_MATCH_CONNTRACK because # netfilter is built as a module -> this'll always be # a module, too -config ADK_KPACKAGE_KMOD_IP_NF_MATCH_CONNTRACK +config ADK_KERNEL_IP_NF_MATCH_CONNTRACK tristate default n diff --git a/target/linux/config/Config.in.netfilter.core b/target/linux/config/Config.in.netfilter.core index eb522cb2a..16da9707f 100644 --- a/target/linux/config/Config.in.netfilter.core +++ b/target/linux/config/Config.in.netfilter.core @@ -1,10 +1,10 @@ -config ADK_KPACKAGE_KMOD_NETFILTER_NETLINK_LOG +config ADK_KERNEL_NETFILTER_NETLINK_LOG tristate 'Netfilter LOG over NFNETLINK interface' help If this option is enabled, the kernel will include support for logging packets via NFNETLINK. -config ADK_KPACKAGE_KMOD_NF_CONNTRACK +config ADK_KERNEL_NF_CONNTRACK tristate 'Netfilter connection tracking support' select ADK_KERNEL_NETFILTER_XTABLES help @@ -15,15 +15,15 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK Layer 3 independent connection tracking is experimental scheme which generalize ip_conntrack to support other layer 3 protocols. -config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_CHECKSUM +config ADK_KERNEL_NETFILTER_XT_TARGET_CHECKSUM tristate '"CHECKSUM" target support' - select ADK_KPACKAGE_KMOD_IP_NF_IPTABLES + select ADK_KERNEL_IP_NF_IPTABLES select ADK_KERNEL_NETFILTER_XTABLES - select ADK_KPACKAGE_KMOD_IP_NF_MANGLE + select ADK_KERNEL_IP_NF_MANGLE select ADK_KERNEL_NETFILTER_ADVANCED help -config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_CLASSIFY +config ADK_KERNEL_NETFILTER_XT_TARGET_CLASSIFY tristate '"CLASSIFY" target support' select ADK_KERNEL_NETFILTER_XTABLES help @@ -33,16 +33,16 @@ config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_CLASSIFY atm, cbq, dsmark, pfifo_fast, htb, prio -config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_CONNMARK +config ADK_KERNEL_NETFILTER_XT_TARGET_CONNMARK tristate '"CONNMARK" target support' select ADK_KERNEL_NETFILTER_XTABLES - select ADK_KPACKAGE_KMOD_NF_CONNTRACK + select ADK_KERNEL_NF_CONNTRACK help This option adds a `CONNMARK' target, which allows one to manipulate the connection mark value. Similar to the MARK target, but affects the connection mark value rather than the packet mark value. -config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_MARK +config ADK_KERNEL_NETFILTER_XT_TARGET_MARK tristate '"MARK" target support' select ADK_KERNEL_NETFILTER_XTABLES help @@ -53,7 +53,7 @@ config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_MARK key') and can also be used by other subsystems to change their behavior. -config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_NFQUEUE +config ADK_KERNEL_NETFILTER_XT_TARGET_NFQUEUE tristate '"NFQUEUE" target support' select ADK_KERNEL_NETFILTER_XTABLES help @@ -62,21 +62,21 @@ config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_NFQUEUE As opposed to QUEUE, it supports 65535 different queues, not just one. -config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_LOG +config ADK_KERNEL_NETFILTER_XT_TARGET_LOG tristate 'LOG target support' - depends on ADK_KPACKAGE_KMOD_IP_NF_FILTER + depends on ADK_KERNEL_IP_NF_FILTER help This option adds a `LOG' target, which allows you to create rules in any iptables table which records the packet header to the syslog. -config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_TCPMSS +config ADK_KERNEL_NETFILTER_XT_TARGET_TCPMSS tristate 'TCPMSS target' select ADK_KERNEL_NETFILTER_XTABLES help -config ADK_KPACKAGE_KMOD_NF_CONNTRACK_MARK +config ADK_KERNEL_NF_CONNTRACK_MARK bool 'Connection mark tracking support' - depends on ADK_KPACKAGE_KMOD_NF_CONNTRACK + depends on ADK_KERNEL_NF_CONNTRACK select ADK_KERNEL_IP_NF_MATCH_CONNMARK help This option enables support for connection marks, used by the @@ -84,9 +84,9 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK_MARK of packets, but this mark value is kept in the conntrack session instead of the individual packets. -config ADK_KPACKAGE_KMOD_NF_CONNTRACK_SECMARK +config ADK_KERNEL_NF_CONNTRACK_SECMARK bool 'Connection tracking security mark support' - depends on ADK_KPACKAGE_KMOD_NF_CONNTRACK + depends on ADK_KERNEL_NF_CONNTRACK #FIXME select NETWORK_SECMARK help This option enables security markings to be applied to @@ -95,23 +95,23 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK_SECMARK connections to packets with the same target, with the packets being originally labeled via SECMARK. -config ADK_KPACKAGE_KMOD_NF_CONNTRACK_FTP +config ADK_KERNEL_NF_CONNTRACK_FTP tristate 'FTP protocol support' - depends on ADK_KPACKAGE_KMOD_NF_CONNTRACK + depends on ADK_KERNEL_NF_CONNTRACK help Tracking FTP connections is problematic: special helpers are required for tracking them, and doing masquerading and other forms of Network Address Translation on them. -#config ADK_KPACKAGE_KMOD_NF_CONNTRACK_RTSP +#config ADK_KERNEL_NF_CONNTRACK_RTSP # tristate 'RTSP protocol support' -# depends on ADK_KPACKAGE_KMOD_NF_CONNTRACK +# depends on ADK_KERNEL_NF_CONNTRACK # help # Tracking RTSP connections might be required for IPTV. -config ADK_KPACKAGE_KMOD_NF_CONNTRACK_IRC +config ADK_KERNEL_NF_CONNTRACK_IRC tristate 'IRC protocol support' - depends on ADK_KPACKAGE_KMOD_NF_CONNTRACK + depends on ADK_KERNEL_NF_CONNTRACK help There is a commonly-used extension to IRC called Direct Client-to-Client Protocol (DCC). This enables users to send @@ -122,9 +122,9 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK_IRC chats. Note that you do NOT need this extension to get files or have others initiate chats, or everything else in IRC. -config ADK_KPACKAGE_KMOD_NF_CONNTRACK_NETBIOS_NS +config ADK_KERNEL_NF_CONNTRACK_NETBIOS_NS tristate 'NetBIOS name service protocol support (EXPERIMENTAL)' - depends on ADK_KPACKAGE_KMOD_NF_CONNTRACK + depends on ADK_KERNEL_NF_CONNTRACK help NetBIOS name service requests are sent as broadcast messages from an unprivileged port and responded to with unicast messages to the @@ -139,18 +139,18 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK_NETBIOS_NS 4: eth0: <BROADCAST,MULTICAST,UP> mtu 1500 qdisc pfifo_fast qlen 1000 inet 172.16.2.252/24 brd 172.16.2.255 scope global eth0 -config ADK_KPACKAGE_KMOD_NF_CONNTRACK_TFTP +config ADK_KERNEL_NF_CONNTRACK_TFTP tristate 'TFTP protocol support' - depends on ADK_KPACKAGE_KMOD_NF_CONNTRACK + depends on ADK_KERNEL_NF_CONNTRACK help TFTP connection tracking helper, this is required depending on how restrictive your ruleset is. If you are using a tftp client behind -j SNAT or -j MASQUERADING you will need this. -#config ADK_KPACKAGE_KMOD_NF_CONNTRACK_AMANDA +#config ADK_KERNEL_NF_CONNTRACK_AMANDA # tristate 'Amanda backup protocol support' -# depends on ADK_KPACKAGE_KMOD_NF_CONNTRACK +# depends on ADK_KERNEL_NF_CONNTRACK # #FIXME TEXTSEARCH && TEXTSEARCH_KMP # help # If you are running the Amanda backup package <http://www.amanda.org/> @@ -160,9 +160,9 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK_TFTP # Amanda requires for communication of the backup data, messages and # index. -config ADK_KPACKAGE_KMOD_NF_CONNTRACK_PPTP +config ADK_KERNEL_NF_CONNTRACK_PPTP tristate 'PPTP protocol support' - depends on ADK_KPACKAGE_KMOD_NF_CONNTRACK + depends on ADK_KERNEL_NF_CONNTRACK help This module adds support for PPTP (Point to Point Tunnelling Protocol, RFC2637) connection tracking and NAT. @@ -174,9 +174,9 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK_PPTP For more info, read top of the file net/ipv4/netfilter/ip_conntrack_pptp.c -config ADK_KPACKAGE_KMOD_NF_CONNTRACK_H323 +config ADK_KERNEL_NF_CONNTRACK_H323 tristate 'H.323 protocol support (EXPERIMENTAL)' - depends on ADK_KPACKAGE_KMOD_NF_CONNTRACK + depends on ADK_KERNEL_NF_CONNTRACK help H.323 is a VoIP signalling protocol from ITU-T. As one of the most important VoIP protocols, it is widely used by voice hardware and @@ -191,9 +191,9 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK_H323 whiteboard, file transfer, etc. For more information, please visit http://nath323.sourceforge.net/. -config ADK_KPACKAGE_KMOD_NF_CONNTRACK_SIP +config ADK_KERNEL_NF_CONNTRACK_SIP tristate 'SIP protocol support (EXPERIMENTAL)' - depends on ADK_KPACKAGE_KMOD_NF_CONNTRACK + depends on ADK_KERNEL_NF_CONNTRACK help SIP is an application-layer control protocol that can establish, modify, and terminate multimedia sessions (conferences) such as diff --git a/target/linux/config/Config.in.netfilter.ebt b/target/linux/config/Config.in.netfilter.ebt index 9dfb5e5b9..76eeb5e7b 100644 --- a/target/linux/config/Config.in.netfilter.ebt +++ b/target/linux/config/Config.in.netfilter.ebt @@ -1,14 +1,19 @@ -config ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES - tristate 'Ethernet Bridge tables (ebtables) support' +config ADK_KERNEL_BRIDGE_NF_EBTABLES + prompt 'Ethernet Bridge tables support' + tristate select ADK_KERNEL_BRIDGE_NETFILTER + default m if ADK_PACKAGE_EBTABLES + default n help ebtables is a general, extensible frame/packet identification framework. Say 'Y' or 'M' here if you want to do Ethernet filtering/NAT/brouting on the Ethernet bridge. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_BROUTE - tristate "ebt: broute table support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_BROUTE + prompt "broute table support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help The ebtables broute table is used to define rules that decide between bridging and routing frames, giving Linux the functionality of a @@ -17,9 +22,11 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_BROUTE To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_T_FILTER - tristate "ebt: filter table support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_T_FILTER + prompt "filter table support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help The ebtables filter table is used to define frame filtering rules at local input, forwarding and local output. See the man page for @@ -27,9 +34,11 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_T_FILTER To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_T_NAT - tristate "ebt: nat table support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_T_NAT + prompt "nat table support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help The ebtables nat table is used to define rules that alter the MAC source address (MAC SNAT) or the MAC destination address (MAC DNAT). @@ -39,17 +48,21 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_T_NAT # # matches # -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_802_3 - tristate "ebt: 802.3 filter support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_802_3 + prompt "802.3 filter support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds matching support for 802.3 Ethernet frames. To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_AMONG - tristate "ebt: among filter support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_AMONG + prompt "among filter support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the among match, which allows matching the MAC source and/or destination address on a list of addresses. Optionally, @@ -57,36 +70,44 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_AMONG To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_ARP - tristate "ebt: ARP filter support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_ARP + prompt "ARP filter support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the ARP match, which allows ARP and RARP header field filtering. To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_IP - tristate "ebt: IP filter support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_IP + prompt "IP filter support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the IP match, which allows basic IP header field filtering. To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_IP6 - tristate "ebt: IP6 filter support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES && ADK_KPACKAGE_KMOD_IPV6 +config ADK_KERNEL_BRIDGE_EBT_IP6 + prompt "IP6 filter support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES && ADK_KERNEL_IPV6 + default n help This option adds the IP6 match, which allows basic IPV6 header field filtering. To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_LIMIT - tristate "ebt: limit match support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_LIMIT + prompt "limit match support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the limit match, which allows you to control the rate at which a rule can be matched. This match is the @@ -95,9 +116,11 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_LIMIT If you want to compile it as a module, say M here and read <file:Documentation/kbuild/modules.txt>. If unsure, say `N'. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_MARK - tristate "ebt: mark filter support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_MARK + prompt "mark filter support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the mark match, which allows matching frames based on the 'nfmark' value in the frame. This can be set by the mark target. @@ -106,9 +129,11 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_MARK To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_PKTTYPE - tristate "ebt: packet type filter support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_PKTTYPE + prompt "packet type filter support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the packet type match, which allows matching on the type of packet based on its Ethernet "class" (as determined by @@ -117,18 +142,22 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_PKTTYPE To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_STP - tristate "ebt: STP filter support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_STP + prompt "STP filter support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the Spanning Tree Protocol match, which allows STP header field filtering. To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_VLAN - tristate "ebt: 802.1Q VLAN filter support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_VLAN + prompt "802.1Q VLAN filter support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the 802.1Q vlan match, which allows the filtering of 802.1Q vlan fields. @@ -137,27 +166,33 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_VLAN # # targets # -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_ARPREPLY - tristate "ebt: arp reply target support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_ARPREPLY + prompt "arp reply target support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the arp reply target, which allows automatically sending arp replies to arp requests. To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_DNAT - tristate "ebt: dnat target support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_DNAT + prompt "dnat target support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the MAC DNAT target, which allows altering the MAC destination address of frames. To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_MARK_T - tristate "ebt: mark target support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_MARK_T + prompt "mark target support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the mark target, which allows marking frames by setting the 'nfmark' value in the frame. @@ -166,18 +201,22 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_MARK_T To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_REDIRECT - tristate "ebt: redirect target support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_REDIRECT + prompt "redirect target support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the MAC redirect target, which allows altering the MAC destination address of a frame to that of the device it arrived on. To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_SNAT - tristate "ebt: snat target support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_SNAT + prompt "snat target support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the MAC SNAT target, which allows altering the MAC source address of frames. @@ -186,9 +225,11 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_SNAT # # watchers # -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_LOG - tristate "ebt: log support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_LOG + prompt "log support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option adds the log watcher, that you can use in any rule in any ebtables table. It records info about the frame header @@ -196,9 +237,11 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_LOG To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_ULOG - tristate "ebt: ulog support (OBSOLETE)" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_ULOG + prompt "ulog support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option enables the old bridge-specific "ebt_ulog" implementation which has been obsoleted by the new "nfnetlink_log" code (see @@ -213,9 +256,11 @@ config ADK_KPACKAGE_KMOD_BRIDGE_EBT_ULOG To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_BRIDGE_EBT_NFLOG - tristate "ebt: nflog support" - depends on ADK_KPACKAGE_KMOD_BRIDGE_NF_EBTABLES +config ADK_KERNEL_BRIDGE_EBT_NFLOG + prompt "nflog support" + tristate + depends on ADK_KERNEL_BRIDGE_NF_EBTABLES + default n help This option enables the nflog watcher, which allows to LOG messages through the netfilter logging API, which can use diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index f9361a8ea..3641f1120 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -1,14 +1,16 @@ -config ADK_KPACKAGE_KMOD_NF_CONNTRACK_IPV4 +config ADK_KERNEL_NF_CONNTRACK_IPV4 bool 'IPv4 connection tracking support (required for NAT)' - select ADK_KPACKAGE_KMOD_NF_CONNTRACK + select ADK_KERNEL_NF_CONNTRACK + default m if ADK_PACKAGE_IPTABLES + default n help Connection tracking keeps a record of what packets have passed through your machine, in order to figure out how they are related into connections. -config ADK_KPACKAGE_KMOD_IP_NF_CT_ACCT +config ADK_KERNEL_IP_NF_CT_ACCT bool 'Connection tracking flow accounting' - depends on ADK_KPACKAGE_KMOD_NF_CONNTRACK + depends on ADK_KERNEL_NF_CONNTRACK help If this option is enabled, the connection tracking code will keep per-flow packet and byte counters. @@ -17,59 +19,71 @@ config ADK_KPACKAGE_KMOD_IP_NF_CT_ACCT `connbytes' match. -config ADK_KPACKAGE_KMOD_IP_NF_IPTABLES +config ADK_KERNEL_IP_NF_IPTABLES tristate 'IP tables support (required for filtering/masq/NAT)' select ADK_KERNEL_NETFILTER_XTABLES + default m if ADK_PACKAGE_IPTABLES + default n help iptables is a general, extensible packet identification framework. The packet filtering and full NAT (masquerading, port forwarding, etc) subsystems now use this: say `Y' or `M' here if you want to use either of those. -config ADK_KPACKAGE_KMOD_IP_NF_FILTER +config ADK_KERNEL_IP_NF_FILTER tristate 'Packet Filtering' - depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES + depends on ADK_KERNEL_IP_NF_IPTABLES + default m if ADK_PACKAGE_IPTABLES + default n help Packet filtering defines a table `filter', which has a series of rules for simple packet filtering at local input, forwarding and local output. See the man page for iptables(8). -config ADK_KPACKAGE_KMOD_FULL_NAT +config ADK_KERNEL_FULL_NAT tristate "Meta package for Full NAT" - select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_87 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_37 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_18 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_11 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_14_3 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_15_RC5 - -config ADK_KPACKAGE_KMOD_NF_NAT + select ADK_KERNEL_NF_NAT if ADK_KERNEL_VERSION_3_4_87 + select ADK_KERNEL_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_37 + select ADK_KERNEL_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10 + select ADK_KERNEL_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_18 + select ADK_KERNEL_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_11 + select ADK_KERNEL_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_14_3 + select ADK_KERNEL_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_15_RC5 + default m if ADK_PACKAGE_IPTABLES + default n + +config ADK_KERNEL_NF_NAT tristate 'Full NAT' - depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES + depends on ADK_KERNEL_IP_NF_IPTABLES depends on ADK_KERNEL_VERSION_3_4_87 + default m if ADK_PACKAGE_IPTABLES + default n help The Full NAT option allows masquerading, port forwarding and other forms of full Network Address Port Translation. It is controlled by the `nat' table in iptables: see the man page for iptables(8). -config ADK_KPACKAGE_KMOD_NF_NAT_IPV4 +config ADK_KERNEL_NF_NAT_IPV4 tristate 'Full NAT' - depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES + depends on ADK_KERNEL_IP_NF_IPTABLES depends on ADK_KERNEL_VERSION_3_10_37 \ || ADK_KERNEL_VERSION_3_11_10 \ || ADK_KERNEL_VERSION_3_12_18 \ || ADK_KERNEL_VERSION_3_13_11 \ || ADK_KERNEL_VERSION_3_14_3 \ || ADK_KERNEL_VERSION_3_15_RC5 + default m if ADK_PACKAGE_IPTABLES + default n help The Full NAT option allows masquerading, port forwarding and other forms of full Network Address Port Translation. It is controlled by the `nat' table in iptables: see the man page for iptables(8). -config ADK_KPACKAGE_KMOD_IP_NF_TARGET_MASQUERADE +config ADK_KERNEL_IP_NF_TARGET_MASQUERADE tristate 'MASQUERADE target support' - depends on ADK_KPACKAGE_KMOD_FULL_NAT + depends on ADK_KERNEL_FULL_NAT + default m if ADK_PACKAGE_IPTABLES + default n help Masquerading is a special case of NAT: all outgoing connections are changed to seem to come from a particular interface's address, and @@ -77,17 +91,19 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_MASQUERADE only useful for dialup accounts with dynamic IP address (ie. your IP address will be different on next dialup). -config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REJECT +config ADK_KERNEL_IP_NF_TARGET_REJECT tristate 'REJECT target support' - depends on ADK_KPACKAGE_KMOD_IP_NF_FILTER + depends on ADK_KERNEL_IP_NF_FILTER + default m if ADK_PACKAGE_IPTABLES + default n help The REJECT target allows a filtering rule to specify that an ICMP error should be issued in response to an incoming packet, rather than silently being dropped. -config ADK_KPACKAGE_KMOD_IP_NF_TARGET_ULOG +config ADK_KERNEL_IP_NF_TARGET_ULOG tristate 'ULOG target support (ipv4 only)' - depends on ADK_KPACKAGE_KMOD_IP_NF_FILTER + depends on ADK_KERNEL_IP_NF_FILTER help This option enables the old IPv4-only "ipt_ULOG" implementation which has been obsoleted by the new "nfnetlink_log" code (see @@ -101,35 +117,35 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_ULOG The appropriate userspace logging daemon (ulogd) may be obtained from <http://www.gnumonks.org/projects/ulogd/> -config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REDIRECT +config ADK_KERNEL_IP_NF_TARGET_REDIRECT tristate 'REDIRECT target support' - depends on ADK_KPACKAGE_KMOD_FULL_NAT + depends on ADK_KERNEL_FULL_NAT help REDIRECT is a special case of NAT: all incoming connections are mapped onto the incoming interface's address, causing the packets to come to the local machine instead of passing through. This is useful for transparent proxies. -config ADK_KPACKAGE_KMOD_IP_NF_TARGET_NETMAP +config ADK_KERNEL_IP_NF_TARGET_NETMAP tristate 'NETMAP target support' - depends on ADK_KPACKAGE_KMOD_FULL_NAT + depends on ADK_KERNEL_FULL_NAT help NETMAP is an implementation of static 1:1 NAT mapping of network addresses. It maps the network address part, while keeping the host address part intact. It is similar to Fast NAT, except that Netfilter's connection tracking doesn't work well with Fast NAT. -config ADK_KPACKAGE_KMOD_IP_NF_MANGLE +config ADK_KERNEL_IP_NF_MANGLE tristate 'Packet mangling' - depends on ADK_KPACKAGE_KMOD_FULL_NAT + depends on ADK_KERNEL_FULL_NAT help This option adds a `mangle' table to iptables: see the man page for iptables(8). This table is used for various packet alterations which can effect how the packet is routed. -config ADK_KPACKAGE_KMOD_IP_NF_TARGET_ECN +config ADK_KERNEL_IP_NF_TARGET_ECN tristate 'ECN target support' - depends on ADK_KPACKAGE_KMOD_IP_NF_MANGLE + depends on ADK_KERNEL_IP_NF_MANGLE help This option adds a `ECN' target, which can be used in the iptables mangle table. diff --git a/target/linux/config/Config.in.netfilter.ip6 b/target/linux/config/Config.in.netfilter.ip6 index 2138354eb..33588a071 100644 --- a/target/linux/config/Config.in.netfilter.ip6 +++ b/target/linux/config/Config.in.netfilter.ip6 @@ -1,7 +1,7 @@ -config ADK_KPACKAGE_KMOD_NF_CONNTRACK_IPV6 +config ADK_KERNEL_NF_CONNTRACK_IPV6 tristate "IPv6 connection tracking support" - select ADK_KPACKAGE_KMOD_NF_CONNTRACK - select ADK_KPACKAGE_KMOD_IPV6 + select ADK_KERNEL_NF_CONNTRACK + select ADK_KERNEL_IPV6 ---help--- Connection tracking keeps a record of what packets have passed through your machine, in order to figure out how they are related @@ -13,10 +13,10 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK_IPV6 To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_IPTABLES +config ADK_KERNEL_IP6_NF_IPTABLES tristate "IP6 tables support (required for filtering)" select ADK_KERNEL_NETFILTER_XTABLES - select ADK_KPACKAGE_KMOD_IPV6 + select ADK_KERNEL_IPV6 help ip6tables is a general, extensible packet identification framework. Currently only the packet filtering and packet mangling subsystem @@ -25,17 +25,17 @@ config ADK_KPACKAGE_KMOD_IP6_NF_IPTABLES To compile it as a module, choose M here. If unsure, say N. -if ADK_KPACKAGE_KMOD_IP6_NF_IPTABLES +if ADK_KERNEL_IP6_NF_IPTABLES # The simple matches. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_AH +config ADK_KERNEL_IP6_NF_MATCH_AH tristate '"ah" match support' help This module allows one to match AH packets. To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_EUI64 +config ADK_KERNEL_IP6_NF_MATCH_EUI64 tristate '"eui64" address check' help This module performs checking on the IPv6 source address @@ -44,7 +44,7 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_EUI64 To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_FRAG +config ADK_KERNEL_IP6_NF_MATCH_FRAG tristate '"frag" Fragmentation header match support' help frag matching allows you to match packets based on the fragmentation @@ -52,7 +52,7 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_FRAG To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_OPTS +config ADK_KERNEL_IP6_NF_MATCH_OPTS tristate '"hbh" hop-by-hop and "dst" opts header match support' help This allows one to match packets based on the hop-by-hop @@ -60,7 +60,7 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_OPTS To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_IPV6HEADER +config ADK_KERNEL_IP6_NF_MATCH_IPV6HEADER tristate '"ipv6header" IPv6 Extension Headers Match' help This module allows one to match packets based upon @@ -68,14 +68,14 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_IPV6HEADER To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_MH +config ADK_KERNEL_IP6_NF_MATCH_MH tristate '"mh" match support' help This module allows one to match MH packets. To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_RT +config ADK_KERNEL_IP6_NF_MATCH_RT tristate '"rt" Routing header match support' help rt matching allows you to match packets based on the routing @@ -85,7 +85,7 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_RT # The targets -config ADK_KPACKAGE_KMOD_IP6_NF_FILTER +config ADK_KERNEL_IP6_NF_FILTER tristate "Packet filtering" help Packet filtering defines a table `filter', which has a series of @@ -94,9 +94,9 @@ config ADK_KPACKAGE_KMOD_IP6_NF_FILTER To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_TARGET_REJECT +config ADK_KERNEL_IP6_NF_TARGET_REJECT tristate "REJECT target support" - depends on ADK_KPACKAGE_KMOD_IP6_NF_FILTER + depends on ADK_KERNEL_IP6_NF_FILTER help The REJECT target allows a filtering rule to specify that an ICMPv6 error should be issued in response to an incoming packet, rather @@ -104,7 +104,7 @@ config ADK_KPACKAGE_KMOD_IP6_NF_TARGET_REJECT To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MANGLE +config ADK_KERNEL_IP6_NF_MANGLE tristate "Packet mangling" help This option adds a `mangle' table to iptables: see the man page for @@ -113,7 +113,7 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MANGLE To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_RAW +config ADK_KERNEL_IP6_NF_RAW tristate 'raw table support (required for TRACE)' help This option adds a `raw' table to ip6tables. This table is the very @@ -123,4 +123,4 @@ config ADK_KPACKAGE_KMOD_IP6_NF_RAW If you want to compile it as a module, say M here and read <file:Documentation/kbuild/modules.txt>. If unsure, say `N'. -endif # ADK_KPACKAGE_KMOD_IP6_NF_IPTABLES +endif # ADK_KERNEL_IP6_NF_IPTABLES diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index dc2dd8ef7..7b40a1b6e 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -50,7 +50,7 @@ config ADK_KERNEL_IP_MROUTE boolean default n -config ADK_KPACKAGE_KMOD_ATM +config ADK_KERNEL_ATM prompt "Asynchronous Transfer Mode (ATM)" tristate default n @@ -68,17 +68,18 @@ config ADK_KPACKAGE_KMOD_ATM of ATM. See the file <file:Documentation/networking/atm.txt> for further details. -config ADK_KPACKAGE_KMOD_ATM_BR2684 +config ADK_KERNEL_ATM_BR2684 prompt "BR2684 ATM module" tristate - select ADK_KPACKAGE_KMOD_ATM + select ADK_KERNEL_ATM default n help -config ADK_KPACKAGE_KMOD_BRIDGE +config ADK_KERNEL_BRIDGE prompt "802.1d Ethernet Bridging" tristate select ADK_KERNEL_LLC + default m if ADK_PACKAGE_BRIDGE_UTILS default n help If you say Y here, then your Linux box will be able to act as an @@ -101,7 +102,7 @@ config ADK_KPACKAGE_KMOD_BRIDGE Enabling arptables support when bridging will let arptables see bridged ARP traffic in the arptables FORWARD chain. -config ADK_KPACKAGE_KMOD_VLAN_8021Q +config ADK_KERNEL_VLAN_8021Q prompt "802.1q VLAN support" tristate default n @@ -114,15 +115,15 @@ config ADK_KPACKAGE_KMOD_VLAN_8021Q use VLANs. See the VLAN web page for more information: <http://www.candelatech.com/~greear/vlan.html> -config ADK_KPACKAGE_KMOD_INET_TUNNEL +config ADK_KERNEL_INET_TUNNEL tristate default n help -config ADK_KPACKAGE_KMOD_NET_IPIP +config ADK_KERNEL_NET_IPIP prompt "IP in IP encapsulation support" tristate - select ADK_KPACKAGE_KMOD_INET_TUNNEL + select ADK_KERNEL_INET_TUNNEL default n help Tunneling means encapsulating data of one protocol type within @@ -134,11 +135,13 @@ config ADK_KPACKAGE_KMOD_NET_IPIP mobile-IP facilities (allowing laptops to seamlessly move between networks without changing their IP addresses). -config ADK_KPACKAGE_KMOD_NET_IPGRE +config ADK_KERNEL_NET_IPGRE prompt "GRE tunnels over IP" tristate select ADK_KERNEL_NET_IPGRE_BROADCAST select ADK_KERNEL_NET_IPGRE_DEMUX + default m if ADK_PACKAGE_PPTP + default m if ADK_PACKAGE_PPTPD default n help Tunneling means encapsulating data of one protocol type within @@ -151,10 +154,10 @@ config ADK_KPACKAGE_KMOD_NET_IPGRE tunneling" above). In addition, GRE allows multicast redistribution through the tunnel. -config ADK_KPACKAGE_KMOD_IPV6 +config ADK_KERNEL_IPV6 prompt "IPv6 support" tristate - default m if !ADK_LINUX_M68K + default m help This is complemental support for the IP version 6. You will still be able to do traditional IPv4 networking as well. @@ -165,10 +168,10 @@ config ADK_KPACKAGE_KMOD_IPV6 For specific information about IPv6 under Linux, read the HOWTO at <http://www.bieringer.de/linux/IPv6/>. -config ADK_KPACKAGE_KMOD_IPV6_SIT +config ADK_KERNEL_IPV6_SIT prompt "IPv6-in-IPv4 tunnel (SIT driver)" tristate - select ADK_KPACKAGE_KMOD_INET_TUNNEL + select ADK_KERNEL_INET_TUNNEL default n help Tunneling means encapsulating data of one protocol type within @@ -177,12 +180,15 @@ config ADK_KPACKAGE_KMOD_IPV6_SIT into IPv4 packets. This is useful if you want to connect two IPv6 networks over an IPv4-only path. -config ADK_KPACKAGE_KMOD_PPP +config ADK_KERNEL_PPP prompt "PPP support" tristate select ADK_KERNEL_PPP_ASYNC select ADK_KERNEL_SLHC - select ADK_KPACKAGE_KMOD_CRC_CCITT + select ADK_KERNEL_CRC_CCITT + default m if ADK_PACKAGE_PPTP + default m if ADK_PACKAGE_PPTPD + default m if ADK_PACKAGE_PPP default n help PPP (Point to Point Protocol) is a newer and better SLIP. It serves @@ -206,14 +212,15 @@ config ADK_KPACKAGE_KMOD_PPP synchronous lines, you should say Y (or M) here and to "Support synchronous PPP", below. -config ADK_KPACKAGE_KMOD_PPP_MPPE +config ADK_KERNEL_PPP_MPPE prompt "PPP MPPE/MPPC module" tristate - depends on ADK_KPACKAGE_KMOD_PPP + depends on ADK_KERNEL_PPP select ADK_KERNEL_CRYPTO - select ADK_KPACKAGE_KMOD_CRYPTO_ARC4 - select ADK_KPACKAGE_KMOD_CRYPTO_SHA1 - select ADK_KPACKAGE_KMOD_CRYPTO_ECB + select ADK_KERNEL_CRYPTO_ARC4 + select ADK_KERNEL_CRYPTO_SHA1 + select ADK_KERNEL_CRYPTO_ECB + default m if ADK_PACKAGE_PPTPD default n help Support for the MPPE Encryption protocol, as employed by the @@ -222,31 +229,38 @@ config ADK_KPACKAGE_KMOD_PPP_MPPE See http://pptpclient.sourceforge.net/ for information on configuring PPTP clients and servers to utilize this method. -config ADK_KPACKAGE_KMOD_PPPOATM +config ADK_KERNEL_PPPOATM prompt "PPPoA (PPP over ATM) kernel support" tristate - depends on ADK_KPACKAGE_KMOD_PPP - select ADK_KPACKAGE_KMOD_ATM + depends on ADK_KERNEL_PPP + select ADK_KERNEL_ATM default n help Support for PPP over ATM -config ADK_KPACKAGE_KMOD_PPPOE +config ADK_KERNEL_PPPOE prompt "PPPoE (PPP over Ethernet) kernel support" tristate - depends on ADK_KPACKAGE_KMOD_PPP + depends on ADK_KERNEL_PPP + default m if ADK_PACKAGE_PPP_MOD_PPPOE default n help Support for PPP over Ethernet -config ADK_KPACKAGE_KMOD_TUN +config ADK_KERNEL_TUN prompt "Universal TUN/TAP driver" tristate + default m if ADK_PACKAGE_CHILLISPOT + default m if ADK_PACKAGE_AICCU + default m if ADK_PACKAGE_TINC + default m if ADK_PACKAGE_VTUN + default m if ADK_PACKAGE_VPNC + default m if ADK_PACKAGE_OPENVPN default n help Kernel support for the TUN/TAP tunneling device -config ADK_KPACKAGE_KMOD_BONDING +config ADK_KERNEL_BONDING prompt "Bonding driver support" tristate select BUSYBOX_IFENSLAVE diff --git a/target/linux/config/Config.in.nls b/target/linux/config/Config.in.nls index 13be16ae7..49696fee7 100644 --- a/target/linux/config/Config.in.nls +++ b/target/linux/config/Config.in.nls @@ -4,7 +4,7 @@ config ADK_KERNEL_NLS_DEFAULT string default "utf-8" -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_437 +config ADK_KERNEL_NLS_CODEPAGE_437 prompt "Codepage 437 (United States, Canada)" tristate default n @@ -18,7 +18,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_437 say Y here if you want to include the DOS codepage that is used in the United States and parts of Canada. This is recommended. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_737 +config ADK_KERNEL_NLS_CODEPAGE_737 prompt "Codepage 737 (Greek)" tristate default n @@ -32,7 +32,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_737 say Y here if you want to include the DOS codepage that is used for Greek. If unsure, say N. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_775 +config ADK_KERNEL_NLS_CODEPAGE_775 prompt "Codepage 775 (Baltic Rim)" tristate default n @@ -47,7 +47,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_775 for the Baltic Rim Languages (Latvian and Lithuanian). If unsure, say N. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850 +config ADK_KERNEL_NLS_CODEPAGE_850 prompt "Codepage 850 (Western European Languages)" tristate default n @@ -63,7 +63,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850 more countries here]. It has some characters useful to many European languages that are not part of the US codepage 437. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_852 +config ADK_KERNEL_NLS_CODEPAGE_852 prompt "Codepage 852 (Eastern European Languages)" tristate default n @@ -80,7 +80,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_852 Finnish, Hungarian, Irish, German, Polish, Romanian, Serbian (Latin transcription), Slovak, Slovenian, and Sorbian. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_855 +config ADK_KERNEL_NLS_CODEPAGE_855 prompt "Codepage 855 (Cyrillic)" tristate default n @@ -93,7 +93,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_855 only, not to the file contents. You can include several codepages; say Y here if you want to include the DOS codepage for Cyrillic. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_857 +config ADK_KERNEL_NLS_CODEPAGE_857 prompt "Codepage 857 (Turkish)" tristate default n @@ -106,7 +106,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_857 only, not to the file contents. You can include several codepages; say Y here if you want to include the DOS codepage for Turkish. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_860 +config ADK_KERNEL_NLS_CODEPAGE_860 prompt "Codepage 860 (Portuguese)" tristate default n @@ -119,7 +119,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_860 only, not to the file contents. You can include several codepages; say Y here if you want to include the DOS codepage for Portuguese. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_861 +config ADK_KERNEL_NLS_CODEPAGE_861 prompt "Codepage 861 (Icelandic)" tristate default n @@ -132,7 +132,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_861 only, not to the file contents. You can include several codepages; say Y here if you want to include the DOS codepage for Icelandic. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_862 +config ADK_KERNEL_NLS_CODEPAGE_862 prompt "Codepage 862 (Hebrew)" tristate default n @@ -145,7 +145,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_862 only, not to the file contents. You can include several codepages; say Y here if you want to include the DOS codepage for Hebrew. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_863 +config ADK_KERNEL_NLS_CODEPAGE_863 prompt "Codepage 863 (French Canadian)" tristate default n @@ -159,7 +159,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_863 say Y here if you want to include the DOS codepage for Canadian French. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_864 +config ADK_KERNEL_NLS_CODEPAGE_864 prompt "Codepage 864 (Arabic)" tristate default n @@ -172,7 +172,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_864 only, not to the file contents. You can include several codepages; say Y here if you want to include the DOS codepage for Arabic. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_865 +config ADK_KERNEL_NLS_CODEPAGE_865 prompt "Codepage 865 (Norwegian, Danish)" tristate default n @@ -186,7 +186,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_865 say Y here if you want to include the DOS codepage for the Nordic European countries. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_866 +config ADK_KERNEL_NLS_CODEPAGE_866 prompt "Codepage 866 (Cyrillic/Russian)" tristate default n @@ -200,7 +200,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_866 say Y here if you want to include the DOS codepage for Cyrillic/Russian. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_869 +config ADK_KERNEL_NLS_CODEPAGE_869 prompt "Codepage 869 (Greek)" tristate default n @@ -213,7 +213,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_869 only, not to the file contents. You can include several codepages; say Y here if you want to include the DOS codepage for Greek. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_874 +config ADK_KERNEL_NLS_CODEPAGE_874 prompt "Codepage 874 (Thai)" tristate default n @@ -226,7 +226,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_874 only, not to the file contents. You can include several codepages; say Y here if you want to include the DOS codepage for Thai. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_932 +config ADK_KERNEL_NLS_CODEPAGE_932 prompt "Codepage 932 (Japanese)" tristate default n @@ -241,7 +241,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_932 or EUC-JP. To use EUC-JP, you can use 'euc-jp' as mount option or NLS Default value during kernel configuration, instead of 'cp932'. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_936 +config ADK_KERNEL_NLS_CODEPAGE_936 prompt "Codepage 936 (Simplified Chinese)" tristate default n @@ -255,7 +255,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_936 say Y here if you want to include the DOS codepage for Simplified Chinese(GBK). -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_949 +config ADK_KERNEL_NLS_CODEPAGE_949 prompt "Codepage 949 (Korean)" tristate default n @@ -268,7 +268,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_949 only, not to the file contents. You can include several codepages; say Y here if you want to include the DOS codepage for UHC. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_950 +config ADK_KERNEL_NLS_CODEPAGE_950 prompt "Codepage 950 (Traditional Chinese)" tristate default n @@ -282,7 +282,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_950 say Y here if you want to include the DOS codepage for Traditional Chinese(Big5). -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1250 +config ADK_KERNEL_NLS_CODEPAGE_1250 prompt "Codepage 1250 (Slavic/Central European)" tristate default n @@ -295,7 +295,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1250 European languages: Czech, German, Hungarian, Polish, Rumanian, Croatian, Slovak, Slovene. -config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1251 +config ADK_KERNEL_NLS_CODEPAGE_1251 prompt "Codepage 1251 (Bulgarian, Belarusian)" tristate default n @@ -309,7 +309,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1251 say Y here if you want to include the DOS codepage for Russian and Bulgarian and Belarusian. -config ADK_KPACKAGE_KMOD_NLS_ASCII +config ADK_KERNEL_NLS_ASCII prompt "ASCII (United States)" tristate default n @@ -318,10 +318,10 @@ config ADK_KPACKAGE_KMOD_NLS_ASCII DEFAULT NLS with this very basic charset and don't want any non-ASCII characters to be translated. -config ADK_KPACKAGE_KMOD_NLS_ISO8859_1 +config ADK_KERNEL_NLS_ISO8859_1 prompt "NLS ISO 8859-1 (Latin-1; Western European Languages)" tristate - default y + default m help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -332,7 +332,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_1 Galician, Irish, Icelandic, Italian, Norwegian, Portuguese, Spanish, and Swedish. It is also the default for the US. If unsure, say Y. -config ADK_KPACKAGE_KMOD_NLS_ISO8859_2 +config ADK_KERNEL_NLS_ISO8859_2 prompt "NLS ISO 8859-2 (Latin-2; Central European Languages)" tristate default n @@ -345,7 +345,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_2 languages: Czech, German, Hungarian, Polish, Rumanian, Croatian, Slovak, Slovene. -config ADK_KPACKAGE_KMOD_NLS_ISO8859_3 +config ADK_KERNEL_NLS_ISO8859_3 prompt "NLS ISO 8859-3 (Latin-3; Esperanto, Galician, Maltese, Turkish)" tristate default n @@ -357,7 +357,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_3 set, which is popular with authors of Esperanto, Galician, Maltese, and Turkish. -config ADK_KPACKAGE_KMOD_NLS_ISO8859_4 +config ADK_KERNEL_NLS_ISO8859_4 prompt "NLS ISO 8859-4 (Latin-4; old Baltic charset)" tristate default n @@ -369,7 +369,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_4 set which introduces letters for Estonian, Latvian, and Lithuanian. It is an incomplete predecessor of Latin 7. -config ADK_KPACKAGE_KMOD_NLS_ISO8859_5 +config ADK_KERNEL_NLS_ISO8859_5 prompt "NLS ISO 8859-5 (Cyrillic)" tristate default n @@ -382,7 +382,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_5 Macedonian, Russian, Serbian, and Ukrainian. Note that the charset KOI8-R is preferred in Russia. -config ADK_KPACKAGE_KMOD_NLS_ISO8859_6 +config ADK_KERNEL_NLS_ISO8859_6 prompt "NLS ISO 8859-6 (Arabic)" tristate default n @@ -393,7 +393,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_6 input/output character sets. Say Y here for ISO8859-6, the Arabic character set. -config ADK_KPACKAGE_KMOD_NLS_ISO8859_7 +config ADK_KERNEL_NLS_ISO8859_7 prompt "NLS ISO 8859-7 (Greek)" tristate default n @@ -404,7 +404,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_7 input/output character sets. Say Y here for ISO8859-7, the Modern Greek character set. -config ADK_KPACKAGE_KMOD_NLS_ISO8859_8 +config ADK_KERNEL_NLS_ISO8859_8 prompt "NLS ISO 8859-8 (Hebrew)" tristate default n @@ -415,7 +415,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_8 input/output character sets. Say Y here for ISO8859-8, the Hebrew character set. -config ADK_KPACKAGE_KMOD_NLS_ISO8859_9 +config ADK_KERNEL_NLS_ISO8859_9 prompt "NLS ISO 8859-9 (Latin-5; Turkish)" tristate default n @@ -427,7 +427,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_9 set, and it replaces the rarely needed Icelandic letters in Latin 1 with the Turkish ones. Useful in Turkey. -config ADK_KPACKAGE_KMOD_NLS_ISO8859_13 +config ADK_KERNEL_NLS_ISO8859_13 prompt "NLS ISO 8859-13 (Latin-7; Baltic Rim)" tristate default n @@ -439,7 +439,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_13 set, which supports modern Baltic languages including Latvian and Lithuanian. -config ADK_KPACKAGE_KMOD_NLS_ISO8859_14 +config ADK_KERNEL_NLS_ISO8859_14 prompt "NLS ISO 8859-14 (Latin-8; Celtic)" tristate default n @@ -452,7 +452,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_14 (and Manx Gaelic) that were missing in Latin 1. <http://linux.speech.cymru.org/> has further information. -config ADK_KPACKAGE_KMOD_NLS_ISO8859_15 +config ADK_KERNEL_NLS_ISO8859_15 prompt "NLS ISO 8859-15 (Latin-9; Western European Languages with Euro)" tristate default n @@ -470,7 +470,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_15 support for French and Finnish, and adds the new Euro character. If unsure, say Y. -config ADK_KPACKAGE_KMOD_NLS_KOI8_R +config ADK_KERNEL_NLS_KOI8_R prompt "NLS KOI8-R (Cryllic for Russian and Bulgarian)" tristate default n @@ -481,7 +481,7 @@ config ADK_KPACKAGE_KMOD_NLS_KOI8_R input/output character sets. Say Y here for the preferred Russian character set. -config ADK_KPACKAGE_KMOD_NLS_KOI8_U +config ADK_KERNEL_NLS_KOI8_U prompt "NLS KOI8-U (Cyrillic for Russian, Bulgarian and Ukrainian)" tristate default n @@ -492,10 +492,10 @@ config ADK_KPACKAGE_KMOD_NLS_KOI8_U input/output character sets. Say Y here for the preferred Ukrainian (koi8-u) and Belarusian (koi8-ru) character sets. -config ADK_KPACKAGE_KMOD_NLS_UTF8 +config ADK_KERNEL_NLS_UTF8 prompt "NLS UTF8" tristate - default y + default m help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs diff --git a/target/linux/config/Config.in.pcmcia b/target/linux/config/Config.in.pcmcia index 04e050631..f5e1f13e5 100644 --- a/target/linux/config/Config.in.pcmcia +++ b/target/linux/config/Config.in.pcmcia @@ -1,18 +1,6 @@ menu "PCMCIA/CardBus support" depends on ADK_TARGET_WITH_CARDBUS || ADK_TARGET_WITH_PCMCIA -config ADK_KERNEL_PCCARD - boolean - default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default n - -config ADK_KERNEL_PCMCIA - boolean - select ADK_KERNEL_CRC32 - select ADK_KERNEL_PCMCIA_PROBE - default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default n - config ADK_KERNEL_PCMCIA_PXA2XX boolean default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS @@ -31,35 +19,33 @@ config ADK_KERNEL_SERIAL_8250_SHARE_IRQ boolean select ADK_KERNEL_SERIAL_8250_EXTENDED -config ADK_KPACKAGE_KMOD_PCCARD +config ADK_KERNEL_PCCARD prompt "PCCARD support" tristate - depends on !ADK_KERNEL_PCCARD default n -config ADK_KPACKAGE_KMOD_PCMCIA +config ADK_KERNEL_PCMCIA prompt "16-bit PCMCIA support" tristate - depends on ADK_KPACKAGE_KMOD_PCCARD - depends on !ADK_KERNEL_PCMCIA - select ADK_KPACKAGE_KMOD_FW_LOADER + depends on ADK_KERNEL_PCCARD + select ADK_KERNEL_FW_LOADER select ADK_KERNEL_CRC32 select ADK_KERNEL_PCMCIA_PROBE default n -config ADK_KPACKAGE_KMOD_YENTA +config ADK_KERNEL_YENTA prompt "32-bit CardBus support" tristate - depends on ADK_KPACKAGE_KMOD_PCCARD + depends on ADK_KERNEL_PCCARD depends on ADK_TARGET_WITH_CARDBUS select ADK_KERNEL_CARDBUS default n -config ADK_KPACKAGE_KMOD_SERIAL_8250_CS +config ADK_KERNEL_SERIAL_8250_CS prompt "PCMCIA/CardBus serial device support" tristate default n select ADK_KERNEL_SERIAL_8250_SHARE_IRQ - depends on ADK_KPACKAGE_KMOD_PCMCIA + depends on ADK_KERNEL_PCMCIA endmenu diff --git a/target/linux/config/Config.in.sched b/target/linux/config/Config.in.sched index 0a36b5e2b..7253d559e 100644 --- a/target/linux/config/Config.in.sched +++ b/target/linux/config/Config.in.sched @@ -48,7 +48,7 @@ config ADK_KERNEL_NET_SCHED comment "Queueing/Scheduling" -config ADK_KPACKAGE_KMOD_NET_SCH_CBQ +config ADK_KERNEL_NET_SCH_CBQ prompt "Class Based Queueing (CBQ)" tristate select ADK_KERNEL_NET_SCHED @@ -65,7 +65,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_CBQ say Y here. Then say Y to all the queueing algorithms below that you want to use as leaf disciplines. -config ADK_KPACKAGE_KMOD_NET_SCH_HTB +config ADK_KERNEL_NET_SCH_HTB prompt "Hierarchical Token Bucket (HTB)" tristate select ADK_KERNEL_NET_SCHED @@ -79,7 +79,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_HTB HTB is very similar to CBQ regarding its goals however is has different properties and different algorithm. -config ADK_KPACKAGE_KMOD_NET_SCH_HFSC +config ADK_KERNEL_NET_SCH_HFSC prompt "Hierarchical Fair Service Curve (HFSC)" tristate select ADK_KERNEL_NET_SCHED @@ -88,10 +88,10 @@ config ADK_KPACKAGE_KMOD_NET_SCH_HFSC Say Y here if you want to use the Hierarchical Fair Service Curve (HFSC) packet scheduling algorithm. -config ADK_KPACKAGE_KMOD_NET_SCH_ATM +config ADK_KERNEL_NET_SCH_ATM prompt "ATM Virtual Circuits (ATM)" tristate - depends on ADK_KPACKAGE_KMOD_ATM + depends on ADK_KERNEL_ATM select ADK_KERNEL_NET_SCHED default n help @@ -102,7 +102,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_ATM See the top of <file:net/sched/sch_atm.c>) for more details. -config ADK_KPACKAGE_KMOD_NET_SCH_PRIO +config ADK_KERNEL_NET_SCH_PRIO prompt "Multi Band Priority Queueing (PRIO)" tristate select ADK_KERNEL_NET_SCHED @@ -111,7 +111,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_PRIO Say Y here if you want to use an n-band priority queue packet scheduler. -config ADK_KPACKAGE_KMOD_NET_SCH_RED +config ADK_KERNEL_NET_SCH_RED prompt "Random Early Detection (RED)" tristate select ADK_KERNEL_NET_SCHED @@ -122,7 +122,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_RED See the top of <file:net/sched/sch_red.c> for more details. -config ADK_KPACKAGE_KMOD_NET_SCH_SFQ +config ADK_KERNEL_NET_SCH_SFQ prompt "Stochastic Fairness Queueing (SFQ)" tristate select ADK_KERNEL_NET_SCHED @@ -133,7 +133,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_SFQ See the top of <file:net/sched/sch_sfq.c> for more details. -config ADK_KPACKAGE_KMOD_NET_SCH_TBF +config ADK_KERNEL_NET_SCH_TBF prompt "Token Bucket Filter (TBF)" tristate select ADK_KERNEL_NET_SCHED @@ -144,7 +144,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_TBF See the top of <file:net/sched/sch_tbf.c> for more details. -config ADK_KPACKAGE_KMOD_NET_SCH_GRED +config ADK_KERNEL_NET_SCH_GRED prompt "Generic Random Early Detection (GRED)" tristate select ADK_KERNEL_NET_SCHED @@ -155,7 +155,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_GRED (see the top of <file:net/sched/sch_red.c> for details and references about the algorithm). -config ADK_KPACKAGE_KMOD_NET_SCH_DSMARK +config ADK_KERNEL_NET_SCH_DSMARK prompt "Differentiated Services marker (DSMARK)" tristate select ADK_KERNEL_NET_SCHED @@ -166,7 +166,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_DSMARK Technical information on this method, with pointers to associated RFCs, is available at <http://www.gta.ufrj.br/diffserv/>. -config ADK_KPACKAGE_KMOD_NET_SCH_INGRESS +config ADK_KERNEL_NET_SCH_INGRESS prompt "Ingress Qdisc" tristate select ADK_KERNEL_NET_SCHED @@ -184,7 +184,7 @@ config ADK_KERNEL_NET_CLS select ADK_KERNEL_NET_SCHED default n -config ADK_KPACKAGE_KMOD_NET_CLS_BASIC +config ADK_KERNEL_NET_CLS_BASIC prompt "Elementary classification (BASIC)" tristate select ADK_KERNEL_NET_CLS @@ -193,7 +193,7 @@ config ADK_KPACKAGE_KMOD_NET_CLS_BASIC Say Y here if you want to be able to classify packets using only extended matches and actions. -config ADK_KPACKAGE_KMOD_NET_CLS_TCINDEX +config ADK_KERNEL_NET_CLS_TCINDEX prompt "Traffic-Control Index (TCINDEX)" tristate select ADK_KERNEL_NET_CLS @@ -203,7 +203,7 @@ config ADK_KPACKAGE_KMOD_NET_CLS_TCINDEX traffic control indices. You will want this feature if you want to implement Differentiated Services together with DSMARK. -config ADK_KPACKAGE_KMOD_NET_CLS_ROUTE4 +config ADK_KERNEL_NET_CLS_ROUTE4 prompt "Routing decision (ROUTE)" tristate select ADK_KERNEL_NET_CLS @@ -212,7 +212,7 @@ config ADK_KPACKAGE_KMOD_NET_CLS_ROUTE4 If you say Y here, you will be able to classify packets according to the route table entry they matched. -config ADK_KPACKAGE_KMOD_NET_CLS_FW +config ADK_KERNEL_NET_CLS_FW prompt "Netfilter mark (FW)" tristate select ADK_KERNEL_NET_CLS @@ -221,7 +221,7 @@ config ADK_KPACKAGE_KMOD_NET_CLS_FW If you say Y here, you will be able to classify packets according to netfilter/firewall marks. -config ADK_KPACKAGE_KMOD_NET_CLS_U32 +config ADK_KERNEL_NET_CLS_U32 prompt "Universal 32bit comparisons w/ hashing (U32)" tristate select ADK_KERNEL_NET_CLS @@ -230,22 +230,22 @@ config ADK_KPACKAGE_KMOD_NET_CLS_U32 Say Y here to be able to classify packets using a universal 32bit pieces based comparison scheme. -config ADK_KPACKAGE_KMOD_NET_CLS_U32_PERF +config ADK_KERNEL_NET_CLS_U32_PERF prompt "Performance counters support" bool select ADK_KERNEL_NET_CLS - depends on ADK_KPACKAGE_KMOD_NET_CLS_U32 + depends on ADK_KERNEL_NET_CLS_U32 default n help Say Y here to make u32 gather additional statistics useful for fine tuning u32 classifiers. -config ADK_KPACKAGE_KMOD_NET_CLS_U32_MARK +config ADK_KERNEL_NET_CLS_U32_MARK prompt "Netfilter marks support" bool select ADK_KERNEL_NET_CLS - depends on ADK_KPACKAGE_KMOD_NET_CLS_U32 - depends on ADK_KPACKAGE_KMOD_NET_CLS_FW + depends on ADK_KERNEL_NET_CLS_U32 + depends on ADK_KERNEL_NET_CLS_FW default n help Say Y here to be able to use netfilter marks as u32 key. @@ -258,7 +258,7 @@ config ADK_KERNEL_NET_CLS_ACT select ADK_KERNEL_NET_ESTIMATOR default n -config ADK_KPACKAGE_KMOD_NET_ACT_POLICE +config ADK_KERNEL_NET_ACT_POLICE prompt "Traffic Policing" tristate select ADK_KERNEL_NET_CLS_ACT @@ -268,7 +268,7 @@ config ADK_KPACKAGE_KMOD_NET_ACT_POLICE bandwidth limiting. This action replaces the existing policing module. -config ADK_KPACKAGE_KMOD_NET_ACT_GACT +config ADK_KERNEL_NET_ACT_GACT prompt "Generic actions" tristate select ADK_KERNEL_NET_CLS_ACT @@ -277,7 +277,7 @@ config ADK_KPACKAGE_KMOD_NET_ACT_GACT Say Y here to take generic actions such as dropping and accepting packets. -config ADK_KPACKAGE_KMOD_NET_ACT_MIRRED +config ADK_KERNEL_NET_ACT_MIRRED prompt "Redirecting and Mirroring" tristate select ADK_KERNEL_NET_CLS_ACT @@ -286,17 +286,17 @@ config ADK_KPACKAGE_KMOD_NET_ACT_MIRRED Say Y here to allow packets to be mirrored or redirected to other devices. -config ADK_KPACKAGE_KMOD_NET_ACT_IPT +config ADK_KERNEL_NET_ACT_IPT prompt "IPtables targets" tristate select ADK_KERNEL_NET_CLS_ACT - select ADK_KPACKAGE_KMOD_IP_NF_IPTABLES + select ADK_KERNEL_IP_NF_IPTABLES default n help Say Y here to be able to invoke iptables targets after successful classification. -config ADK_KPACKAGE_KMOD_NET_ACT_PEDIT +config ADK_KERNEL_NET_ACT_PEDIT prompt "Packet Editing" tristate select ADK_KERNEL_NET_CLS_ACT diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi index 1b66bbcf8..31a29f0f9 100644 --- a/target/linux/config/Config.in.spi +++ b/target/linux/config/Config.in.spi @@ -1,3 +1,6 @@ +menu "SPI driver support" +depends on ADK_TARGET_WITH_SPI + config ADK_KERNEL_SPI boolean @@ -5,30 +8,21 @@ config ADK_KERNEL_SPI_MASTER boolean config ADK_KERNEL_SPI_BITBANG - boolean - -menu "SPI driver support" -depends on ADK_TARGET_WITH_SPI - -config ADK_KPACKAGE_KMOD_SPI_BITBANG - tristate - -config ADK_KPACKAGE_KMOD_SPI_XILINX tristate -config ADK_KPACKAGE_KMOD_SPI_AR71XX +config ADK_KERNEL_SPI_AR71XX tristate select ADK_KERNEL_SPI -config ADK_KPACKAGE_KMOD_SPI_RB4XX +config ADK_KERNEL_SPI_RB4XX tristate select ADK_KERNEL_SPI -config ADK_KPACKAGE_KMOD_SPI_RB4XX_CPLD +config ADK_KERNEL_SPI_RB4XX_CPLD tristate select ADK_KERNEL_SPI -config ADK_KPACKAGE_KMOD_SPI_PXA2XX +config ADK_KERNEL_SPI_PXA2XX tristate select ADK_KERNEL_SPI diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 582faff3b..be734be7e 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -4,11 +4,6 @@ depends on ADK_TARGET_WITH_USB || ADK_HARDWARE_QEMU config ADK_KERNEL_USB_SUPPORT boolean -config ADK_KERNEL_USB - boolean - select ADK_KERNEL_USB_SUPPORT - default n - config ADK_KERNEL_USB_EHCI_ROOT_HUB_TT boolean @@ -18,16 +13,6 @@ config ADK_KERNEL_USB_EHCI_TT_NEWSCHED config ADK_KERNEL_USB_MXS_PHY boolean -config ADK_KERNEL_USB_HID - boolean - select ADK_KERNEL_USB - select ADK_KERNEL_HID - select ADK_KERNEL_HID_GENERIC - -config ADK_KERNEL_USB_OHCI_HCD - boolean - default n - config ADK_KERNEL_USB_OHCI_HCD_PLATFORM boolean select ADK_KERNEL_USB_OHCI_HCD @@ -36,37 +21,18 @@ config ADK_KERNEL_USB_OHCI_HCD_PLATFORM config ADK_KERNEL_USB_LIBUSUAL tristate -config ADK_KERNEL_USB_SERIAL - boolean - -config ADK_KERNEL_USB_STORAGE - boolean - -config ADK_KERNEL_USB_EHCI_HCD - boolean - select ADK_PACKAGE_KMOD_USB_CONTROLLER - -config ADK_KERNEL_USB_UHCI_HCD - boolean - select ADK_PACKAGE_KMOD_USB_CONTROLLER - -config ADK_KERNEL_USB_OHCI_HCD - boolean - select ADK_PACKAGE_KMOD_USB_CONTROLLER - -config ADK_KPACKAGE_KMOD_USB +config ADK_KERNEL_USB prompt "USB support" tristate select ADK_KERNEL_NLS select ADK_KERNEL_USB_SUPPORT - depends on !ADK_KERNEL_USB - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 - default y if ADK_TARGET_SYSTEM_CUBOX_I + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default m if ADK_TARGET_SYSTEM_IBM_X40 + default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default m if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + default m if ADK_TARGET_SYSTEM_CUBOX_I default n help Universal Serial Bus (USB) is a specification for a serial bus @@ -99,23 +65,21 @@ config ADK_KPACKAGE_KMOD_USB menu "USB controller support" -config ADK_KPACKAGE_KMOD_USB_EHCI_HCD +config ADK_KERNEL_USB_EHCI_HCD prompt "Support for USB EHCI 2.0 controllers" tristate - select ADK_PACKAGE_KMOD_USB_CONTROLLER select ADK_KERNEL_USB_EHCI_ROOT_HUB_TT select ADK_KERNEL_USB_EHCI_TT_NEWSCHED - select ADK_KERNEL_USB_MXS_PHY - depends on !ADK_KERNEL_USB_EHCI_HCD + select ADK_KERNEL_USB_MXS_PHY if ADK_TARGET_SYSTEM_CUBOX_I depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI - depends on ADK_KPACKAGE_KMOD_USB - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_CUBOX_I + depends on ADK_KERNEL_USB + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default m if ADK_TARGET_SYSTEM_IBM_X40 + default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default m if ADK_TARGET_SYSTEM_CUBOX_I default n help The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 @@ -137,16 +101,14 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD You may want to read <file:Documentation/usb/ehci.txt>. -config ADK_KPACKAGE_KMOD_USB_UHCI_HCD +config ADK_KERNEL_USB_UHCI_HCD prompt "Support for UHCI controllers" tristate - select ADK_PACKAGE_KMOD_USB_CONTROLLER - depends on ADK_KPACKAGE_KMOD_USB - depends on !ADK_KERNEL_USB_UHCI_HCD + depends on ADK_KERNEL_USB depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default m if ADK_TARGET_SYSTEM_IBM_X40 + default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n help The Universal Host Controller Interface is a standard by Intel for @@ -158,17 +120,16 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD (like VIA VP2, VP3, MVP3, Apollo Pro, Apollo Pro II or Apollo Pro 133). If unsure, say Y. -config ADK_KPACKAGE_KMOD_USB_OHCI_HCD +config ADK_KERNEL_USB_OHCI_HCD prompt "Support for OHCI controllers" tristate - select ADK_PACKAGE_KMOD_USB_CONTROLLER - depends on ADK_KPACKAGE_KMOD_USB + depends on ADK_KERNEL_USB depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 - default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 - default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 + default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default m if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n help The Open Host Controller Interface (OHCI) is a standard for accessing @@ -196,20 +157,19 @@ config ADK_KERNEL_USB_CHIPIDEA_UDC config ADK_KERNEL_USB_CHIPIDEA_HOST boolean -config ADK_KPACKAGE_KMOD_USB_CHIPIDEA +config ADK_KERNEL_USB_CHIPIDEA prompt "Support for ChipIdea controller" tristate select ADK_KERNEL_USB_CHIPIDEA_UDC select ADK_KERNEL_USB_CHIPIDEA_HOST - depends on ADK_KPACKAGE_KMOD_USB_EHCI_HCD - default y if ADK_TARGET_SYSTEM_CUBOX_I + depends on ADK_KERNEL_USB_EHCI_HCD + default m if ADK_TARGET_SYSTEM_CUBOX_I default n -config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD +config ADK_KERNEL_USB_ISP116X_HCD prompt "Support for ISP116X" tristate - select ADK_PACKAGE_KMOD_USB_CONTROLLER - depends on ADK_KPACKAGE_KMOD_USB + depends on ADK_KERNEL_USB depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI default n @@ -219,11 +179,10 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD This driver does not support isochronous transfers. -config ADK_KPACKAGE_KMOD_USB_SL811_HCD +config ADK_KERNEL_USB_SL811_HCD prompt "Support for SL811HS" tristate - select ADK_PACKAGE_KMOD_USB_CONTROLLER - depends on ADK_KPACKAGE_KMOD_USB + depends on ADK_KERNEL_USB depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI default n @@ -233,64 +192,50 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD board has this chip, and you want to use it as a host controller. If unsure, say N. -config ADK_PACKAGE_KMOD_USB_CONTROLLER - tristate - default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI - default n - endmenu menu "USB devices support" -config ADK_KPACKAGE_KMOD_USB_STORAGE +config ADK_KERNEL_USB_STORAGE prompt "Support for USB storage devices" tristate - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER - depends on !ADK_KERNEL_USB_STORAGE - select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI - select ADK_KPACKAGE_KMOD_BLK_DEV_SD if !ADK_KERNEL_SCSI + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV_SD default n -config ADK_KPACKAGE_KMOD_SND_USB_AUDIO +config ADK_KERNEL_SND_USB_AUDIO prompt "Support for USB sound adapter" tristate select ADK_KERNEL_SND_USB - select ADK_KPACKAGE_KMOD_SND - select ADK_KPACKAGE_KMOD_SND_RAWMIDI - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + select ADK_KERNEL_SND + select ADK_KERNEL_SND_RAWMIDI default n -config ADK_KPACKAGE_KMOD_USB_HSO +config ADK_KERNEL_USB_HSO prompt "Support for USB HSO devices" tristate - select ADK_KPACKAGE_KMOD_RFKILL - select ADK_KPACKAGE_KMOD_USB_STORAGE - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + select ADK_KERNEL_RFKILL + select ADK_KERNEL_USB_STORAGE default n -config ADK_KPACKAGE_KMOD_USB_PRINTER +config ADK_KERNEL_USB_PRINTER prompt "Support for USB printers" tristate - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n -config ADK_KPACKAGE_KMOD_USB_ACM +config ADK_KERNEL_USB_ACM prompt "Support for USB modems/isdn controllers" tristate - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n -config ADK_KPACKAGE_KMOD_USB_PEGASUS +config ADK_KERNEL_USB_PEGASUS prompt "Support for USB Pegasus network cards" tristate - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n -config ADK_KPACKAGE_KMOD_USB_SERIAL +config ADK_KERNEL_USB_SERIAL prompt "Support for USB-to-serial converters" tristate - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n help Say Y here if you have a USB device that provides normal serial @@ -301,20 +246,20 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL information on the specifics of the different devices that are supported, and on how to use them. -config ADK_KPACKAGE_KMOD_USB_SERIAL_BELKIN +config ADK_KERNEL_USB_SERIAL_BELKIN prompt "Support for Belkin USB-to-serial converters" tristate - depends on ADK_KPACKAGE_KMOD_USB_SERIAL + depends on ADK_KERNEL_USB_SERIAL default n help Say Y here if you want to use a Belkin USB Serial single port adaptor (F5U103 is one of the model numbers) or the Peracom single port USB to serial adapter. -config ADK_KPACKAGE_KMOD_USB_SERIAL_FTDI_SIO +config ADK_KERNEL_USB_SERIAL_FTDI_SIO prompt "Support for FTDI USB-to-serial converter" tristate - depends on ADK_KPACKAGE_KMOD_USB_SERIAL + depends on ADK_KERNEL_USB_SERIAL default n help Say Y here if you want to use a FTDI SIO single port USB to serial @@ -324,10 +269,10 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_FTDI_SIO See <http://ftdi-usb-sio.sourceforge.net/> for more information on this driver and the device. -config ADK_KPACKAGE_KMOD_USB_SERIAL_MCT_U232 +config ADK_KERNEL_USB_SERIAL_MCT_U232 prompt "Support for Magic Control Technology USB-to-Serial converters" tristate - depends on ADK_KPACKAGE_KMOD_USB_SERIAL + depends on ADK_KERNEL_USB_SERIAL default n help Say Y here if you want to use a USB Serial single port adapter from @@ -336,19 +281,19 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_MCT_U232 This driver also works with Sitecom U232-P25 and D-Link DU-H3SP USB BAY, Belkin F5U109, and Belkin F5U409 devices. -config ADK_KPACKAGE_KMOD_USB_SERIAL_PL2303 +config ADK_KERNEL_USB_SERIAL_PL2303 prompt "Support for Prolific PL2303 USB-to-Serial converters" tristate - depends on ADK_KPACKAGE_KMOD_USB_SERIAL + depends on ADK_KERNEL_USB_SERIAL default n help Say Y here if you want to use the PL2303 USB Serial single port adapter from Prolific. -config ADK_KPACKAGE_KMOD_USB_SERIAL_VISOR +config ADK_KERNEL_USB_SERIAL_VISOR prompt "Support for Handspring Visor / Palm m50x / Sony Clie Driver" tristate - depends on ADK_KPACKAGE_KMOD_USB_SERIAL + depends on ADK_KERNEL_USB_SERIAL default n help Say Y here if you want to connect to your HandSpring Visor, Palm @@ -356,28 +301,25 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_VISOR <http://usbvisor.sourceforge.net/> for more information on using this driver. -config ADK_KPACKAGE_KMOD_USB_ATM +config ADK_KERNEL_USB_ATM prompt "Support for USB ATM devices" tristate - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n -config ADK_KPACKAGE_KMOD_USB_ATM_SPEEDTOUCH +config ADK_KERNEL_USB_ATM_SPEEDTOUCH prompt "Support for USB Speedtouch ADSL modem" tristate - depends on ADK_KPACKAGE_KMOD_USB_ATM + depends on ADK_KERNEL_USB_ATM default n -config ADK_KPACKAGE_KMOD_USB_USBNET +config ADK_KERNEL_USB_USBNET prompt "Multi-purpose USB Networking Framework" tristate - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n -config ADK_KPACKAGE_KMOD_USB_SISUSBVGA +config ADK_KERNEL_USB_SISUSBVGA prompt "USB 2.0 SVGA dongle support (Net2280/SiS315)" tristate - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n endmenu diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio index 71d67cc94..f2eb577cd 100644 --- a/target/linux/config/Config.in.virtio +++ b/target/linux/config/Config.in.virtio @@ -1,3 +1,6 @@ +menu "Virtio driver support" +depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_HARDWARE_QEMU + config ADK_KERNEL_VIRTIO boolean @@ -5,28 +8,17 @@ config ADK_KERNEL_VIRTIO_PCI boolean config ADK_KERNEL_VIRTIO_NET - boolean - -config ADK_KERNEL_VIRTIO_BLK - boolean - -menu "Virtio driver support" -depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_HARDWARE_QEMU - -config ADK_KPACKAGE_KMOD_VIRTIO_NET prompt "Virtio net driver" tristate - depends on !ADK_KERNEL_VIRTIO_NET select ADK_KERNEL_VIRTIO select ADK_KERNEL_VIRTIO_PCI default n help Enables support for Virtio Net driver. -config ADK_KPACKAGE_KMOD_VIRTIO_BLK +config ADK_KERNEL_VIRTIO_BLK prompt "Virtio block driver" tristate - depends on !ADK_KERNEL_VIRTIO_BLK select ADK_KERNEL_VIRTIO select ADK_KERNEL_VIRTIO_PCI select ADK_KERNEL_BLK_DEV diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog index 1ce7e5ac8..d8cc5932e 100644 --- a/target/linux/config/Config.in.watchdog +++ b/target/linux/config/Config.in.watchdog @@ -72,7 +72,7 @@ config ADK_KERNEL_RC32434_WDT Support for the hardware watchdog inside Routerboard 532's SoC, the IDT RC32434. -config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG +config ADK_KERNEL_SOFT_WATCHDOG prompt "Software watchdog" tristate default n diff --git a/target/linux/config/Config.in.webcam b/target/linux/config/Config.in.webcam index 7759a127e..3ff88d140 100644 --- a/target/linux/config/Config.in.webcam +++ b/target/linux/config/Config.in.webcam @@ -12,49 +12,49 @@ config ADK_KERNEL_MEDIA_CAMERA_SUPPORT boolean menu "Webcam support" -config ADK_KPACKAGE_KMOD_MEDIA_SUPPORT +config ADK_KERNEL_MEDIA_SUPPORT tristate default n help -config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS +config ADK_KERNEL_USB_VIDEO_CLASS prompt "Kernel driver for USB video webcams" tristate - depends on ADK_KPACKAGE_KMOD_USB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG - select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT + depends on ADK_KERNEL_USB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG + select ADK_KERNEL_MEDIA_SUPPORT default n help -config ADK_KPACKAGE_KMOD_USB_GSPCA +config ADK_KERNEL_USB_GSPCA prompt "GSPCA webcam framework" tristate depends on ADK_TARGET_WITH_USB select ADK_KERNEL_VIDEO_V4L2 - select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT + select ADK_KERNEL_MEDIA_SUPPORT select ADK_KERNEL_MEDIA_USB_SUPPORT select ADK_KERNEL_MEDIA_CAMERA_SUPPORT help GSPCA webcam framework -config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC207 +config ADK_KERNEL_USB_GSPCA_PAC207 prompt "Pixart PAC207 USB Camera Driver" tristate - depends on ADK_KPACKAGE_KMOD_USB_GSPCA + depends on ADK_KERNEL_USB_GSPCA help -config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC7311 +config ADK_KERNEL_USB_GSPCA_PAC7311 prompt "Pixart PAC7311 USB Camera Driver" tristate - depends on ADK_KPACKAGE_KMOD_USB_GSPCA + depends on ADK_KERNEL_USB_GSPCA help -config ADK_KPACKAGE_KMOD_USB_GSPCA_SPCA561 +config ADK_KERNEL_USB_GSPCA_SPCA561 prompt "SPCA561 USB Camera Driver" tristate - depends on ADK_KPACKAGE_KMOD_USB_GSPCA + depends on ADK_KERNEL_USB_GSPCA help -config ADK_KPACKAGE_KMOD_USB_PWC +config ADK_KERNEL_USB_PWC prompt "USB Philips Camera driver" tristate depends on ADK_TARGET_WITH_USB diff --git a/target/linux/config/Config.in.wireless b/target/linux/config/Config.in.wireless index 1c1ca4a3c..e5c136e6b 100644 --- a/target/linux/config/Config.in.wireless +++ b/target/linux/config/Config.in.wireless @@ -8,25 +8,25 @@ config ADK_KERNEL_WIRELESS config ADK_KERNEL_WIRELESS_EXT boolean -config ADK_KPACKAGE_KMOD_RFKILL +config ADK_KERNEL_RFKILL tristate config ADK_KERNEL_MAC80211_LEDS boolean - select ADK_KPACKAGE_KMOD_LEDS_CLASS + select ADK_KERNEL_LEDS_CLASS select ADK_KERNEL_NEW_LEDS select ADK_KERNEL_LEDS_TRIGGERS config ADK_KERNEL_WLAN_80211 boolean -config ADK_KPACKAGE_KMOD_RT2X00 +config ADK_KERNEL_RT2X00 tristate -config ADK_KPACKAGE_KMOD_RT2X00_LIB_USB +config ADK_KERNEL_RT2X00_LIB_USB tristate -config ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI +config ADK_KERNEL_RT2X00_LIB_PCI tristate # vendor stuff @@ -42,12 +42,6 @@ config ADK_KERNEL_RTL_CARDS config ADK_KERNEL_BCMA_POSSIBLE boolean -config ADK_KERNEL_RT2X00 - boolean - select ADK_KPACKAGE_KMOD_RT2X00 - select ADK_KPACKAGE_KMOD_FW_LOADER - select ADK_KPACKAGE_KMOD_EEPROM_93CX6 - config ADK_KERNEL_RT2800USB_RT3573 boolean @@ -60,8 +54,8 @@ config ADK_KERNEL_RT2800USB_RT55XX config ADK_KERNEL_RT2800USB_UNKNOWN boolean -config ADK_KERNEL_MOD_LIB80211 - select ADK_KPACKAGE_KMOD_CRYPTO_MICHAEL_MIC +config ADK_KERNEL_LIB80211 + select ADK_KERNEL_CRYPTO_MICHAEL_MIC tristate config ADK_KERNEL_CFG80211_WEXT @@ -70,7 +64,7 @@ config ADK_KERNEL_CFG80211_WEXT config ADK_KERNEL_ATH_COMMON tristate -config ADK_KPACKAGE_KMOD_P54_COMMON +config ADK_KERNEL_P54_COMMON tristate config ADK_KERNEL_MAC80211_DEBUG_MENU @@ -83,22 +77,22 @@ config ADK_KERNEL_MAC80211_VERBOSE_DEBUG config ADK_KERNEL_MAC80211_DEBUGFS boolean -config ADK_KPACKAGE_KMOD_CFG80211 +config ADK_KERNEL_CFG80211 tristate select ADK_KERNEL_WIRELESS select ADK_KERNEL_WLAN_80211 - select ADK_KPACKAGE_KMOD_RFKILL + select ADK_KERNEL_RFKILL -config ADK_KPACKAGE_KMOD_MAC80211 +config ADK_KERNEL_MAC80211 tristate select ADK_KERNEL_WIRELESS select ADK_KERNEL_WLAN_80211 select ADK_KERNEL_MOD_LIB80211 - select ADK_KPACKAGE_KMOD_CFG80211 - select ADK_KPACKAGE_KMOD_CRYPTO_AES - select ADK_KPACKAGE_KMOD_CRYPTO_ECB - select ADK_KPACKAGE_KMOD_CRYPTO_ARC4 - select ADK_KPACKAGE_KMOD_RFKILL + select ADK_KERNEL_CFG80211 + select ADK_KERNEL_CRYPTO_AES + select ADK_KERNEL_CRYPTO_ECB + select ADK_KERNEL_CRYPTO_ARC4 + select ADK_KERNEL_RFKILL config ADK_DEBUG_MAC80211 boolean @@ -112,55 +106,55 @@ depends on ADK_TARGET_WITH_CARDBUS || ADK_TARGET_WITH_PCMCIA || ADK_TARGET_WITH_ config ADK_KERNEL_BRCMFMAC_SDIO boolean -config ADK_KPACKAGE_KMOD_BRCMFMAC +config ADK_KERNEL_BRCMFMAC prompt "Broadcom brcmfmac wireless driver" tristate select ADK_KERNEL_WIRELESS select ADK_KERNEL_WLAN_80211 - select ADK_KPACKAGE_KMOD_CFG80211 - select ADK_PACKAGE_BRCMFMAC_FIRMWARE + select ADK_KERNEL_CFG80211 select ADK_KERNEL_BCMA_POSSIBLE select ADK_KERNEL_BRCMFMAC_SDIO + select ADK_PACKAGE_BRCMFMAC_FIRMWARE depends on ADK_TARGET_WITH_SDIO - default y if ADK_TARGET_SYSTEM_CUBOX_I + default m if ADK_TARGET_SYSTEM_CUBOX_I default n help - Driver for Broadcom wireless. + Driver for Broadcom FullMac wireless cards config ADK_KERNEL_ATH6KL_SDIO boolean -config ADK_KPACKAGE_KMOD_ATH6KL +config ADK_KERNEL_ATH6KL prompt "Atheros 6kl wireless driver" tristate select ADK_KERNEL_NET_VENDOR_ATHEROS select ADK_KERNEL_ATH_CARDS select ADK_KERNEL_ATH6KL_SDIO - select ADK_KPACKAGE_KMOD_MAC80211 + select ADK_KERNEL_MAC80211 depends on ADK_TARGET_WITH_SDIO default n help - Driver for Atheros wireless 6KL. + Driver for Atheros wireless 6KL -config ADK_KPACKAGE_KMOD_ATH5K +config ADK_KERNEL_ATH5K prompt "Atheros 5xxx wireless driver" tristate select ADK_KERNEL_MAC80211_LEDS select ADK_KERNEL_ATH_CARDS select ADK_KERNEL_ATH_COMMON - select ADK_KPACKAGE_KMOD_MAC80211 + select ADK_KERNEL_MAC80211 depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_AHB - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_FON_FON2100 + default m if ADK_TARGET_SYSTEM_IBM_X40 + default m if ADK_TARGET_SYSTEM_FON_FON2100 default n help - Driver for Atheros 5xxx/24xx cards. + Driver for Atheros 5xxx/24xx cards config ADK_KERNEL_ATH5K_DEBUG prompt "enable debugging info via debugfs" boolean select ADK_DEBUG_MAC80211 - depends on ADK_KPACKAGE_KMOD_ATH5K + depends on ADK_KERNEL_ATH5K default n help Atheros 5xxx debugging messages. @@ -174,72 +168,72 @@ config ADK_KERNEL_ATH5K_DEBUG parameter. For example: insmod ath5k.ko debug=0x00000400 -config ADK_KPACKAGE_KMOD_B43 +config ADK_KERNEL_B43 prompt "Broadcom B43xx wireless driver" tristate + select ADK_KERNEL_FW_LOADER + select ADK_KERNEL_MAC80211 select ADK_PACKAGE_B43_FIRMWARE - select ADK_KPACKAGE_KMOD_FW_LOADER - select ADK_KPACKAGE_KMOD_MAC80211 depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI default n help - Driver for Broadcom B43xx wireless chips. + Driver for Broadcom B43xx wireless chips -config ADK_KPACKAGE_KMOD_B43LEGACY +config ADK_KERNEL_B43LEGACY prompt "Broadcom B43xx (legacy) wireless driver" tristate + select ADK_KERNEL_FW_LOADER + select ADK_KERNEL_MAC80211 select ADK_PACKAGE_B43_FIRMWARE - select ADK_KPACKAGE_KMOD_FW_LOADER - select ADK_KPACKAGE_KMOD_MAC80211 depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI default n help - Driver for Broadcom B43xx wireless chips. + Driver for Broadcom B43xx wireless chips -config ADK_KPACKAGE_KMOD_HOSTAP +config ADK_KERNEL_HOSTAP prompt "HostAP driver" tristate - select ADK_KPACKAGE_KMOD_MAC80211 + select ADK_KERNEL_MAC80211 default n depends on ADK_TARGET_WITH_PCMCIA help - HostAP Driver for wireless chips. + HostAP Driver for wireless chips -config ADK_KPACKAGE_KMOD_HOSTAP_CS +config ADK_KERNEL_HOSTAP_CS prompt "HostAP driver for PC Cards" tristate - select ADK_KPACKAGE_KMOD_HOSTAP + select ADK_KERNEL_HOSTAP depends on ADK_TARGET_WITH_PCMCIA - default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS + default m if ADK_TARGET_SYSTEM_SHARP_ZAURUS default n help - HostAP CS Driver for wireless chips. + HostAP CS Driver for wireless chips -config ADK_KPACKAGE_KMOD_RTL8187 +config ADK_KERNEL_RTL8187 prompt "Realtek RTL8187/RTL8187B wireless driver" tristate + select ADK_KERNEL_MAC80211 + select ADK_KERNEL_EEPROM_93CX6 depends on ADK_TARGET_WITH_USB - select ADK_KPACKAGE_KMOD_MAC80211 - select ADK_KPACKAGE_KMOD_EEPROM_93CX6 default n help - Driver for Realtek RTL8187/RTL8187B wireless chips. + Driver for Realtek RTL8187/RTL8187B wireless chips -config ADK_KPACKAGE_KMOD_P54_USB +config ADK_KERNEL_P54_USB prompt "Prism54 USB support" tristate - select ADK_KPACKAGE_KMOD_P54_COMMON - select ADK_KPACKAGE_KMOD_FW_LOADER - select ADK_PACKAGE_P54_FIRMWARE select ADK_KERNEL_EXPERIMENTAL - select ADK_KPACKAGE_KMOD_MAC80211 - select ADK_KPACKAGE_KMOD_CRC_CCITT - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + select ADK_KERNEL_P54_COMMON + select ADK_KERNEL_FW_LOADER + select ADK_KERNEL_MAC80211 + select ADK_KERNEL_CRC_CCITT + select ADK_PACKAGE_P54_FIRMWARE + depends on ADK_TARGET_WITH_USB default n help - Driver for Prism54 USB adaptors. + Driver for Prism54 USB adaptors -config ADK_KPACKAGE_KMOD_RT2800USB +config ADK_KERNEL_RT2800USB prompt "Ralink rt2800 USB driver" tristate select ADK_KERNEL_RT2X00 @@ -247,32 +241,32 @@ config ADK_KPACKAGE_KMOD_RT2800USB select ADK_KERNEL_RT2800USB_RT53XX select ADK_KERNEL_RT2800USB_RT55XX select ADK_KERNEL_RT2800USB_UNKNOWN - select ADK_KPACKAGE_KMOD_RT2X00_LIB_USB - select ADK_KPACKAGE_KMOD_MAC80211 - select ADK_KPACKAGE_KMOD_CRC_CCITT - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + select ADK_KERNEL_RT2X00_LIB_USB + select ADK_KERNEL_MAC80211 + select ADK_KERNEL_CRC_CCITT + depends on ADK_TARGET_WITH_USB default n help - Driver for Ralink RT2800 USB. + Driver for Ralink RT2800 USB -config ADK_KPACKAGE_KMOD_RTL8192CU +config ADK_KERNEL_RTL8192CU prompt "Realtek RTL8192CU USB driver" tristate select ADK_KERNEL_RTL_CARDS - select ADK_KPACKAGE_KMOD_MAC80211 - select ADK_KPACKAGE_KMOD_FW_LOADER + select ADK_KERNEL_MAC80211 + select ADK_KERNEL_FW_LOADER select ADK_PACKAGE_REALTEK_FIRMWARE - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + depends on ADK_TARGET_WITH_USB default n help Driver for Realtek RTL8192CU USB -config ADK_KPACKAGE_KMOD_RT2400PCI +config ADK_KERNEL_RT2400PCI prompt "Ralink rt2400 PCI driver" tristate select ADK_KERNEL_RT2X00 - select ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI - select ADK_KPACKAGE_KMOD_MAC80211 + select ADK_KERNEL_RT2X00_LIB_PCI + select ADK_KERNEL_MAC80211 select ADK_KERNEL_MAC80211_LEDS depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI default n @@ -280,12 +274,12 @@ config ADK_KPACKAGE_KMOD_RT2400PCI This adds support for rt2400 wireless chipset family. Supported chips: RT2460. -config ADK_KPACKAGE_KMOD_RT2500PCI +config ADK_KERNEL_RT2500PCI prompt "Ralink rt2500 PCI driver" tristate select ADK_KERNEL_RT2X00 - select ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI - select ADK_KPACKAGE_KMOD_MAC80211 + select ADK_KERNEL_RT2X00_LIB_PCI + select ADK_KERNEL_MAC80211 select ADK_KERNEL_MAC80211_LEDS depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI default n @@ -293,14 +287,14 @@ config ADK_KPACKAGE_KMOD_RT2500PCI This adds support for rt2500 wireless chipset family. Supported chips: RT2560. -config ADK_KPACKAGE_KMOD_RT61PCI +config ADK_KERNEL_RT61PCI prompt "Ralink rt2501/rt61 PCI driver" tristate select ADK_KERNEL_RT2X00 - select ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI - select ADK_KPACKAGE_KMOD_MAC80211 + select ADK_KERNEL_RT2X00_LIB_PCI + select ADK_KERNEL_MAC80211 select ADK_KERNEL_MAC80211_LEDS - select ADK_KPACKAGE_KMOD_CRC_ITU_T + select ADK_KERNEL_CRC_ITU_T select ADK_PACKAGE_RT61_FIRMWARE depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI default n @@ -312,9 +306,9 @@ config ADK_KERNEL_RT2X00_DEBUG prompt "enable debugging info" boolean select ADK_DEBUG_MAC80211 - depends on ADK_KPACKAGE_KMOD_RT61PCI || \ - ADK_KPACKAGE_KMOD_RT2500PCI || \ - ADK_KPACKAGE_KMOD_RT2400PCI + depends on ADK_KERNEL_RT61PCI || \ + ADK_KERNEL_RT2500PCI || \ + ADK_KERNEL_RT2400PCI default n help diff --git a/target/linux/kernel.config b/target/linux/kernel.config index f88265e9d..f20b2faef 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -18,7 +18,6 @@ CONFIG_ETHERNET=y CONFIG_PROC_FS=y CONFIG_PROC_SYSCTL=y CONFIG_BLOCK=y -CONFIG_BLK_DEV=y CONFIG_LBDAF=y CONFIG_FILE_LOCKING=y CONFIG_SYSFS=y diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605 index cb8da0cec..d674fb390 100644 --- a/target/microblaze/kernel/qemu-microblaze-ml605 +++ b/target/microblaze/kernel/qemu-microblaze-ml605 @@ -10,13 +10,7 @@ CONFIG_XILINX_MICROBLAZE0_USE_DIV=1 CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2 CONFIG_XILINX_MICROBLAZE0_USE_FPU=1 CONFIG_XILINX_MICROBLAZE0_HW_VER="8.10.a" -CONFIG_PCI=y CONFIG_PCI_XILINX=y -CONFIG_DTC=y -CONFIG_OF=y -CONFIG_PROC_DEVICETREE=y -CONFIG_NET_VENDOR_XILINX=y -CONFIG_XILINX_AXI_EMAC=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=1 diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 index 3c3546b47..7f21cc019 100644 --- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 +++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 @@ -10,13 +10,7 @@ CONFIG_XILINX_MICROBLAZE0_USE_DIV=0 CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1 CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 CONFIG_XILINX_MICROBLAZE0_HW_VER="7.10.d" -CONFIG_PCI=y CONFIG_PCI_XILINX=y -CONFIG_DTC=y -CONFIG_OF=y -CONFIG_PROC_DEVICETREE=y -CONFIG_NET_VENDOR_XILINX=y -CONFIG_XILINX_EMACLITE=y CONFIG_SERIAL_UARTLITE=y CONFIG_SERIAL_UARTLITE_CONSOLE=y CONFIG_CMDLINE_FORCE=y diff --git a/target/mips/kernel/lemote-yeelong b/target/mips/kernel/lemote-yeelong index 412f6f9f8..96ca64c66 100644 --- a/target/mips/kernel/lemote-yeelong +++ b/target/mips/kernel/lemote-yeelong @@ -6,14 +6,11 @@ CONFIG_CPU_LOONGSON2F=y CONFIG_CPU_NOP_WORKAROUNDS=y CONFIG_CPU_JUMP_WORKAROUNDS=y CONFIG_CPU_LOONGSON2F_WORKAROUNDS=y -CONFIG_64BIT=y CONFIG_PAGE_SIZE_16KB=y CONFIG_MIPS32_COMPAT=y CONFIG_COMPAT=y CONFIG_MIPS32_O32=y CONFIG_MIPS32_N32=y -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_8139TOO=y CONFIG_SERIO=y CONFIG_SERIO_I8042=y CONFIG_SERIO_SERPORT=y diff --git a/target/mips/kernel/mikrotik-rb532 b/target/mips/kernel/mikrotik-rb532 index 57ef2e1ed..8162e7619 100644 --- a/target/mips/kernel/mikrotik-rb532 +++ b/target/mips/kernel/mikrotik-rb532 @@ -1,8 +1,5 @@ CONFIG_MIPS=y CONFIG_MIKROTIK_RB532=y CONFIG_CPU_MIPS32_R1=y -CONFIG_KORINA=y -CONFIG_NET_VENDOR_VIA=y -CONFIG_VIA_RHINE=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips index d3129fbda..ca7b79eb9 100644 --- a/target/mips/kernel/qemu-mips +++ b/target/mips/kernel/qemu-mips @@ -3,11 +3,6 @@ CONFIG_MIPS_MALTA=y CONFIG_MIPS_BONITO64=y CONFIG_MIPS_MSC=y CONFIG_CPU_MIPS32_R1=y -CONFIG_PAGE_SIZE_4KB=y -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y CONFIG_PHYLIB=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y diff --git a/target/mips/kernel/qemu-mips64 b/target/mips/kernel/qemu-mips64 index 3a1be029e..9216fe380 100644 --- a/target/mips/kernel/qemu-mips64 +++ b/target/mips/kernel/qemu-mips64 @@ -1,14 +1,9 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_CPU_MIPS64_R1=y -CONFIG_PAGE_SIZE_4KB=y -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y CONFIG_MIPS32_COMPAT=y CONFIG_MIPS32_O32=y CONFIG_MIPS32_N32=y CONFIG_BINFMT_ELF32=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y diff --git a/target/mips/kernel/qemu-mips64el b/target/mips/kernel/qemu-mips64el index 40192aff2..9216fe380 100644 --- a/target/mips/kernel/qemu-mips64el +++ b/target/mips/kernel/qemu-mips64el @@ -1,16 +1,9 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_CPU_MIPS64_R1=y -CONFIG_PAGE_SIZE_4KB=y -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y CONFIG_MIPS32_COMPAT=y CONFIG_MIPS32_O32=y CONFIG_MIPS32_N32=y CONFIG_BINFMT_ELF32=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=1 -CONFIG_SERIAL_8250_RUNTIME_UARTS=1 diff --git a/target/mips/kernel/qemu-mipsel b/target/mips/kernel/qemu-mipsel index d3129fbda..422170fbb 100644 --- a/target/mips/kernel/qemu-mipsel +++ b/target/mips/kernel/qemu-mipsel @@ -3,11 +3,5 @@ CONFIG_MIPS_MALTA=y CONFIG_MIPS_BONITO64=y CONFIG_MIPS_MSC=y CONFIG_CPU_MIPS32_R1=y -CONFIG_PAGE_SIZE_4KB=y -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y -CONFIG_PHYLIB=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y diff --git a/target/ppc/kernel/qemu-ppc b/target/ppc/kernel/qemu-ppc index f45511601..b18e0e2d4 100644 --- a/target/ppc/kernel/qemu-ppc +++ b/target/ppc/kernel/qemu-ppc @@ -1,3 +1,6 @@ +CONFIG_PPC=y +CONFIG_PPC32=y +CONFIG_32BIT=y CONFIG_PPC_BOOK3S_32=y CONFIG_PPC_BOOK3S=y CONFIG_6xx=y @@ -5,10 +8,7 @@ CONFIG_PPC_FPU=y CONFIG_ALTIVEC=y CONFIG_PPC_STD_MMU=y CONFIG_PPC_STD_MMU_32=y -CONFIG_PPC32=y -CONFIG_32BIT=y CONFIG_WORD_SIZE=32 -CONFIG_PPC=y CONFIG_GENERIC_NVRAM=y CONFIG_PPC_OF=y CONFIG_PPC_UDBG_16550=y @@ -21,18 +21,10 @@ CONFIG_PPC_I8259=y CONFIG_PPC_RTAS=y CONFIG_PPC_MPC106=y CONFIG_PPC_4K_PAGES=y -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_SYSCALL=y -CONFIG_DTC=y -CONFIG_OF=y CONFIG_MACINTOSH_DRIVERS=y CONFIG_ADB=y CONFIG_ADB_CUDA=y CONFIG_INPUT_ADBHID=y -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NET_VENDOR_8390=y -CONFIG_NE2K_PCI=y CONFIG_SERIAL_PMACZILOG=y CONFIG_SERIAL_PMACZILOG_TTYS=y CONFIG_SERIAL_PMACZILOG_CONSOLE=y diff --git a/target/ppc64/kernel/qemu-ppc64 b/target/ppc64/kernel/qemu-ppc64 index ebf952146..34f2e6fb7 100644 --- a/target/ppc64/kernel/qemu-ppc64 +++ b/target/ppc64/kernel/qemu-ppc64 @@ -21,14 +21,6 @@ CONFIG_IBMVIO=y CONFIG_EEH=y CONFIG_PPC_4K_PAGES=y CONFIG_PPC_PCI_CHOICE=y -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_SYSCALL=y -CONFIG_PCI_MSI=y -CONFIG_DTC=y -CONFIG_OF=y -CONFIG_NET_VENDOR_IBM=y -CONFIG_IBMVETH=y CONFIG_HVC_DRIVER=y CONFIG_HVC_IRQ=y CONFIG_HVC_CONSOLE=y diff --git a/target/sh/kernel/qemu-sh b/target/sh/kernel/qemu-sh index 1678d7a51..dbe8f023c 100644 --- a/target/sh/kernel/qemu-sh +++ b/target/sh/kernel/qemu-sh @@ -12,8 +12,6 @@ CONFIG_RTS7751R2D_PLUS=y CONFIG_SH_TIMER_TMU=y CONFIG_SH_INTC=y CONFIG_CMDLINE_EXTEND=y -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_8139CP=y CONFIG_SERIAL_SH_SCI=y CONFIG_SERIAL_SH_SCI_NR_UARTS=2 CONFIG_SERIAL_SH_SCI_CONSOLE=y diff --git a/target/sparc/kernel/qemu-sparc b/target/sparc/kernel/qemu-sparc index f58df04b4..ffa9bb9f8 100644 --- a/target/sparc/kernel/qemu-sparc +++ b/target/sparc/kernel/qemu-sparc @@ -2,12 +2,7 @@ CONFIG_SPARC=y CONFIG_SPARC32=y CONFIG_SBUS=y CONFIG_SBUSCHAR=y -CONFIG_PCI=y -CONFIG_PCI_SYSCALL=y CONFIG_PCIC_PCI=y -CONFIG_OF=y -CONFIG_NET_VENDOR_AMD=y -CONFIG_SUNLANCE=y CONFIG_SERIAL_CONSOLE=y CONFIG_SERIAL_SUNCORE=y CONFIG_SERIAL_SUNZILOG=y diff --git a/target/sparc64/kernel/qemu-sparc64 b/target/sparc64/kernel/qemu-sparc64 index e3cd03068..53191c99f 100644 --- a/target/sparc64/kernel/qemu-sparc64 +++ b/target/sparc64/kernel/qemu-sparc64 @@ -1,8 +1,5 @@ CONFIG_SPARC=y CONFIG_SPARC64=y -CONFIG_PCI=y -CONFIG_PCI_SYSCALL=y -CONFIG_PCI_DOMAINS=y CONFIG_SUN_OPENPROMFS=y CONFIG_SPARC64_PCI=y CONFIG_OF=y diff --git a/target/x86/kernel/generic-pc b/target/x86/kernel/generic-pc index 8b26b4d30..9c844d2b2 100644 --- a/target/x86/kernel/generic-pc +++ b/target/x86/kernel/generic-pc @@ -1,20 +1,5 @@ CONFIG_X86=y CONFIG_X86_32=y -CONFIG_PCI=y -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_DOMAINS=y -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NET_VENDOR_8390=y -CONFIG_NE2K_PCI=y -CONFIG_PCNET32=y -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_RTL8139CP=y -CONFIG_8139TOO=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=y -CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_ATA=y diff --git a/target/x86/kernel/ibm-x40 b/target/x86/kernel/ibm-x40 index 816e76ca9..eb53a4fec 100644 --- a/target/x86/kernel/ibm-x40 +++ b/target/x86/kernel/ibm-x40 @@ -5,18 +5,6 @@ CONFIG_CPU_SUP_INTEL=y CONFIG_NR_CPUS=1 CONFIG_VM86=y CONFIG_X86_REBOOTFIXUPS=y -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=y -CONFIG_SATA_PMP=y -CONFIG_ATA_SFF=y -CONFIG_ATA_BMDMA=y -CONFIG_ATA_PIIX=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_NR_UARTS=2 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 diff --git a/target/x86/kernel/qemu-x86 b/target/x86/kernel/qemu-x86 index 7eb708745..849852a65 100644 --- a/target/x86/kernel/qemu-x86 +++ b/target/x86/kernel/qemu-x86 @@ -1,11 +1,4 @@ CONFIG_X86=y CONFIG_X86_32=y -CONFIG_PCI=y -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_DOMAINS=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y diff --git a/target/x86/kernel/qemu-x86_64 b/target/x86/kernel/qemu-x86_64 index 7bf96c74c..60ffa8dfd 100644 --- a/target/x86/kernel/qemu-x86_64 +++ b/target/x86/kernel/qemu-x86_64 @@ -1,5 +1,4 @@ CONFIG_X86=y -CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_GENERIC_CPU=y CONFIG_PROCESSOR_SELECT=y @@ -8,13 +7,8 @@ CONFIG_CPU_SUP_AMD=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_MTRR=y -CONFIG_X86_PAT=y -CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y CONFIG_IA32_EMULATION=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64 index baad58c81..612bdbcb5 100644 --- a/target/x86_64/kernel/qemu-x86_64 +++ b/target/x86_64/kernel/qemu-x86_64 @@ -1,5 +1,6 @@ CONFIG_X86=y CONFIG_X86_64=y +CONFIG_X86_X32=y CONFIG_GENERIC_CPU=y CONFIG_PROCESSOR_SELECT=y CONFIG_CPU_SUP_INTEL=y @@ -7,19 +8,8 @@ CONFIG_CPU_SUP_AMD=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_MTRR=y -CONFIG_X86_PAT=y -CONFIG_PCI=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_MSI=y -CONFIG_PCI_LABEL=y -CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y CONFIG_IA32_EMULATION=y -CONFIG_X86_X32=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y |