diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 08:24:06 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 08:24:06 +0100 |
commit | 4ac8527c290ad1dd0fa622097e90b3858e42e847 (patch) | |
tree | ea8c7a980a5fcd92a9104fd2d99a8ccc0f1e5c80 /target/linux | |
parent | 186c1bd82b6a6a1b0fcd64456088ca50e37784d5 (diff) | |
parent | a4d9f84daa3c1d5195daf4e85cdc5d2fc1a98d5e (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/config/Config.in.audio | 3 | ||||
-rw-r--r-- | target/linux/config/Config.in.block | 48 | ||||
-rw-r--r-- | target/linux/config/Config.in.debug | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.flash | 15 | ||||
-rw-r--r-- | target/linux/config/Config.in.netdevice | 16 |
5 files changed, 77 insertions, 7 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index cc84914d2..a1a5077e6 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -120,12 +120,13 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835 config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S prompt "kmod-snd-bcm2708-soc-i2s...... ALSA SOC I2S Raspberry PI" + tristate select ADK_KPACKAGE_KMOD_SND select ADK_KERNEL_SND_ARM select ADK_KPACKAGE_KMOD_SND_SOC select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE select ADK_KPACKAGE_KMOD_SND_COMPRESS - boolean + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 0d1a28125..dd7c96dc5 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -21,6 +21,10 @@ config ADK_KERNEL_IOSCHED_CFQ config ADK_KERNEL_SCSI boolean + default y if ADK_TARGET_SYSTEM_IBM_X40 + +config ADK_KERNEL_SCSI_DMA + boolean config ADK_KERNEL_BLK_DEV_SD boolean @@ -71,7 +75,48 @@ config ADK_KERNEL_MMC_SDHCI_PLTFM config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA boolean +config ADK_KERNEL_ATA_PIIX + 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 + boolean + config ADK_KERNEL_SCSI_SYM53C8XX_2 + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + boolean + +config ADK_KERNEL_SCSI_IBMVSCSI + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + boolean + +config ADK_KERNEL_SCSI_SUNESP + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + boolean + +config ADK_KERNEL_PATA_MACIO + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_ATA_BMDMA + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + boolean + +config ADK_KERNEL_PATA_PLATFORM + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_ATA_BMDMA + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD boolean config ADK_KERNEL_PATA_PCMCIA @@ -252,7 +297,6 @@ config ADK_KPACKAGE_KMOD_SCSI select ADK_KERNEL_LSF select ADK_KERNEL_IOSCHED_AS depends on !ADK_KERNEL_SCSI - depends on !ADK_KERNEL_SATA_AHCI tristate help If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or @@ -268,7 +312,7 @@ config ADK_KPACKAGE_KMOD_SCSI config ADK_KPACKAGE_KMOD_BLK_DEV_SD prompt "kmod-scsi-disk.................... SCSI disk support" - select ADK_KPACKAGE_KMOD_SCSI + select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI depends on !ADK_KERNEL_BLK_DEV_SD tristate help diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 80387c627..23c0bd8d2 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -34,7 +34,7 @@ config ADK_KERNEL_PRINTK boolean select ADK_KERNEL_EARLY_PRINTK default y - depends on !ADK_PKG_TEST + #depends on !ADK_PKG_TEST help Disable printk to save space and quieten bootup. diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index 773c518e8..d8f4faf0f 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -87,8 +87,19 @@ config ADK_KERNEL_MTD_OF_PARTS default n config ADK_KERNEL_MTD_M25P80 + select ADK_KERNEL_BLOCK + select ADK_KERNEL_MTD + select ADK_KERNEL_MTD_PARTITIONS + select ADK_KERNEL_MTD_CHAR + select ADK_KERNEL_MTD_BLKDEVS + select ADK_KERNEL_MTD_BLOCK + select ADK_KERNEL_MTD_ROOTFS_ROOT_DEV + select ADK_KERNEL_MTD_CFI + select ADK_KERNEL_MTD_GEN_PROBE + select ADK_KERNEL_MTD_PHYSMAP + select ADK_KERNEL_MTD_PHYSMAP_OF + select ADK_KERNEL_MTD_OF_PARTS boolean - default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 default n config ADK_KERNEL_MTD_AR2315 @@ -129,8 +140,6 @@ config ADK_TARGET_MTD select ADK_KERNEL_MTD_CFI select ADK_KERNEL_MTD_GEN_PROBE select ADK_KERNEL_MTD_PHYSMAP - select ADK_KERNEL_MTD_PHYSMAP_OF if ADK_LINUX_MICROBLAZE - select ADK_KERNEL_MTD_OF_PARTS if ADK_LINUX_MICROBLAZE default y if ADK_TARGET_WITH_MTD default n diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 7aabc0b7e..62479c2cb 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -7,6 +7,18 @@ config ADK_KERNEL_NETDEVICES config ADK_KERNEL_NET_ETHERNET boolean +config ADK_KERNEL_NET_VENDOR_NATSEMI + boolean + +config ADK_KERNEL_NET_VENDOR_8390 + boolean + +config ADK_KERNEL_NET_VENDOR_REALTEK + boolean + +config ADK_KERNEL_NET_VENDOR_MARVELL + boolean + config ADK_KERNEL_PHYLIB boolean @@ -151,6 +163,8 @@ config ADK_KPACKAGE_KMOD_NE2K_PCI select ADK_KERNEL_NETDEVICES 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 default n help @@ -173,6 +187,7 @@ config ADK_KPACKAGE_KMOD_8139CP select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NET_VENDOR_REALTEK select ADK_KERNEL_MII default n help @@ -220,6 +235,7 @@ config ADK_KPACKAGE_KMOD_SKY2 select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 + select ADK_KERNEL_NET_VENDOR_MARVELL depends on !ADK_KERNEL_SKY2 default n help |