Browse Source

cleanup binfmt support, fix m68k build

Waldemar Brodkorb 9 years ago
parent
commit
17558e836e
3 changed files with 7 additions and 11 deletions
  1. 2 10
      target/config/Config.in.binfmt
  2. 0 1
      target/config/Config.in.toolchain
  3. 5 0
      toolchain/elf2flt/Makefile

+ 2 - 10
target/config/Config.in.binfmt

@@ -7,27 +7,19 @@ depends on ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_BFIN |
 
 config ADK_TARGET_BINFMT_ELF
 	bool "ELF"
-	depends on !ADK_TARGET_ARCH_C6X
-	depends on !ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_ARM
+	depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K) && !ADK_TARGET_UCLINUX
 
 config ADK_TARGET_BINFMT_DSBT
 	bool "DSBT"
 	depends on ADK_TARGET_ARCH_C6X
-	depends on !ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_M68K
-	depends on !ADK_TARGET_ARCH_ARM
 
 config ADK_TARGET_BINFMT_FDPIC
 	bool "FDPIC"
 	depends on ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_C6X
-	depends on !ADK_TARGET_ARCH_ARM
 
 config ADK_TARGET_BINFMT_FLAT
 	bool "FLAT"
-	depends on !ADK_TARGET_ARCH_C6X
-	depends on ADK_TARGET_ARCH_ARM && ADK_TARGET_UCLINUX
+	depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K) && ADK_TARGET_UCLINUX
 
 endchoice
 

+ 0 - 1
target/config/Config.in.toolchain

@@ -78,7 +78,6 @@ config ADK_TOOLCHAIN_BINUTILS_2_24
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_CRIS
-	depends on !ADK_TARGET_ARCH_M68K
 
 config ADK_TOOLCHAIN_BINUTILS_GIT
 	bool "git"

+ 5 - 0
toolchain/elf2flt/Makefile

@@ -6,7 +6,12 @@ include Makefile.inc
 include ../rules.mk
 include ${ADK_TOPDIR}/mk/buildhlp.mk
 
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y)
+BINUTILS_VERSION:=	git
+endif
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_24),y)
 BINUTILS_VERSION:=	2.24
+endif
 
 $(WRKBUILD)/.headers:
 $(WRKBUILD)/.configured: