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

7 files changed, 54 insertions, 28 deletions

diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index 86f38c2dd..90759cea2 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -110,4 +110,16 @@ config ADK_HOST_CYGWIN
 	bool "Cygwin"
 
 endchoice
+
+config ADK_PRELINK
+	prompt "Prelink binaries and libraries in Image"
+	boolean
+	help
+	  Do prelinking for faster loading of binaries.
+
+config ADK_PRELINK_OPTS
+	string "additional options to pass to prelink"
+	default "-mR"
+	depends on ADK_PRELINK
+
 endmenu
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index f41204db4..a1fd577b9 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -81,13 +81,13 @@ config ADK_CPU_CORTEX_A7
 	bool
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_FPU_VFP4
+	select ADK_TARGET_CPU_WITH_FPU_VFPV4
 
 config ADK_CPU_CORTEX_A9
 	bool
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_FPU_VFP3
+	select ADK_TARGET_CPU_WITH_FPU_VFPV3
 
 config ADK_CPU_CORTEX_A53
 	bool
@@ -112,6 +112,21 @@ config ADK_CPU_GEODE
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
+config ADK_CPU_I486
+	bool
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+
+config ADK_CPU_I586
+	bool
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+
+config ADK_CPU_I686
+	bool
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+
 config ADK_CPU_LOONGSON2F
 	bool
 	select ADK_TARGET_WITH_NPTL
@@ -228,17 +243,14 @@ config ADK_TARGET_CPU_WITH_FPU
 config ADK_TARGET_CPU_WITH_FPU_VFP
 	bool
 	select ADK_TARGET_CPU_WITH_FPU
-	select ADK_fpu_vfp
 
-config ADK_TARGET_CPU_WITH_FPU_VFP3
+config ADK_TARGET_CPU_WITH_FPU_VFPV3
 	bool
 	select ADK_TARGET_CPU_WITH_FPU
-	select ADK_fpu_vfp3
 
-config ADK_TARGET_CPU_WITH_FPU_VFP4
+config ADK_TARGET_CPU_WITH_FPU_VFPV4
 	bool
 	select ADK_TARGET_CPU_WITH_FPU
-	select ADK_fpu_vfp4
 
 config ADK_TARGET_CPU_WITH_VT
 	bool
@@ -283,42 +295,45 @@ config ADK_TARGET_GCC_CPU
 	string
 	default "440" if ADK_CPU_PPC_440
 	default "5208" if ADK_CPU_CF_5208
-	default "amdfam10" if ADK_CPU_AMDFAM10
 	default "arc700" if ADK_CPU_ARC700
 	default "arcv2em" if ADK_CPU_ARCv2EM
 	default "arm1176jzf-s" if ADK_CPU_ARM1176JZF_S
 	default "arm926ej-s" if ADK_CPU_ARM926EJ_S
 	default "armv8-a" if ADK_CPU_ARMV8
-	default "athlon" if ADK_CPU_ATHLON
-	default "atom" if ADK_CPU_ATOM
 	default "cortex-a7" if ADK_CPU_CORTEX_A7
 	default "cortex-a9" if ADK_CPU_CORTEX_A9
 	default "cortex-a53" if ADK_CPU_CORTEX_A53
 	default "cortex-a57" if ADK_CPU_CORTEX_A57
 	default "cortex-m3" if ADK_CPU_CORTEX_M3
 	default "cortex-m4" if ADK_CPU_CORTEX_M4
-	default "geode" if ADK_CPU_GEODE
-	default "i486" if ADK_CPU_I486
-	default "i586" if ADK_CPU_I586
-	default "i686" if ADK_CPU_I686
-	default "pentium-m" if ADK_CPU_PENTIUM_M
 	default "powerpc" if ADK_CPU_PPC
 	default "powerpc64" if ADK_CPU_PPC64
 	default "ultrasparc" if ADK_CPU_SPARC_V9
-	default "v10" if ADK_CPU_CRIS_V10
-	default "v32" if ADK_CPU_CRIS_V32
-	default "v7.10.d" if ADK_CPU_MICROBLAZE
 	default "v8" if ADK_CPU_SPARC_V8
-	default "x86-64" if ADK_CPU_X86_64
 	default "xscale" if ADK_CPU_XSCALE
 
 config ADK_TARGET_GCC_ARCH
 	string
+	default "amdfam10" if ADK_CPU_AMDFAM10
+	default "athlon" if ADK_CPU_ATHLON
+	default "atom" if ADK_CPU_ATOM
+	default "geode" if ADK_CPU_GEODE
+	default "i486" if ADK_CPU_I486
+	default "i586" if ADK_CPU_I586
+	default "i686" if ADK_CPU_I686
 	default "loongson2f" if ADK_CPU_LOONGSON2F
 	default "mips32" if ADK_CPU_MIPS32
 	default "mips32r2" if ADK_CPU_MIPS32R2
 	default "mips64" if ADK_CPU_MIPS64
 	default "mips64r2" if ADK_CPU_MIPS64R2
