Commit ff67685e authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

Move BR2_ARM_TYPE to an uClibc specific place 



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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 7a3ceeed

target/Config.in.arch

+0 −21
Original line number Diff line number Diff line
@@ -202,27 +202,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

toolchain/uClibc/Config.in

+24 −0
Original line number Diff line number Diff line
@@ -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

toolchain/uClibc/uclibc.mk

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,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),)