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

4 files changed, 49 insertions, 1 deletions

diff --git a/target/arm/kernel/qemu-arm-stellaris-m3 b/target/arm/kernel/qemu-arm-stellaris-m3
new file mode 100644
index 000000000..c6256088e
--- /dev/null
+++ b/target/arm/kernel/qemu-arm-stellaris-m3
@@ -0,0 +1,16 @@
+CONFIG_ARM=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_ARCH_REALVIEW=y
+CONFIG_MACH_REALVIEW_EB=y
+CONFIG_CPU_32=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v7M=y
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_NVIC=y
+CONFIG_KUSER_HELPERS=y
+CONFIG_ARM_AMBA=y
+CONFIG_USE_OF=y
+CONFIG_ATAGS=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt
index f8e233c95..3183d7b5d 100644
--- a/target/config/Config.in.binfmt
+++ b/target/config/Config.in.binfmt
@@ -3,26 +3,55 @@
 
 choice
 prompt "Binary Format"
-depends on ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_C6X
+depends on ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_C6X
 
 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
 
 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
+
+endchoice
+
+# Set up flat binary type
+choice
+prompt "FLAT Binary type"
+depends on ADK_TARGET_BINFMT_FLAT
+default ADK_TARGET_BINFMT_FLAT_ONE
+
+config ADK_TARGET_BINFMT_FLAT_ONE
+        bool "One memory region"
+        help
+          All segments are linked into one memory region.
+
+config ADK_TARGET_BINFMT_FLAT_SEP_DATA
+        bool "Separate data and code region"
+        help
+          Allow for the data and text segments to be separated and placed in
+          different regions of memory.
+
+config ADK_TARGET_BINFMT_FLAT_SHARED
+        bool "Shared binary"
+        select ADK_TARGET_BINFMT_SUPPORTS_SHARED
+        help
+          Allow to load and link indiviual FLAT binaries at run time.
 
 endchoice
diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel
index 54978914c..217541198 100644
--- a/target/config/Config.in.kernel
+++ b/target/config/Config.in.kernel
@@ -36,6 +36,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-microblaze-ml605" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
 	default "qemu-aarch64" if ADK_TARGET_SYSTEM_QEMU_AARCH64
 	default "qemu-arm-versatilepb" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
+	default "qemu-arm-stellaris-m3" if ADK_TARGET_QEMU_ARM_MODEL_STELLARIS_M3
 	default "qemu-arm-vexpress-a9" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
 	default "qemu-arm-spitz" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	default "qemu-arm-terrier" if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default
index 80f933575..7e2316cd4 100644
--- a/target/config/Config.in.libc.default
+++ b/target/config/Config.in.libc.default
@@ -33,6 +33,8 @@ config ADK_LIBC_VERSION
 
 config ADK_TARGET_WITH_NPTL
 	boolean
+	default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM && ADK_TARGET_UCLINUX
+	default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_ARM && ADK_TARGET_UCLINUX
 	default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_AVR32
 	default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_AVR32
 	default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_CRIS