From 4b0d5a80f8b38bf9a264584ffc90b901f82c8cbb Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 26 Sep 2007 21:12:38 +0000 Subject: - revert some bad checkins, fixup bad settings in atmel targets and move the gcc target abi back to a place where the other arch-specific settings live --- target/Config.in | 4 +-- target/arch.in | 33 +++++++++++++++++++++++ target/device/Atmel/Config.in | 26 +++++++++--------- target/device/Config.in | 4 ++- target/device/Toolchain.in | 62 ++++++++++++++++++++++++++++++------------- 5 files changed, 93 insertions(+), 36 deletions(-) (limited to 'target') diff --git a/target/Config.in b/target/Config.in index a9d5c3537..2ca190c9c 100644 --- a/target/Config.in +++ b/target/Config.in @@ -1,4 +1,4 @@ -menu "Target Options" +menu "Target filesystem options" comment "filesystem for target device" @@ -47,5 +47,3 @@ if BR2_KERNEL_HURD source "target/hurd/Config.in" endif endmenu - -source "target/device/Config.in" diff --git a/target/arch.in b/target/arch.in index 9d56548bb..7a75044cc 100644 --- a/target/arch.in +++ b/target/arch.in @@ -108,6 +108,18 @@ config BR2_ARM_TYPE default ARM_XSCALE if BR2_xscale default ARM_IWMMXT if BR2_iwmmxt +choice + prompt "Target ABI" + depends BR2_arm || BR2_armeb + default BR2_ARM_OABI + help + Application Binary Interface to use + +config BR2_ARM_OABI + bool "OABI" +config BR2_ARM_EABI + bool "EABI" +endchoice choice prompt "Target Architecture Variant" @@ -623,3 +635,24 @@ config BR2_GCC_TARGET_ARCH default z990 if BR2_s390_z990 default z9-109 if BR2_s390_z9_109 +config BR2_GCC_TARGET_ABI + string + default apcs-gnu if BR2_arm_dunno + default atpcs if BR2_arm_dunno + 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 n32 if BR2_mipsel && BR2_EABI + default o64 if BR2_mips && BR2_OABI + 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 + 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 + diff --git a/target/device/Atmel/Config.in b/target/device/Atmel/Config.in index fa352f923..46c44129d 100644 --- a/target/device/Atmel/Config.in +++ b/target/device/Atmel/Config.in @@ -10,19 +10,19 @@ source "target/device/Atmel/AVR32_Config.in" config BR2_BOARD_NAME string - default "at91rm9200df" if BR2_TARGET_AT91RM9200DF - default "at91rm9200se" if BR2_TARGET_AT91RM9200SE - default "at91rm9200ek" if BR2_TARGET_AT91RM9200EK - default "at91rm9200dk" if BR2_TARGET_AT91RM9200DK - default "at91sam9260ek" if BR2_TARGET_AT91SAM9260EK - default "at91sam9260dfc" if BR2_TARGET_AT91SAM9260DFC - default "at91sam9260pf" if BR2_TARGET_AT91SAM9260PF - default "at91sam9261ek" if BR2_TARGET_AT91SAM9261EK - default "at91sam9262ek" if BR2_TARGET_AT91SAM9262EK - default "at91sam9263ek" if BR2_TARGET_AT91SAM9263EK - default "at91sam9xeek" if BR2_TARGET_AT91SAM9XEEK - default "atstk1002" if BR2_TARGET_AVR32_ATSTK1002 - default "atngw100" if BR2_TARGET_AVR32_ATNGW100 + default "at91rm9200df" if BR2_TARGET_AT91RM9200DF + default "at91rm9200se" if BR2_TARGET_AT91RM9200SE + default "at91rm9200ek" if BR2_TARGET_AT91RM9200EK + default "at91rm9200dk" if BR2_TARGET_AT91RM9200DK + default "at91sam9260ek" if BR2_TARGET_AT91SAM9260EK + default "at91sam9260dfc" if BR2_TARGET_AT91SAM9260DFC + default "at91sam9260pf" if BR2_TARGET_AT91SAM9260PF + default "at91sam9261ek" if BR2_TARGET_AT91SAM9261EK + default "at91sam9262ek" if BR2_TARGET_AT91SAM9262EK + default "at91sam9263ek" if BR2_TARGET_AT91SAM9263EK + default "at91sam9xeek" if BR2_TARGET_AT91SAM9XEEK + default "atstk1002" if BR2_TARGET_AVR32_ATSTK1002 + default "atngw100" if BR2_TARGET_AVR32_ATNGW100 config BR2_TARGET_AT91_ADVANCED_INFO bool "Remove work in progress" diff --git a/target/device/Config.in b/target/device/Config.in index 94d16037f..8ce5490b1 100644 --- a/target/device/Config.in +++ b/target/device/Config.in @@ -1,4 +1,6 @@ -menu "Board Support Options" +menu "Target options" + +source "project/Config.in" comment "Preset Devices" diff --git a/target/device/Toolchain.in b/target/device/Toolchain.in index 6a35332e4..26b78c3af 100644 --- a/target/device/Toolchain.in +++ b/target/device/Toolchain.in @@ -1,33 +1,24 @@ +if BR2_TOOLCHAIN_EXTERNAL_SOURCE choice prompt "Source location:" - default BR2_TOOLCHAIN_NORMAL if!BR2_avr32 - default BR2_TOOLCHAIN_ATMEL_AVR32 if BR2_avr32 - depends on BR2_TOOLCHAIN_BUILDROOT + default BR2_TOOLCHAIN_ATMEL_AVR32 if BR2_avr32 help Select whether to use the toolchain built by the buildroot system or an external pre-built toolchain. -config BR2_TOOLCHAIN_NORMAL - bool - prompt "Use default sources for toolchain" - depends on !BR2_avr32 - help - Download vanilla binutils, gcc, uclibc and gdb from their - main download locations, and apply patches from the - "toolchain/" directores. - I.E: Do not download a prepatched vendor source suite. - config BR2_TOOLCHAIN_ATMEL_AVR32 - bool - prompt "Use prepatched source for AVR32 toolchain" + bool "Use prepatched source for AVR32 toolchain" depends on BR2_avr32 - depends on BR2_GCC_VERSION_4_1_2 - depends on BR2_GDB_VERSION_6_4 || !BR2_PACKAGE_GDB - depends on BR2_BINUTILS_VERSION_2_17 - depends on BR2_UCLIBC_VERSION_0_9_28_3 + select BR2_GCC_VERSION_4_1_2 + select BR2_BINUTILS_VERSION_2_17 + select BR2_UCLIBC_VERSION_0_9_28_3 + +config BR2_TOOLCHAIN_UNKNOWNVENDOR + bool "Use prepatched source from unknown vendor" endchoice +if BR2_TOOLCHAIN_ATMEL_AVR32 config BR2_VENDOR_SITE string default "$(BR2_ATMEL_MIRROR)/Source" if BR2_TOOLCHAIN_ATMEL_AVR32 @@ -55,3 +46,36 @@ config BR2_VENDOR_GDB_RELEASE config BR2_VENDOR_PATCH_DIR string default "target/device/Atmel/toolchain/avr32" if BR2_TOOLCHAIN_ATMEL_AVR32 +endif +if BR2_TOOLCHAIN_UNKNOWNVENDOR +config BR2_VENDOR_SITE + string "vendor site" + default "http://vendor.com/somewhere/" + +config BR2_VENDOR_SUFFIX + string "vendor suffix" + default "" + +config BR2_VENDOR_BINUTILS_RELEASE + string "binutils suffix" + default "" + +config BR2_VENDOR_GCC_RELEASE + string "gcc suffix" + default "" + +config BR2_VENDOR_UCLIBC_RELEASE + string "uClibc suffix" + default "" + +config BR2_VENDOR_GDB_RELEASE + string "gdb suffix" + default "" + +config BR2_VENDOR_PATCH_DIR + string "local accumulated patchdir" + default "target/device/$(VENDOR)/toolchain/" +endif + + +endif -- cgit v1.2.3