diff options
| -rw-r--r-- | target/arm/sys-available/acmesystems-foxg20 | 1 | ||||
| -rw-r--r-- | target/arm/sys-available/cubox-i | 3 | ||||
| -rw-r--r-- | target/arm/sys-available/raspberry-pi | 2 | ||||
| -rw-r--r-- | target/config/Config.in.hardware | 10 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 310 | ||||
| -rw-r--r-- | target/linux/config/Config.in.cpu | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.webcam | 4 | ||||
| -rw-r--r-- | target/mips/sys-available/mikrotik-rb532 | 1 | ||||
| -rw-r--r-- | target/x86/sys-available/ibm-x40 | 2 |
10 files changed, 201 insertions, 134 deletions
diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20 index ac2ec191c..d473e199e 100644 --- a/target/arm/sys-available/acmesystems-foxg20 +++ b/target/arm/sys-available/acmesystems-foxg20 @@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 select ADK_eabi select ADK_acmesystems_foxg20 select ADK_KERNEL_AEABI + select ADK_TARGET_WITH_SD select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_RTC select ADK_TARGET_WITH_USB diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i index 46e37e75d..204bdd2c0 100644 --- a/target/arm/sys-available/cubox-i +++ b/target/arm/sys-available/cubox-i @@ -8,13 +8,16 @@ config ADK_TARGET_SYSTEM_CUBOX_I select ADK_cubox_i select ADK_CPU_CORTEX_A9 select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_CPUFREQ select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_SD select ADK_TARGET_WITH_I2C select ADK_TARGET_WITH_SPI select ADK_TARGET_WITH_RTC select ADK_TARGET_WITH_SDIO select ADK_TARGET_WITH_SOUND select ADK_TARGET_WITH_LEDS + select ADK_TARGET_WITH_SMP select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_WITH_ROOT_RW select ADK_PACKAGE_U_BOOT_IMX6 diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index 319df3523..4c6150e9b 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -8,8 +8,10 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_raspberry_pi select ADK_CPU_ARM1176JZF_S select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_CPUFREQ select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_SD select ADK_PACKAGE_BCM2835_BOOTLOADER select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/config/Config.in.hardware b/target/config/Config.in.hardware index ced7df690..aa177e50c 100644 --- a/target/config/Config.in.hardware +++ b/target/config/Config.in.hardware @@ -32,18 +32,24 @@ config ADK_TARGET_WITH_VGA config ADK_TARGET_WITH_NAND boolean +config ADK_TARGET_WITH_SD + boolean + config ADK_TARGET_WITH_MTD boolean config ADK_TARGET_WITH_GEODE_CRYPTO boolean -config ADK_TARGET_WITH_HDD +config ADK_TARGET_WITH_PATA boolean config ADK_TARGET_WITH_SATA boolean +config ADK_TARGET_WITH_SCSI + boolean + config ADK_TARGET_WITH_INPUT boolean @@ -77,3 +83,5 @@ config ADK_TARGET_WITH_DSL config ADK_TARGET_WITH_USB_BOOT boolean +config ADK_TARGET_WITH_SMP + boolean diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 7c1f58ea2..9130961f1 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -87,46 +87,101 @@ config ADK_KERNEL_MMC_SDHCI_PLTFM config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA boolean -config ADK_KERNEL_ATA_PIIX - prompt "ATA PIIX support" +menu "SATA/PATA devices support" +depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_HARDWARE_QEMU + +config ADK_KERNEL_PATA_RB532 + prompt "CF disk driver for Mikrotik RB532" tristate select ADK_KERNEL_SCSI - select ADK_KERNEL_SCSI_DMA 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 - default y if ADK_TARGET_SYSTEM_IBM_X40 + depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532 + default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532 default n -config ADK_KERNEL_SCSI_SYM53C8XX_2 +config ADK_KERNEL_PATA_AMD + prompt "AMD PATA driver" 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 + depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 + default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C + default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default n -config ADK_KERNEL_SCSI_IBMVSCSI +config ADK_KERNEL_PATA_SC1200 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 + depends on ADK_TARGET_SYSTEM_PCENGINES_WRAP + default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP + default n -config ADK_KERNEL_SCSI_SUNESP +config ADK_KERNEL_PATA_JMICRON 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 + default n -config ADK_KERNEL_PATA_MACIO +config ADK_KERNEL_SATA_AHCI + prompt "AHCI SATA driver" tristate select ADK_KERNEL_SCSI select ADK_KERNEL_ATA + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + depends on ADK_TARGET_SYSTEM_VBOX_I686 + default y if ADK_TARGET_SYSTEM_VBOX_I686 + default n + help + Enables support for AHCI Serial ATA. + +config ADK_KERNEL_ATA_PIIX + prompt "ATA PIIX support" + tristate + select ADK_KERNEL_SCSI + select ADK_KERNEL_SCSI_DMA + 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 + depends on ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_IBM_X40 + default n + help + ATA PIXX driver +config ADK_KERNEL_PATA_MACIO + prompt "MAC IO support" + 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 + depends on ADK_TARGET_SYSTEM_QEMU_PPC + default n + config ADK_KERNEL_PATA_PLATFORM tristate select ADK_KERNEL_SCSI @@ -135,6 +190,8 @@ config ADK_KERNEL_PATA_PLATFORM select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD + depends on ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB + default n config ADK_KERNEL_PATA_PCMCIA tristate @@ -157,6 +214,7 @@ config ADK_KERNEL_PATA_IMX default n config ADK_KERNEL_PATA_PXA + prompt "PATA driver for Sharp Zaurus" tristate select ADK_KERNEL_SCSI select ADK_KERNEL_ATA @@ -168,6 +226,47 @@ config ADK_KERNEL_PATA_PXA depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS default n + help + Driver for PATA on Sharp Zaurus + +endmenu + +menu "SCSI driver support" +depends on ADK_TARGET_WITH_SCSI || ADK_HARDWARE_QEMU + +config ADK_KERNEL_SCSI_SYM53C8XX_2 + prompt "Symbios Logic 53C8XX2 support" + tristate + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + depends on ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB + default n + help + +config ADK_KERNEL_SCSI_IBMVSCSI + prompt "IBM VSCSI support" + tristate + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + depends on ADK_TARGET_SYSTEM_QEMU_PPC64 + default n + help + +config ADK_KERNEL_SCSI_SUNESP + prompt "SUN ESP support" + tristate + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + depends on ADK_TARGET_SYSTEM_QEMU_SPARC + default n + +endmenu + +menu "SD/MMC driver support" +depends on ADK_TARGET_WITH_SD config ADK_KERNEL_MMC_AT91 tristate @@ -181,6 +280,7 @@ config ADK_KERNEL_MMC_AT91 default n config ADK_KERNEL_MMC_SDHCI_BCM2708 + prompt "SD card support for Raspberry PI" tristate select ADK_KERNEL_SCSI select ADK_KERNEL_MMC @@ -196,6 +296,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708 default n config ADK_KERNEL_MMC_SDHCI_ESDHC_IMX + prompt "SD card support for Cubox-i" tristate select ADK_KERNEL_SCSI select ADK_KERNEL_SCSI_DMA @@ -216,131 +317,10 @@ config ADK_KERNEL_MMC_SDHCI_ESDHC_IMX default y if ADK_TARGET_SYSTEM_CUBOX_I default n -config ADK_KERNEL_PATA_RB532 - prompt "CF disk driver for Mikrotik RB532" - 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 - depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532 - default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532 - default n - -config ADK_KERNEL_PATA_AMD - 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 - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default n - -config ADK_KERNEL_PATA_SC1200 - 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 - default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP - default n - -config ADK_KERNEL_PATA_JMICRON - 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 - default n - -config ADK_KERNEL_SATA_AHCI - prompt "AHCI SATA driver" - tristate - select ADK_KERNEL_SCSI - select ADK_KERNEL_ATA - select ADK_KERNEL_BLK_DEV - select ADK_KERNEL_BLK_DEV_SD - depends on ADK_TARGET_WITH_SATA - default y if ADK_TARGET_SYSTEM_VBOX_I686 - default n - help - Enables support for AHCI Serial ATA. - -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 - device; you can then create a file system on that block device and - mount it just as you would mount other block devices such as hard - drive partitions, CD-ROM drives or floppy drives. The loop devices - are block special device files with major number 7 and typically - called /dev/loop0, /dev/loop1 etc. - - This is useful if you want to check an ISO 9660 file system before - burning the CD, or if you want to use floppy images without first - writing them to floppy. Furthermore, some Linux distributions avoid - the need for a dedicated Linux partition by keeping their complete - root file system inside a DOS FAT file using this loop device - driver. - - To use the loop device, you need the losetup utility, found in the - util-linux package, see - <ftp://ftp.kernel.org/pub/linux/utils/util-linux/>. - - The loop device driver can also be used to "hide" a file system in - a disk partition, floppy, or regular file, either using encryption - (scrambling the data) or steganography (hiding the data in the low - bits of, say, a sound file). This is also safe if the file resides - on a remote file server. - - There are several ways of encrypting disks. Some of these require - kernel patches. The vanilla kernel offers the cryptoloop option - and a Device Mapper target (which is superior, as it supports all - file systems). If you want to use the cryptoloop, say Y to both - LOOP and CRYPTOLOOP, and make sure you have a recent (version 2.12 - or later) version of util-linux. Additionally, be aware that - the cryptoloop is not safe for storing journaled filesystems. - - Note that this loop device has nothing to do with the loopback - device used for network connections from the machine to itself. - -config ADK_KERNEL_BLK_DEV_NBD - prompt "Network Block Device support" - tristate - default n - help - Saying Y here will allow your computer to be a client for network - block devices, i.e. it will be able to use block devices exported by - servers (mount file systems on them etc.). Communication between - client and server works over TCP/IP networking, but to the client - program this is hidden: it looks like a regular local file access to - a block device special file such as /dev/nd0. - - Network block devices also allows you to run a block-device in - userland (making server and client physically the same computer, - communicating using the loopback network device). +endmenu - Read <file:Documentation/nbd.txt> for more information, especially - about where to find the server code, which runs in user space and - does not need special kernel support. +menu "Block driver support" - 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_KERNEL_SCSI prompt "SCSI support" @@ -459,11 +439,77 @@ config ADK_KERNEL_BLK_DEV_DRBD select ADK_KERNEL_CONNECTOR help DRBD - http://www.drbd.org + +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 + device; you can then create a file system on that block device and + mount it just as you would mount other block devices such as hard + drive partitions, CD-ROM drives or floppy drives. The loop devices + are block special device files with major number 7 and typically + called /dev/loop0, /dev/loop1 etc. + + This is useful if you want to check an ISO 9660 file system before + burning the CD, or if you want to use floppy images without first + writing them to floppy. Furthermore, some Linux distributions avoid + the need for a dedicated Linux partition by keeping their complete + root file system inside a DOS FAT file using this loop device + driver. + + To use the loop device, you need the losetup utility, found in the + util-linux package, see + <ftp://ftp.kernel.org/pub/linux/utils/util-linux/>. + + The loop device driver can also be used to "hide" a file system in + a disk partition, floppy, or regular file, either using encryption + (scrambling the data) or steganography (hiding the data in the low + bits of, say, a sound file). This is also safe if the file resides + on a remote file server. + + There are several ways of encrypting disks. Some of these require + kernel patches. The vanilla kernel offers the cryptoloop option + and a Device Mapper target (which is superior, as it supports all + file systems). If you want to use the cryptoloop, say Y to both + LOOP and CRYPTOLOOP, and make sure you have a recent (version 2.12 + or later) version of util-linux. Additionally, be aware that + the cryptoloop is not safe for storing journaled filesystems. + + Note that this loop device has nothing to do with the loopback + device used for network connections from the machine to itself. + +config ADK_KERNEL_BLK_DEV_NBD + prompt "Network Block Device support" + tristate + default n + help + Saying Y here will allow your computer to be a client for network + block devices, i.e. it will be able to use block devices exported by + servers (mount file systems on them etc.). Communication between + client and server works over TCP/IP networking, but to the client + program this is hidden: it looks like a regular local file access to + a block device special file such as /dev/nd0. + + Network block devices also allows you to run a block-device in + userland (making server and client physically the same computer, + communicating using the loopback network device). + + Read <file:Documentation/nbd.txt> for more information, especially + about where to find the server code, which runs in user space and + does not need special kernel support. + + 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_KERNEL_SWAP prompt "SWAP support" boolean help - Kernel swap support. + Kernel swap support endmenu +endmenu diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu index 71b32b963..22b1cd332 100644 --- a/target/linux/config/Config.in.cpu +++ b/target/linux/config/Config.in.cpu @@ -20,6 +20,7 @@ config ADK_KERNEL_USE_GENERIC_SMP_HELPERS default n menu "CPU frequency support" +depends on ADK_TARGET_WITH_CPU_FREQ config ADK_KERNEL_CPU_FREQ boolean diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index b75ff9406..2e7870376 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -124,6 +124,7 @@ config ADK_KERNEL_SMP boolean default y if ADK_TARGET_CUBOX_I4PRO default y if ADK_TARGET_CUBOX_I2ULTRA + depends on ADK_TARGET_WITH_SMP default n config ADK_KERNEL_HIGHMEM diff --git a/target/linux/config/Config.in.webcam b/target/linux/config/Config.in.webcam index 3ff88d140..00e0695da 100644 --- a/target/linux/config/Config.in.webcam +++ b/target/linux/config/Config.in.webcam @@ -1,3 +1,6 @@ +menu "Webcam support" +depends on ADK_TARGET_WITH_USB + config ADK_KERNEL_VIDEO_DEV boolean @@ -11,7 +14,6 @@ config ADK_KERNEL_MEDIA_USB_SUPPORT config ADK_KERNEL_MEDIA_CAMERA_SUPPORT boolean -menu "Webcam support" config ADK_KERNEL_MEDIA_SUPPORT tristate default n diff --git a/target/mips/sys-available/mikrotik-rb532 b/target/mips/sys-available/mikrotik-rb532 index 3ce7ca8f1..53cb7e955 100644 --- a/target/mips/sys-available/mikrotik-rb532 +++ b/target/mips/sys-available/mikrotik-rb532 @@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532 select ADK_TARGET_WITH_MINIPCI select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_NAND + select ADK_TARGET_WITH_PATA select ADK_TARGET_WITH_LEDS help Support for Mikrotik RB532. diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40 index 610a5c64a..b05c5db61 100644 --- a/target/x86/sys-available/ibm-x40 +++ b/target/x86/sys-available/ibm-x40 @@ -8,10 +8,12 @@ config ADK_TARGET_SYSTEM_IBM_X40 select ADK_TARGET_CPU_WITH_SSE2 select ADK_TARGET_CPU_WITH_MTRR select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_CPUFREQ select ADK_TARGET_WITH_USB_BOOT select ADK_TARGET_WITH_CARDBUS select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_PATA select ADK_TARGET_WITH_RTC select ADK_TARGET_WITH_MINIPCI select ADK_TARGET_WITH_HDD |