[Buildroot] [pull request] Pull request for branch uclibc-arch-type-cleanup

[Buildroot] [pull request] Pull request for branch uclibc-arch-type-cleanup

[Thomas Petazzoni]

Hello,

Here is a simple patch set that moves BR2_ARM_TYPE and BR2_SPARC_TYPE
to a uClibc-specific place, since those are uClibc specific.

Thomas

The following changes since commit 27045cde7d18f6132ab804ed30673e3fb3961879:

  gcc: default to 4.6.x (2012-09-04 13:28:03 +0200)

are available in the git repository at:

  git://git.free-electrons.com/users/thomas-petazzoni/buildroot.git uclibc-arch-type-cleanup

for you to fetch changes up to 10451abfa0e2d9ad6d322ec73a726bf520c4c46e:

  Move BR2_SPARC_TYPE to an uClibc specific place (2012-09-04 15:48:24 +0200)

----------------------------------------------------------------
Thomas Petazzoni (2):
      Move BR2_ARM_TYPE to an uClibc specific place
      Move BR2_SPARC_TYPE to an uClibc specific place

 target/Config.in.arch      |   26 --------------------------
 toolchain/uClibc/Config.in |   30 ++++++++++++++++++++++++++++++
 toolchain/uClibc/uclibc.mk |    4 ++--
 3 files changed, 32 insertions(+), 28 deletions(-)

Thanks,
-- 
Thomas Petazzoni

[Buildroot] [PATCH 1/2] Move BR2_ARM_TYPE to an uClibc specific place

[Thomas Petazzoni]

BR2_ARM_TYPE is a hidden configuration option that is only used for
the configuration of uClibc, therefore, we move it from
target/Config.arch.in to toolchain/uClibc/Config.in.

We also add a comment that explains that this stuff is only useful for
uClibc <= 0.9.32. Starting from 0.9.33, uClibc build process simply
uses the compiler flags to find the ARM processor that should be
used. So, someday, we'll be able to remove this.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 target/Config.in.arch      |   21 ---------------------
 toolchain/uClibc/Config.in |   24 ++++++++++++++++++++++++
 toolchain/uClibc/uclibc.mk |    2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 342066e..482da6e 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -186,27 +186,6 @@ config BR2_iwmmxt
 	bool "iwmmxt"
 endchoice
 
-config BR2_ARM_TYPE
-	string
-	default GENERIC_ARM	if BR2_generic_arm
-	default ARM610		if BR2_arm610
-	default ARM710		if BR2_arm710
-	default ARM7TDMI	if BR2_arm7tdmi
-	default ARM720T		if BR2_arm720t
-	default ARM920T		if BR2_arm920t
-	default ARM922T		if BR2_arm922t
-	default ARM926T		if BR2_arm926t
-	default ARM10T		if BR2_arm10t
-	default ARM1136JF_S	if BR2_arm1136jf_s
-	default ARM1176JZ_S	if BR2_arm1176jz_s
-	default ARM1176JZF_S	if BR2_arm1176jzf_s
-	default ARM_SA110	if BR2_sa110
-	default ARM_SA1100	if BR2_sa1100
-	default ARM_XSCALE	if BR2_xscale
-	default ARM_IWMMXT	if BR2_iwmmxt
-	default ARM_CORTEXA8	if BR2_cortex_a8
-	default ARM_CORTEXA9	if BR2_cortex_a9
-
 choice
 	prompt "Target ABI"
 	depends on BR2_arm || BR2_armeb
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index d8b8a2a..fbe617a 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -74,3 +74,27 @@ config BR2_UCLIBC_INSTALL_TEST_SUITE
 
 	  This is not needed at all for normal builds, so you can safely say no
 	  if you do not plan to dig into your C library.
+
+# This is only useful for uClibc <= 0.9.32. It can be removed once
+# Buildroot will support only uClibc >= 0.9.33 on ARM.
+config BR2_UCLIBC_ARM_TYPE
+	string
+	depends on BR2_arm || BR2_armeb
+	default GENERIC_ARM	if BR2_generic_arm
+	default ARM610		if BR2_arm610
+	default ARM710		if BR2_arm710
+	default ARM7TDMI	if BR2_arm7tdmi
+	default ARM720T		if BR2_arm720t
+	default ARM920T		if BR2_arm920t
+	default ARM922T		if BR2_arm922t
+	default ARM926T		if BR2_arm926t
+	default ARM10T		if BR2_arm10t
+	default ARM1136JF_S	if BR2_arm1136jf_s
+	default ARM1176JZ_S	if BR2_arm1176jz_s
+	default ARM1176JZF_S	if BR2_arm1176jzf_s
+	default ARM_SA110	if BR2_sa110
+	default ARM_SA1100	if BR2_sa1100
+	default ARM_XSCALE	if BR2_xscale
+	default ARM_IWMMXT	if BR2_iwmmxt
+	default ARM_CORTEXA8	if BR2_cortex_a8
+	default ARM_CORTEXA9	if BR2_cortex_a9
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 9d0b6db..da4719a 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -63,7 +63,7 @@ else
 UCLIBC_NOT_TARGET_ENDIAN:=LITTLE
 endif
 
