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

4 files changed, 0 insertions, 46 deletions

diff --git a/target/config/Config.in b/target/config/Config.in
index 10bf89f16..970bd8516 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -193,18 +193,6 @@ config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 
 endchoice
 
-choice
-prompt "Foxboard LX Model"
-depends on ADK_TARGET_SYSTEM_FOXBOARD_LX
-
-config ADK_TARGET_FOXBOARD_MODEL_LX416
-	boolean "Foxboard LX 4x16"
-
-config ADK_TARGET_FOXBOARD_MODEL_LX832
-	boolean "Foxboard LX 8x32"
-
-endchoice
-
 choice 
 prompt "Broadcom BCM47xx Model"
 depends on ADK_TARGET_SYSTEM_BROADCOM_BCM47XX
@@ -378,12 +366,6 @@ config ADK_TARGET_CPU_WITH_3DNOWEXT
 	boolean
 
 # cpu configuration
-config ADK_CPU_CRIS_V10
-	boolean
-
-config ADK_CPU_CRIS_V32
-	boolean
-
 config ADK_CPU_SH4
 	boolean
 
@@ -467,13 +449,10 @@ config ADK_TARGET_CPU_ARCH
 	default "mipsel" if ADK_LINUX_MIPS && ADK_little
 	default "arm" if ADK_LINUX_ARM && ADK_little
 	default "armeb" if ADK_LINUX_ARM && ADK_big
-	default "avr32" if ADK_LINUX_AVR32
 	default "sparc" if ADK_LINUX_SPARC
 	default "sparc64" if ADK_LINUX_SPARC64
 	default "sh4" if ADK_LINUX_SH && ADK_little
 	default "sh4eb" if ADK_LINUX_SH && ADK_big
-	default "cris" if ADK_CPU_CRIS_V10
-	default "crisv32" if ADK_CPU_CRIS_V32
 	default "ppc" if ADK_CPU_PPC
 	default "ppc64" if ADK_CPU_PPC64
 	default "mips64el" if ADK_native && ADK_lemote_yeelong	
@@ -512,8 +491,6 @@ config ADK_TARGET_CFLAGS
 	default "-march=mips32" if ADK_CPU_MIPS32
 	default "-march=mips64" if ADK_CPU_MIPS64
 	default "-march=armv5te -mtune=arm926ej-s" if ADK_CPU_ARMV5
-	default "-march=v32" if ADK_CPU_CRIS_V32
-	default "-march=v10" if ADK_CPU_CRIS_V10
 	default "-march=armv5te -mtune=iwmmxt" if ADK_CPU_XSCALE
 	default "-march=armv6 -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard" if ADK_CPU_RASPBERRY_PI
 
@@ -539,7 +516,6 @@ config ADK_TARGET_CMDLINE
 	default "console=ttyS0" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
-	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default ""
 
 # c library
diff --git a/target/config/Config.in.arch.choice b/target/config/Config.in.arch.choice
index ce58aa2c1..a147a0251 100644
--- a/target/config/Config.in.arch.choice
+++ b/target/config/Config.in.arch.choice
@@ -20,18 +20,6 @@ config ADK_LINUX_ARM
 	help
 	  Support for ARM systems.
 
-config ADK_LINUX_AVR32
-	bool "avr32 system"
-	select ADK_avr32
-	help
-	  Support for AVR32 systems.
-
-config ADK_LINUX_CRIS
-	bool "cris system"
-	select ADK_cris
-	help
-	  Support for CRIS systems.
-
 config ADK_LINUX_M68K
 	bool "m68k system"
 	select ADK_m68k
diff --git a/target/config/Config.in.arch.default b/target/config/Config.in.arch.default
index 737ce525c..43d1e5399 100644
--- a/target/config/Config.in.arch.default
+++ b/target/config/Config.in.arch.default
@@ -5,12 +5,6 @@ config ADK_native
 config ADK_arm
 	bool
 
-config ADK_avr32
-	bool
-
-config ADK_cris
-	bool
-
 config ADK_m68k
 	bool
 
@@ -44,8 +38,6 @@ config ADK_x86
 config ADK_TARGET_ARCH
 	string
 	default "arm"  if ADK_arm
-	default "avr32"  if ADK_avr32
-	default "cris"  if ADK_cris
 	default "m68k"  if ADK_m68k
 	default "microblaze"  if ADK_microblaze
 	default "mips"  if ADK_mips
diff --git a/target/config/Config.in.system.choice b/target/config/Config.in.system.choice
index 8f6f7413f..54e4e621a 100644
--- a/target/config/Config.in.system.choice
+++ b/target/config/Config.in.system.choice
@@ -1,6 +1,4 @@
 source "target/arm/Config.in"
-source "target/avr32/Config.in"
-source "target/cris/Config.in"
 source "target/m68k/Config.in"
 source "target/microblaze/Config.in"
 source "target/mips/Config.in"