+	default "pentium-m" if ADK_CPU_PENTIUM_M
+	default "x86-64" if ADK_CPU_X86_64
+
+config ADK_TARGET_CPU_FLAGS
+	string
+	default "-mcpu=v10" if ADK_CPU_CRIS_V10
+	default "-mcpu=v32" if ADK_CPU_CRIS_V32
+	default "-mcpu=v7.10.d" if ADK_CPU_MICROBLAZE
 
 config ADK_TARGET_CPU_ARCH
 	string
diff --git a/target/config/Config.in.fpu.default b/target/config/Config.in.fpu.default
index 0fd8f616c..c55b0a602 100644
--- a/target/config/Config.in.fpu.default
+++ b/target/config/Config.in.fpu.default
@@ -4,7 +4,7 @@
 config ADK_TARGET_FPU
 	string
 	depends on ADK_TARGET_ARCH_ARM
-	default "vfp" if ADK_TARGET_CPU_WITH_FPU_VFP
-	default "vfp3" if ADK_TARGET_CPU_WITH_FPU_VFP3
-	default "vfp4" if ADK_TARGET_CPU_WITH_FPU_VFP4
 	default "neon" if ADK_TARGET_CPU_WITH_NEON
+	default "vfp" if ADK_TARGET_CPU_WITH_FPU_VFP
+	default "vfpv3" if ADK_TARGET_CPU_WITH_FPU_VFPV3
+	default "vfpv4" if ADK_TARGET_CPU_WITH_FPU_VFPV4
diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice
index d2cbeb18e..3fc342096 100644
--- a/target/config/Config.in.kernelversion.choice
+++ b/target/config/Config.in.kernelversion.choice
@@ -4,14 +4,14 @@
 choice
 prompt "Kernel Version"
 depends on ADK_TARGET_KERNEL_CUSTOMISING
-default ADK_KERNEL_VERSION_3_18_6
+default ADK_KERNEL_VERSION_3_18_8
 
 config ADK_KERNEL_VERSION_3_19_0
 	bool "3.19"
 	select ADK_KERNEL_VERSION_3_19
 
-config ADK_KERNEL_VERSION_3_18_6
-	bool "3.18.6"
+config ADK_KERNEL_VERSION_3_18_8
+	bool "3.18.8"
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	depends on !ADK_TARGET_ARCH_NIOS2
 	select ADK_KERNEL_VERSION_3_18
diff --git a/target/config/Config.in.kernelversion.default b/target/config/Config.in.kernelversion.default
index ca7eda996..f231d180a 100644
--- a/target/config/Config.in.kernelversion.default
+++ b/target/config/Config.in.kernelversion.default
@@ -28,7 +28,7 @@ config ADK_KERNEL_VERSION_2_6_32
 config ADK_KERNEL_VERSION
 	string
 	default "3.19" if ADK_KERNEL_VERSION_3_19_0
-	default "3.18.6" if ADK_KERNEL_VERSION_3_18_6
+	default "3.18.8" if ADK_KERNEL_VERSION_3_18_8
 	default "3.14.28" if ADK_KERNEL_VERSION_3_14_28
 	default "3.12.37" if ADK_KERNEL_VERSION_3_12_37
 	default "3.10.53" if ADK_KERNEL_VERSION_3_10_53
diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice
index 572beae75..9a3587131 100644
--- a/target/config/Config.in.libc.choice
+++ b/target/config/Config.in.libc.choice
@@ -10,6 +10,7 @@ config ADK_TARGET_LIB_UCLIBC_NG
 	depends on \
 		   !ADK_TARGET_ARCH_AARCH64 && \
 		   !ADK_TARGET_ARCH_ALPHA && \
+		   !ADK_TARGET_ARCH_MICROBLAZE && \
 		   !ADK_TARGET_ARCH_NIOS2 && \
 		   !ADK_TARGET_ARCH_SPARC64 && \
 		   !ADK_TARGET_ARCH_PPC64 && \
diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu
index e7b15818c..2e16341ba 100644
--- a/target/config/Config.in.qemu
+++ b/target/config/Config.in.qemu
@@ -35,8 +35,6 @@ depends on ADK_TARGET_SYSTEM_QEMU_ARM
 config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
 	bool "ARM Ltd. Versatile Express with Cortex-A9"
 	select ADK_CPU_CORTEX_A9
-	select ADK_TARGET_CPU_WITH_FPU
-	select ADK_TARGET_CPU_WITH_FPU_NEON
 
 config ADK_TARGET_QEMU_ARM_MODEL_STELLARIS_M3
 	bool "Stellaris LM3S6965EVB with Cortex-M3"