diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-04 17:35:51 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-04 17:36:36 -0600 |
| commit | 17558e836e59c9f9835a5fc832b6b86f7035d676 (patch) | |
| tree | 3e031fa6d0865c97c3a00e3eef330ca2606adc92 | |
| parent | cbd2032b723edbde536f013a55eaf8139236b1ac (diff) | |
cleanup binfmt support, fix m68k build
| -rw-r--r-- | target/config/Config.in.binfmt | 12 | ||||
| -rw-r--r-- | target/config/Config.in.toolchain | 1 | ||||
| -rw-r--r-- | toolchain/elf2flt/Makefile | 5 |
3 files changed, 7 insertions, 11 deletions
diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt index 3183d7b5d..88c875d84 100644 --- a/target/config/Config.in.binfmt +++ b/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 diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 670833009..bff7e3d9e 100644 --- a/target/config/Config.in.toolchain +++ b/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" diff --git a/toolchain/elf2flt/Makefile b/toolchain/elf2flt/Makefile index a42398a3e..0b07d4dc0 100644 --- a/toolchain/elf2flt/Makefile +++ b/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: |