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

8 files changed, 0 insertions, 38 deletions

diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index fb5bf080f..832f76a56 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -347,7 +347,6 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_MD
 	tristate
 	depends on !ADK_KERNEL_BLK_DEV_MD
 	select ADK_KERNEL_MD
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	help
 
 config ADK_KERNEL_MD_RAID0
@@ -385,7 +384,6 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM
 	prompt "kmod-blk-dev-dm................... Device Mapper support"
 	select ADK_KERNEL_MD
 	depends on !ADK_KERNEL_BLK_DEV_DM
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	tristate
 	help
 	  Device-mapper is a low level volume manager.  It works by allowing
@@ -433,7 +431,6 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DRBD
 	tristate
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_CONNECTOR
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	help
           DRBD - http://www.drbd.org
           
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index cea0198d1..6236b329b 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -90,7 +90,6 @@ config ADK_KPACKAGE_KMOD_OPROFILE
 	prompt "kernel support for oprofile"
 	tristate
 	select ADK_KERNEL_PROFILING
-	depends on !ADK_LINUX_CRIS
 	depends on !ADK_LINUX_M68K
 	default n
 	help
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index a764e7491..85065c093 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -199,7 +199,6 @@ config ADK_KERNEL_XFS_FS
 	prompt "xfs............................... XFS filesystem support (kernel)"
 	boolean
 	select ADK_KERNEL_EXPORTFS
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX && !ADK_LINUX_AVR32
 	default n
 
 config ADK_KPACKAGE_KMOD_XFS_FS
@@ -209,7 +208,6 @@ config ADK_KPACKAGE_KMOD_XFS_FS
 	select ADK_KPACKAGE_KMOD_CRYPTO_CRC32C
 	select ADK_KERNEL_BLOCK
 	depends on !ADK_KERNEL_XFS_FS
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX && !ADK_LINUX_AVR32
 	default n
 	help
 	  XFS is a high performance journaling filesystem which originated
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index c2516c27d..ac66ab230 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -145,7 +145,6 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	select ADK_KERNEL_INPUT_MOUSEDEV
 	select ADK_KERNEL_INPUT_MOUSE
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
-        depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_TARGET_WITH_USB
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_QEMU_SH4
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 4082d79e7..785ae6475 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -4,24 +4,6 @@ config ADK_KERNEL_STAGING
 config ADK_KERNEL_EXPERIMENTAL
 	boolean
 
-config ADK_KERNEL_ETRAX_MTD_SIZE
-        hex
-        depends on ADK_TARGET_SYSTEM_FOXBOARD_LX
-        default "0x00400000" if ADK_TARGET_FOXBOARD_MODEL_LX416
-        default "0x00800000" if ADK_TARGET_FOXBOARD_MODEL_LX832
-
-config ADK_KERNEL_ETRAX_DRAM_SIZE
-        int
-        depends on ADK_TARGET_SYSTEM_FOXBOARD_LX
-        default "16" if ADK_TARGET_FOXBOARD_MODEL_LX416
-        default "32" if ADK_TARGET_FOXBOARD_MODEL_LX832
-
-config ADK_KERNEL_ETRAX_DEF_R_SDRAM_TIMING
-        hex
-        depends on ADK_TARGET_SYSTEM_FOXBOARD_LX
-        default "0x80608002" if ADK_TARGET_FOXBOARD_MODEL_LX416
-        default "0x80008002" if ADK_TARGET_FOXBOARD_MODEL_LX832
-
 config ADK_KERNEL_BLK_DEV_INITRD
 	boolean
 
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index b2eb73b57..d7d7ae013 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -443,7 +443,6 @@ config ADK_KPACKAGE_KMOD_HOSTAP
 	tristate
 	select ADK_KPACKAGE_KMOD_MAC80211
 	default n
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_TARGET_WITH_PCMCIA
 	help
 	  HostAP Driver for wireless chips.
@@ -462,7 +461,6 @@ config ADK_KPACKAGE_KMOD_RTL8187
 	prompt "kmod-rtl8187................. Realtek RTL8187/RTL8187B wireless cards"
 	tristate
 	depends on ADK_TARGET_WITH_USB
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	select ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KPACKAGE_KMOD_EEPROM_93CX6
 	default n
diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems
index 239f3495e..aa707cd91 100644
--- a/target/linux/config/Config.in.systems
+++ b/target/linux/config/Config.in.systems
@@ -75,7 +75,3 @@ config ADK_KERNEL_CPU_BIG_ENDIAN
 
 config ADK_KERNEL_CPU_LITTLE_ENDIAN
 	boolean
-
-# cris systems
-config ADK_KERNEL_ETRAXFS
-	boolean
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index e2e3051da..53413abde 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -44,7 +44,6 @@ config ADK_KPACKAGE_KMOD_USB
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	default y if ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 	help
@@ -83,7 +82,6 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_KERNEL_USB_UHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
@@ -107,7 +105,6 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	#depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
@@ -134,7 +131,6 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 	help
@@ -149,7 +145,6 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 	help
@@ -173,7 +168,6 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on !ADK_KERNEL_USB_EHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on ADK_KPACKAGE_KMOD_USB
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
@@ -211,7 +205,6 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 config ADK_PACKAGE_KMOD_USB_CONTROLLER
 	tristate
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	default y if ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n