- revert part of 20119 (renaming BR2_ARM_.ABI to BR2_.ABI) (98175bd4) · Commits · Dom Sekotill / buildroot

target/Config.in.arch

+20 −20

Original line number	Diff line number	Diff line
		@@ -111,13 +111,13 @@ config BR2_ARM_TYPE
		choice
		prompt "Target ABI"
		depends BR2_arm \|\| BR2_armeb
		default BR2_OABI
		default BR2_ARM_OABI
		help
		Application Binary Interface to use

		config BR2_OABI
		config BR2_ARM_OABI
		bool "OABI"
		config BR2_EABI
		config BR2_ARM_EABI
		bool "EABI"
		endchoice

		@@ -150,15 +150,15 @@ endchoice
		choice
		prompt "Target ABI"
		depends BR2_mips \|\| BR2_mipsel
		default BR2_EABI
		default BR2_MIPS_EABI
		help
		Application Binary Interface to use

		config BR2_OABI
		config BR2_MIPS_OABI
		bool "OABI"
		config BR2_EABI
		config BR2_MIPS_EABI
		bool "EABI"
		config BR2_ABI64
		config BR2_MIPS_ABI64
		bool "N64"
		endchoice

		@@ -683,17 +683,17 @@ 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_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 mmixware if BR2_mmix && BR2_ABI_native
		default gnu if BR2_mmix && !BR2_ABI_native
		default altivec if BR2_powerpc && BR2_ABI_altivec
		default no-altivec if BR2_powerpc && BR2_ABI_no-altivec
		default spe if BR2_powerpc && BR2_ABI_spe
		default no-spe if BR2_powerpc && BR2_ABI_no-spe
		default ibmlongdouble if BR2_powerpc && BR2_ABI_ibmlongdouble
		default ieeelongdouble if BR2_powerpc && BR2_ABI_ieeelongdouble
		default 32 if BR2_mipsel && BR2_MIPS_OABI
		default n32 if BR2_mipsel && BR2_MIPS_EABI
		default o64 if BR2_mips && BR2_MIPS_OABI
		default eabi if BR2_mips && BR2_MIPS_EABI
		default 64 if BR2_mips && BR2_MIPS_ABI64
		default mmixware if BR2_mmix && BR2_MMIX_ABI_native
		default gnu if BR2_mmix && !BR2_MMIX_ABI_native
		default altivec if BR2_powerpc && BR2_PPC_ABI_altivec
		default no-altivec if BR2_powerpc && BR2_PPC_ABI_no-altivec
		default spe if BR2_powerpc && BR2_PPC_ABI_spe
		default no-spe if BR2_powerpc && BR2_PPC_ABI_no-spe
		default ibmlongdouble if BR2_powerpc && BR2_PPC_ABI_ibmlongdouble
		default ieeelongdouble if BR2_powerpc && BR2_PPC_ABI_ieeelongdouble

target/device/Arm/Config.in

+3 −5

Original line number	Diff line number	Diff line
		@@ -3,16 +3,15 @@ menuconfig BR2_TARGET_ARM
		depends BR2_arm
		default n

		if BR2_TARGET_ARM
		comment "Arm based Device Support"
		depends BR2_arm
		depends BR2_arm && BR2_TARGET_ARM

		config BR2_TARGET_ARM_INTEGRATOR_926
		bool "Integrator arm926"
		depends BR2_arm
		depends BR2_arm && BR2_TARGET_ARM
		default n
		select BR2_PACKAGE_LINUX
		select BR2_EABI
		select BR2_ARM_EABI
		select BR2_KERNEL_HEADERS_2_6_22
		select BR2_PTHREADS
		select BR2_arm926t
		@@ -20,4 +19,3 @@ config BR2_TARGET_ARM_INTEGRATOR_926
		An ARM integrator 926 board for use with qemu.
		This one has an MMU.

		endif

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_EABI:=y
		BR2_ARM_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_OABI is not set
		BR2_EABI=y
		# BR2_ARM_OABI is not set
		BR2_ARM_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_OABI is not set
		BR2_EABI=y
		# BR2_ARM_OABI is not set
		BR2_ARM_EABI=y
		BR2_ARCH="arm"
		BR2_ENDIAN="LITTLE"
		BR2_GCC_TARGET_TUNE="arm9tdmi"