-UCLIBC_ARM_TYPE:=CONFIG_$(call qstrip,$(BR2_ARM_TYPE))
+UCLIBC_ARM_TYPE:=CONFIG_$(call qstrip,$(BR2_UCLIBC_ARM_TYPE))
 UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(call qstrip,$(BR2_SPARC_TYPE))
 
 ifeq ($(GENERATE_LOCALE),)
-- 
1.7.9.5

[Buildroot] [PATCH 2/2] Move BR2_SPARC_TYPE to an uClibc specific place

[Thomas Petazzoni]

BR2_SPARC_TYPE is a hidden configuration option that is only used for
the configuration of uClibc, therefore, we move it from
target/Config.arch.in to toolchain/uClibc/Config.in.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 target/Config.in.arch      |    5 -----
 toolchain/uClibc/Config.in |    6 ++++++
 toolchain/uClibc/uclibc.mk |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/target/Config.in.arch b/target/Config.in.arch
index 482da6e..d0b1c02 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -488,11 +488,6 @@ config BR2_sparc_tsc701
 	bool "tsc701"
 endchoice
 
-config BR2_SPARC_TYPE
-	string
-	default V7	if BR2_sparc_v7 || BR2_sparc_cypress || BR2_sparc_sparclite || BR2_sparc_f930 || BR2_sparc_f934 || BR2_sparc_sparclite86x || BR2_sparc_sparclet || BR2_sparc_tsc701 || BR2_sparc_sparchfleon || BR2_sparc_sparcsfleon
-	default V8	if BR2_sparc_v8 || BR2_sparc_supersparc || BR2_sparc_hypersparc || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleonv8
-
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_xtensa
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index fbe617a..f46a415 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -98,3 +98,9 @@ config BR2_UCLIBC_ARM_TYPE
 	default ARM_IWMMXT	if BR2_iwmmxt
 	default ARM_CORTEXA8	if BR2_cortex_a8
 	default ARM_CORTEXA9	if BR2_cortex_a9
+
+config BR2_UCLIBC_SPARC_TYPE
+	string
+	depends on BR2_sparc
+	default V7	if BR2_sparc_v7 || BR2_sparc_cypress || BR2_sparc_sparclite || BR2_sparc_f930 || BR2_sparc_f934 || BR2_sparc_sparclite86x || BR2_sparc_sparclet || BR2_sparc_tsc701 || BR2_sparc_sparchfleon || BR2_sparc_sparcsfleon
+	default V8	if BR2_sparc_v8 || BR2_sparc_supersparc || BR2_sparc_hypersparc || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleonv8
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index da4719a..2cf9945 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -64,7 +64,7 @@ UCLIBC_NOT_TARGET_ENDIAN:=LITTLE
 endif
 
 UCLIBC_ARM_TYPE:=CONFIG_$(call qstrip,$(BR2_UCLIBC_ARM_TYPE))
-UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(call qstrip,$(BR2_SPARC_TYPE))
+UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(call qstrip,$(BR2_UCLIBC_SPARC_TYPE))
 
 ifeq ($(GENERATE_LOCALE),)
 # We need at least one locale
-- 
1.7.9.5

[Buildroot] [pull request] Pull request for branch uclibc-arch-type-cleanup

[Yann E. MORIN]

Thomas, All,

On Tuesday 04 September 2012 15:49:42 Thomas Petazzoni wrote:
> Here is a simple patch set that moves BR2_ARM_TYPE and BR2_SPARC_TYPE
> to a uClibc-specific place, since those are uClibc specific.

This series will come clashing with your reorganising you sent later.

What's your plan with those two? Apply this series first, or the other one?

I personaly think we should work on the other series first, then add this
one after. You could probably aggregate those two series as a single one.

Regards,
Yann E. MORIN.

PS. Reviewing takes time! I used my whole evening reviewing those two series!
Pfew... ;-)

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [pull request] Pull request for branch uclibc-arch-type-cleanup

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Hello,
 Thomas> Here is a simple patch set that moves BR2_ARM_TYPE and BR2_SPARC_TYPE
 Thomas> to a uClibc-specific place, since those are uClibc specific.

Committed both, thanks.

-- 
Bye, Peter Korsgaard