diff options
| -rw-r--r-- | mk/modules.mk | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.audio | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 16 |
4 files changed, 22 insertions, 5 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 52678042c..e8a0821de 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1294,7 +1294,7 @@ $(eval $(call KMOD_template,PCMCIA,pcmcia,\ ,60)) $(eval $(call KMOD_template,SERIAL_8250_CS,serial-8250-cs,\ - $(MODULES_DIR)/kernel/drivers/tty/serial/serial_cs \ + $(MODULES_DIR)/kernel/drivers/tty/serial/8250/serial_cs \ ,70)) # @@ -1743,7 +1743,7 @@ $(eval $(call KMOD_template,PARPORT_PC,parport-pc,\ ,55)) $(eval $(call KMOD_template,PLIP,plip,\ - $(MODULES_DIR)/kernel/drivers/net/plip \ + $(MODULES_DIR)/kernel/drivers/net/plip/plip \ ,60)) # 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..69addd11f 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -21,6 +21,7 @@ config ADK_KERNEL_IOSCHED_CFQ config ADK_KERNEL_SCSI boolean + default y if ADK_TARGET_SYSTEM_IBM_X40 config ADK_KERNEL_BLK_DEV_SD boolean @@ -252,7 +253,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 +268,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.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 |