diff options
| -rw-r--r-- | target/linux/config/Config.in.audio | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 23 | ||||
| -rw-r--r-- | target/linux/config/Config.in.crypto | 13 | ||||
| -rw-r--r-- | target/linux/config/Config.in.ethernet | 13 | ||||
| -rw-r--r-- | target/linux/config/Config.in.usb | 3 | ||||
| -rw-r--r-- | target/linux/patches/3.14.4/defaults.patch | 12 |
6 files changed, 27 insertions, 39 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 10aaa690a..6ba4f4842 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -1,5 +1,5 @@ menu "Audio devices support" -depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND +depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND || ADK_TARGET_QEMU config ADK_KERNEL_SND_PCI boolean diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index cf85bad4e..04db38e94 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -22,7 +22,7 @@ config ADK_KERNEL_IOSCHED_CFQ boolean config ADK_KERNEL_SCSI_DMA - boolean + tristate config ADK_KERNEL_SCSI_MULTI_LUN boolean @@ -131,16 +131,6 @@ config ADK_KERNEL_PATA_SC1200 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 @@ -164,7 +154,11 @@ config ADK_KERNEL_ATA_PIIX select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD - depends on ADK_TARGET_SYSTEM_IBM_X40 || ADK_TARGET_QEMU + depends on ADK_TARGET_SYSTEM_IBM_X40 || \ + ADK_TARGET_SYSTEM_QEMU_MIPS || \ + ADK_TARGET_SYSTEM_QEMU_MIPS64 || \ + ADK_TARGET_SYSTEM_QEMU_X86 || \ + ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_IBM_X40 default n help @@ -232,7 +226,10 @@ config ADK_KERNEL_PATA_PXA endmenu menu "SCSI driver support" -depends on ADK_TARGET_WITH_SCSI || ADK_TARGET_QEMU +depends on ADK_TARGET_WITH_SCSI || \ + ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || \ + ADK_TARGET_SYSTEM_QEMU_PPC64 || \ + ADK_TARGET_SYSTEM_QEMU_SPARC config ADK_KERNEL_SCSI_SYM53C8XX_2 prompt "Symbios Logic 53C8XX2 support" diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto index a476679d8..92b488086 100644 --- a/target/linux/config/Config.in.crypto +++ b/target/linux/config/Config.in.crypto @@ -45,7 +45,6 @@ menu "Crypto core / Block and Hash modes" config ADK_KERNEL_CRYPTO_PCOMP tristate select ADK_KERNEL_CRYPTO_PCOMP2 - select ADK_KERNEL_CRYPTO_ALGAPI config ADK_KERNEL_CRYPTO_PCOMP2 tristate @@ -54,6 +53,7 @@ config ADK_KERNEL_CRYPTO_ALGAPI tristate select ADK_KERNEL_CRYPTO select ADK_KERNEL_CRYPTO_ALGAPI2 + select ADK_KERNEL_CRYPTO_MANAGER config ADK_KERNEL_CRYPTO_ALGAPI2 tristate @@ -61,7 +61,6 @@ config ADK_KERNEL_CRYPTO_ALGAPI2 config ADK_KERNEL_CRYPTO_AEAD tristate select ADK_KERNEL_CRYPTO_AEAD2 - select ADK_KERNEL_CRYPTO_ALGAPI config ADK_KERNEL_CRYPTO_AEAD2 tristate @@ -69,7 +68,6 @@ config ADK_KERNEL_CRYPTO_AEAD2 config ADK_KERNEL_CRYPTO_HASH tristate select ADK_KERNEL_CRYPTO_HASH2 - select ADK_KERNEL_CRYPTO_ALGAPI config ADK_KERNEL_CRYPTO_HASH2 tristate @@ -77,7 +75,6 @@ config ADK_KERNEL_CRYPTO_HASH2 config ADK_KERNEL_CRYPTO_BLKCIPHER tristate select ADK_KERNEL_CRYPTO_BLKCIPHER2 - select ADK_KERNEL_CRYPTO_ALGAPI select ADK_KERNEL_CRYPTO_RNG select ADK_KERNEL_CRYPTO_WORKQUEUE @@ -93,10 +90,10 @@ config ADK_KERNEL_CRYPTO_MANAGER config ADK_KERNEL_CRYPTO_MANAGER2 tristate - select ADK_KERNEL_CRYPTO_AEAD2 - select ADK_KERNEL_CRYPTO_HASH2 - select ADK_KERNEL_CRYPTO_BLKCIPHER2 - select ADK_KERNEL_CRYPTO_PCOMP2 + select ADK_KERNEL_CRYPTO_AEAD + select ADK_KERNEL_CRYPTO_HASH + select ADK_KERNEL_CRYPTO_BLKCIPHER + select ADK_KERNEL_CRYPTO_PCOMP config ADK_KERNEL_CRYPTO_AUTHENC prompt "AuthENC (IPsec)" diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index 642049056..8ee2b4b30 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -163,7 +163,7 @@ config ADK_KERNEL_8139CP select ADK_KERNEL_NET_PCI select ADK_KERNEL_NET_VENDOR_REALTEK select ADK_KERNEL_MII - depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU + depends on ADK_TARGET_WITH_PCI || ADK_TARGET_SYSTEM_QEMU_SH4 default y if ADK_TARGET_SYSTEM_QEMU_SH4 default n help @@ -196,7 +196,12 @@ config ADK_KERNEL_E1000 tristate select ADK_KERNEL_NET_VENDOR_INTEL select ADK_KERNEL_NETDEV_1000 - depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU + depends on ADK_TARGET_WITH_PCI || \ + ADK_TARGET_SYSTEM_QEMU_X86 || \ + ADK_TARGET_SYSTEM_QEMU_X86_64 || \ + ADK_TARGET_SYSTEM_QEMU_MIPS || \ + ADK_TARGET_SYSTEM_QEMU_MIPS64 || \ + ADK_TARGET_SYSTEM_QEMU_PPC default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_QEMU_X86 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 @@ -211,7 +216,7 @@ config ADK_KERNEL_SUNLANCE prompt "AMD Sunlance Ethernet driver" tristate select ADK_KERNEL_NET_VENDOR_AMD - depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU + depends on ADK_TARGET_WITH_PCI || ADK_TARGET_SYSTEM_QEMU_SPARC default y if ADK_TARGET_SYSTEM_QEMU_SPARC default n help @@ -221,7 +226,7 @@ config ADK_KERNEL_IBMVETH prompt "IBM Ethernet driver" tristate select ADK_KERNEL_NET_VENDOR_IBM - depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU + depends on ADK_TARGET_WITH_PCI || ADK_TARGET_SYSTEM_QEMU_PPC64 default y if ADK_TARGET_SYSTEM_QEMU_PPC64 default n help diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index ae315190a..21886434d 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -173,6 +173,7 @@ config ADK_KERNEL_USB_CHIPIDEA select ADK_KERNEL_USB_CHIPIDEA_HOST select ADK_KERNEL_USB_GADGET depends on ADK_KERNEL_USB_EHCI_HCD + depends on ADK_TARGET_SYSTEM_CUBOX_I default m if ADK_TARGET_SYSTEM_CUBOX_I default n @@ -216,8 +217,8 @@ config ADK_KERNEL_USB_STORAGE config ADK_KERNEL_SND_USB_AUDIO prompt "Support for USB sound adapter" tristate - select ADK_KERNEL_SND_USB select ADK_KERNEL_SND + select ADK_KERNEL_SND_USB select ADK_KERNEL_SND_RAWMIDI default n diff --git a/target/linux/patches/3.14.4/defaults.patch b/target/linux/patches/3.14.4/defaults.patch index 6cdca084e..f071fd1dd 100644 --- a/target/linux/patches/3.14.4/defaults.patch +++ b/target/linux/patches/3.14.4/defaults.patch @@ -20,18 +20,6 @@ diff -Nur linux-3.0.4.orig/fs/notify/Kconfig linux-3.0.4/fs/notify/Kconfig source "fs/notify/dnotify/Kconfig" source "fs/notify/inotify/Kconfig" -diff -Nur linux-3.11.10.orig/drivers/scsi/Kconfig linux-3.11.10/drivers/scsi/Kconfig ---- linux-3.11.10.orig/drivers/scsi/Kconfig 2013-11-29 19:42:37.000000000 +0100 -+++ linux-3.11.10/drivers/scsi/Kconfig 2013-12-27 19:13:21.000000000 +0100 -@@ -2,7 +2,7 @@ - - config SCSI_MOD - tristate -- default y if SCSI=n || SCSI=y -+ default y if SCSI=y - default m if SCSI=m - - config RAID_ATTRS diff -Nur linux-3.11.10.orig/usr/Kconfig linux-3.11.10/usr/Kconfig --- linux-3.11.10.orig/usr/Kconfig 2013-11-29 19:42:37.000000000 +0100 +++ linux-3.11.10/usr/Kconfig 2013-12-27 19:15:16.000000000 +0100 |