From bff612fe6e89c5c97242281719962565b743ae3f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 4 Nov 2015 20:17:46 +0100 Subject: xtensa: allow playing with noMMU configuration --- target/config/Config.in.binfmt | 7 ++++--- target/config/Config.in.cpu | 2 -- target/config/Config.in.xtensa | 12 ++++++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) (limited to 'target') diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt index 01a5969b9..ef44ddc95 100644 --- a/target/config/Config.in.binfmt +++ b/target/config/Config.in.binfmt @@ -10,11 +10,12 @@ depends on ADK_TARGET_ARCH_ARM \ || ADK_TARGET_ARCH_H8300 \ || ADK_TARGET_ARCH_LM32 \ || ADK_TARGET_ARCH_M68K \ - || ADK_TARGET_ARCH_SH + || ADK_TARGET_ARCH_SH \ + || ADK_TARGET_ARCH_XTENSA config ADK_TARGET_BINFMT_ELF bool "ELF" - depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K) && ADK_TARGET_WITH_MMU + depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_SH || ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_WITH_MMU config ADK_TARGET_BINFMT_FDPIC bool "FDPIC" @@ -23,7 +24,7 @@ config ADK_TARGET_BINFMT_FDPIC config ADK_TARGET_BINFMT_FLAT bool "FLAT" select ADK_TARGET_UCLINUX if ADK_TARGET_ARCH_BFIN - depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_SH ) && ADK_TARGET_WITHOUT_MMU \ + depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_SH || ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_WITHOUT_MMU \ || ADK_TARGET_ARCH_H8300 || ADK_TARGET_ARCH_LM32 || ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_FRV config ADK_TARGET_BINFMT_DSBT diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 43e0def8f..62bc8e83e 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -669,8 +669,6 @@ config ADK_CPU_XSCALE config ADK_CPU_XTENSA bool - select ADK_TARGET_WITH_NPTL - select ADK_TARGET_WITH_MMU config ADK_CPU_Z900 bool diff --git a/target/config/Config.in.xtensa b/target/config/Config.in.xtensa index 0b831bff5..39d1369eb 100644 --- a/target/config/Config.in.xtensa +++ b/target/config/Config.in.xtensa @@ -10,15 +10,27 @@ config ADK_TARGET_XTENSA_DC233C select ADK_KERNEL_XTENSA_VARIANT_DC233C select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX select ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU + +config ADK_TARGET_XTENSA_DC233C_NOMMU + bool "dc233c-nommu" + select ADK_KERNEL_XTENSA_VARIANT_DC233C + select ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_WITH_LT + select ADK_TARGET_WITHOUT_MMU config ADK_TARGET_XTENSA_DC232B bool "dc232b" select ADK_KERNEL_XTENSA_VARIANT_DC232B select ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU endchoice config ADK_TARGET_XTENSA string default "dc233c" if ADK_TARGET_XTENSA_DC233C + default "dc233c" if ADK_TARGET_XTENSA_DC233C_NOMMU default "dc232b" if ADK_TARGET_XTENSA_DC232B -- cgit v1.2.3