<div dir="ltr"><div><div>Hi Thomas,<br><br></div>Can this patch be merge to upstream? Who is responsible for the merge?<br><br></div>Thanks<br><br>Sonic</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Apr 18, 2013 at 6:06 PM, Sonic Zhang <span dir="ltr"><<a href="mailto:sonic.adi@gmail.com" target="_blank">sonic.adi@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Sonic Zhang <<a href="mailto:sonic.zhang@analog.com">sonic.zhang@analog.com</a>><br>
<br>
Adds the possibility to have a free-form CPU revision string and append it<br>
to the target CPU. Only Blackfin actually uses this option.<br>
<br>
Signed-off-by: Sonic Zhang <<a href="mailto:sonic.zhang@analog.com">sonic.zhang@analog.com</a>><br>
Thomas Petazzoni <<a href="mailto:thomas.petazzoni@free-electrons.com">thomas.petazzoni@free-electrons.com</a>><br>
<br>
---<br>
<br>
v6-changes:<br>
- The cpu revision test should have a $(call qstrip) to be effective.<br>
- Add cpu revision to toolchain/gcc/<a href="http://gcc-uclibc-4.x.mk" target="_blank">gcc-uclibc-4.x.mk</a> as well.<br>
<br>
v3-changes:<br>
- Detail the help text and fix the line length.<br>
---<br>
arch/Config.in | 3 +++<br>
arch/Config.in.bfin | 8 ++++++++<br>
toolchain/gcc/<a href="http://gcc-uclibc-4.x.mk" target="_blank">gcc-uclibc-4.x.mk</a> | 6 +++++-<br>
toolchain/toolchain-external/<a href="http://ext-tool.mk" target="_blank">ext-tool.mk</a> | 4 ++++<br>
4 files changed, 20 insertions(+), 1 deletions(-)<br>
<br>
diff --git a/arch/Config.in b/arch/Config.in<br>
index 27a29c6..175add5 100644<br>
--- a/arch/Config.in<br>
+++ b/arch/Config.in<br>
@@ -174,6 +174,9 @@ config BR2_GCC_TARGET_ABI<br>
config BR2_GCC_TARGET_CPU<br>
string<br>
<br>
+config BR2_GCC_TARGET_CPU_REVISION<br>
+ string<br>
+<br>
# Set up target binary format<br>
choice<br>
prompt "Target Binary Format"<br>
diff --git a/arch/Config.in.bfin b/arch/Config.in.bfin<br>
index ac96620..f755c8d 100644<br>
--- a/arch/Config.in.bfin<br>
+++ b/arch/Config.in.bfin<br>
@@ -97,3 +97,11 @@ config BR2_GCC_TARGET_CPU<br>
default bf548 if BR2_bf548<br>
default bf549 if BR2_bf549<br>
default bf561 if BR2_bf561<br>
+<br>
+config BR2_GCC_TARGET_CPU_REVISION<br>
+ string "Target CPU revision"<br>
+ help<br>
+ Specify a target CPU revision, which will be appended to the<br>
+ value of the -mcpu option. For example, if the selected CPU is<br>
+ bf609, and then selected CPU revision is "0.0", then gcc will<br>
+ receive the -mcpu=bf609-0.0 option.<br>
diff --git a/toolchain/gcc/<a href="http://gcc-uclibc-4.x.mk" target="_blank">gcc-uclibc-4.x.mk</a> b/toolchain/gcc/<a href="http://gcc-uclibc-4.x.mk" target="_blank">gcc-uclibc-4.x.mk</a><br>
index bdc38cd..7fd7bdb 100644<br>
--- a/toolchain/gcc/<a href="http://gcc-uclibc-4.x.mk" target="_blank">gcc-uclibc-4.x.mk</a><br>
+++ b/toolchain/gcc/<a href="http://gcc-uclibc-4.x.mk" target="_blank">gcc-uclibc-4.x.mk</a><br>
@@ -85,7 +85,11 @@ ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)<br>
GCC_WITH_ABI:=--with-abi=$(BR2_GCC_TARGET_ABI)<br>
endif<br>
ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)<br>
-GCC_WITH_CPU:=--with-cpu=$(BR2_GCC_TARGET_CPU)<br>
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)<br>
+GCC_WITH_CPU:=--with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION))<br>
+else<br>
+GCC_WITH_CPU:=--with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU))<br>
+endif<br>
endif<br>
<br>
# AVR32 GCC special configuration<br>
diff --git a/toolchain/toolchain-external/<a href="http://ext-tool.mk" target="_blank">ext-tool.mk</a> b/toolchain/toolchain-external/<a href="http://ext-tool.mk" target="_blank">ext-tool.mk</a><br>
index 92183a4..57ea266 100644<br>
--- a/toolchain/toolchain-external/<a href="http://ext-tool.mk" target="_blank">ext-tool.mk</a><br>
+++ b/toolchain/toolchain-external/<a href="http://ext-tool.mk" target="_blank">ext-tool.mk</a><br>
@@ -134,7 +134,11 @@ TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \<br>
endif<br>
<br>
CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE))<br>
+ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)<br>
CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU))<br>
+else<br>
+CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION))<br>
+endif<br>
CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))<br>
CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.7.0.4<br>
<br>
<br>
_______________________________________________<br>
buildroot mailing list<br>
<a href="mailto:buildroot@busybox.net">buildroot@busybox.net</a><br>
<a href="http://lists.busybox.net/mailman/listinfo/buildroot" target="_blank">http://lists.busybox.net/mailman/listinfo/buildroot</a><br>
</font></span></blockquote></div><br></div>