Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 47 insertions, 6 deletions

diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index a145ea217..64d9e9f3f 100644
--- a/target/linux/config/Config.in.cpu
+++ b/target/linux/config/Config.in.cpu
@@ -6,3 +6,8 @@ config ADK_KERNEL_MPENTIUMM
 
 config ADK_KERNEL_MGEODE_LX
 	boolean
+
+config ADK_KERNEL_MTRR
+	boolean
+	default y if ADK_TARGET_CPU_WITH_MTRR
+	default n
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 122827bde..b6834005f 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -44,6 +44,7 @@ config ADK_KERNEL_FB_GEODE_LX
 	select ADK_KERNEL_FB_GEODE
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
  	default n
+	depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
  	help
 	 Framebuffer support for ALIX boards with VGA.
 
@@ -59,6 +60,7 @@ config ADK_HARDWARE_GRAPHICS_INTEL_I915
 	select ADK_KERNEL_DRM_I915
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
+	depends on ADK_TARGET_SYSTEM_IBM_X40
 	help
           AGP/DRM/KMS support for Intel chipset i915.
 	
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index 4ca6883e1..f936f39be 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -32,6 +32,7 @@ config ADK_KERNEL_RTC_DRV_AT91SAM9
 	select ADK_KERNEL_RTC_INTF_DEV
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default n
+	depends on ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	help
  	  Fox G20 RTC support.
 
@@ -54,6 +55,7 @@ config ADK_KPACKAGE_KMOD_SCx200_ACB
 	select ADK_KERNEL_I2C
 	select ADK_KERNEL_I2C_CHARDEV
 	default n
+	depends on ADK_CPU_GEODE
 	help
 	  I2C driver for Geode boards.
 
@@ -66,7 +68,7 @@ config ADK_KPACKAGE_KMOD_PARPORT
 	  Kernel module for generic parallel port support.
 
 config ADK_KPACKAGE_KMOD_PARPORT_PC
-	prompt "kmod-parport-pc................... PC style parallel port support"
+	prompt "kmod-parport-pc................. PC style parallel port support"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_PARPORT
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index c33b10868..40573a78f 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -1,4 +1,5 @@
 menu "Network devices support"
+comment "Ethernet network driver for target system is included into kernel"
 
 config ADK_KERNEL_NETDEVICES
 	boolean
@@ -93,6 +94,35 @@ config ADK_KERNEL_B44
 	default n
 	help
 
+config ADK_KERNEL_E1000
+	boolean
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_NETDEV_1000
+	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
+	default n
+	help
+
+config ADK_KERNEL_SKY2
+	boolean
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_NETDEV_1000
+	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2
+	default n
+	help
+
+config ADK_KERNEL_R8169
+	boolean
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_NETDEV_1000
+	default y if ADK_TARGET_SYSTEM_OVH_RPS
+	default n
+	help
+
 menu "Ethernet card support"
 depends on ADK_TARGET_WITH_PCI
 
@@ -156,9 +186,7 @@ config ADK_KPACKAGE_KMOD_E1000
 	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NETDEV_1000
-	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
+	depends on !ADK_KERNEL_E1000
 	default n
 	help
 	  This driver supports Intel(R) PRO/1000 gigabit ethernet family of
@@ -173,7 +201,7 @@ config ADK_KPACKAGE_KMOD_SKY2
 	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NETDEV_1000
-	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2
+	depends on !ADK_KERNEL_SKY2
 	default n
 	help
 
@@ -183,7 +211,7 @@ config ADK_KPACKAGE_KMOD_R8169
 	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NETDEV_1000
-	default y if ADK_TARGET_SYSTEM_OVH_RPS
+	depends on !ADK_KERNEL_R8169
 	default n
 	help
 
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog
index 914099d0c..69e54e129 100644
--- a/target/linux/config/Config.in.watchdog
+++ b/target/linux/config/Config.in.watchdog
@@ -22,6 +22,7 @@ config ADK_KERNEL_SCx200_WDT
 	select ADK_KERNEL_SCx200
 	default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	default n
+	depends on ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	help
 	  Natsemi Watchdog (scx200)
 
@@ -31,6 +32,7 @@ config ADK_KERNEL_AT91SAM9X_WATCHDOG
 	select ADK_KERNEL_WATCHDOG
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default n
+	depends on ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	help
 	  AT91SAM9X Watchdog.
 
@@ -40,6 +42,7 @@ config ADK_KERNEL_AR7_WDT
 	select ADK_KERNEL_WATCHDOG
 	default y if ADK_TARGET_SYSTEM_LINKSYS_AG241
 	default n
+	depends on ADK_TARGET_SYSTEM_LINKSYS_AG241
 	help
 	  AR7 Watchdog.
 
@@ -54,6 +57,7 @@ config ADK_KERNEL_GEODE_WDT
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default n
+	depends on ADK_CPU_GEODE
 	help
 	 Geode watchdog.