Commit 3de7a21b authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- add mips/mipsel target architecture selection 

- rename BR2_ARM_[EO]ABI to the commonly used BR2_[EO]ABI
parent 7a478629

target/Config.in.arch

+46 −5
Original line number Diff line number Diff line
@@ -111,16 +111,57 @@ config BR2_ARM_TYPE 
choice

	prompt "Target ABI"

	depends BR2_arm || BR2_armeb

	default BR2_ARM_OABI

	default BR2_OABI

	help

	  Application Binary Interface to use



config BR2_ARM_OABI

config BR2_OABI

	bool "OABI"

config BR2_ARM_EABI

config BR2_EABI

	bool "EABI"

endchoice



choice

	prompt "Target Architecture Variant"

	depends BR2_mips || BR2_mipsel

	default BR2_mips_3

	help

	  Specific CPU variant to use



config BR2_mips_1

	bool "mips 1"

config BR2_mips_2

	bool "mips 2"

config BR2_mips_3

	bool "mips 3"

config BR2_mips_4

	bool "mips 4"

config BR2_mips_32

	bool "mips 32"

config BR2_mips_32r2

	bool "mips 32r2"

config BR2_mips_64

	bool "mips 64"

config BR2_mips16_

	bool "mips 16"

endchoice





choice

	prompt "Target ABI"

	depends BR2_mips || BR2_mipsel

	default BR2_EABI

	help

	  Application Binary Interface to use



config BR2_OABI

	bool "OABI"

config BR2_EABI

	bool "EABI"

config BR2_ABI64

	bool "N64"

endchoice



choice

	prompt "Target Architecture Variant"

	depends BR2_avr32
@@ -642,11 +683,11 @@ config BR2_GCC_TARGET_ABI 
	default aapcs		if BR2_arm_dunno

	default aapcs-linux	if BR2_arm_dunno

	default iwmmxt		if BR2_iwmmxt

	default 32		if BR2_mipsel && BR2_OABI

	default 32		if (BR2_mipsel || BR2_arm) && BR2_OABI

	default n32		if BR2_mipsel && BR2_EABI

	default o64		if BR2_mips && BR2_OABI

	default eabi		if (BR2_mips || BR2_arm) && BR2_EABI

	default 64		if BR2_mips && BR2_ABI64

	default eabi		if BR2_mips && BR2_EABI

	default mmixware	if BR2_mmix && BR2_ABI_native

	default gnu		if BR2_mmix && !BR2_ABI_native

	default altivec		if BR2_powerpc && BR2_ABI_altivec

target/device/Arm/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ config BR2_TARGET_ARM_INTEGRATOR_926 
	depends BR2_arm

	default n

	select BR2_PACKAGE_LINUX

	select BR2_ARM_EABI

	select BR2_KERNEL_HEADERS_2_6_20

	select BR2_EABI

	select BR2_KERNEL_HEADERS_2_6_22

	select BR2_PTHREADS

	select BR2_arm926t

	help

target/device/Arm/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ UCLIBC_CONFIG_FILE:=target/device/Arm/uClibc.integrator926.config 
endif



# pin some settings

BR2_ARM_EABI:=y

BR2_EABI:=y

BR2_GNU_TARGET_SUFFIX:="linux-uclibcgnueabi"

BR2_DEFAULT_KERNEL_HEADERS:="2.6.22.8"

endif

target/device/Arm/integrator926_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ BR2_arm926t=y 
# BR2_xscale is not set

# BR2_iwmmxt is not set

BR2_ARM_TYPE="ARM926T"

# BR2_ARM_OABI is not set

BR2_ARM_EABI=y

# BR2_OABI is not set

BR2_EABI=y

# BR2_x86_i386 is not set

# BR2_x86_i486 is not set

# BR2_x86_i586 is not set

target/device/Arm/integrator926_huge_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ BR2_arm926t=y 
# BR2_xscale is not set

# BR2_iwmmxt is not set

BR2_ARM_TYPE="ARM926T"

# BR2_ARM_OABI is not set

BR2_ARM_EABI=y

# BR2_OABI is not set

BR2_EABI=y

BR2_ARCH="arm"

BR2_ENDIAN="LITTLE"

BR2_GCC_TARGET_TUNE="arm9tdmi"