michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kconfig: Drop support for CONFIG_TOOLCHAIN_VARIANT

Browse source 
The Kconfig option TOOLCHAIN_VARIANT (not to be confused with
ZEPHYR_TOOLCHAIN_VARIANT) is a legacy configuration option that has
very few use-cases and can easily be dropped.

It's functionality is easily covered by CONFIG_X86_IAMCU and
ZEPHYR_TOOLCHAIN_VARIANT.

This commit removes all references of it from Zephyr.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2018-04-30 17:04:44 +02:00 • committed by Anas Nashif
commit cde6bef778
12 changed files with 7 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/soc/intel_quark/quark_d2000/Kconfig.defconfig.series
View file

@ -12,10 +12,6 @@ config SOC_SERIES
config X86_IAMCU config X86_IAMCU
def_bool y def_bool y
config TOOLCHAIN_VARIANT
default "iamcu" if X86_IAMCU
default "" if !X86_IAMCU
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC
default 32000000 default 32000000

4
arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series
View file

@ -15,10 +15,6 @@ config X86_IAMCU
config X86_NO_MELTDOWN config X86_NO_MELTDOWN
def_bool y def_bool y
config TOOLCHAIN_VARIANT
default "iamcu" if X86_IAMCU
default "" if !X86_IAMCU
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC
default 32000000 default 32000000

4
arch/xtensa/Kconfig
View file

@ -105,10 +105,6 @@ config XTENSA_ASM2
for SMP. Assumes/requires hardware that implements the for SMP. Assumes/requires hardware that implements the
register window extension, however. register window extension, however.
config TOOLCHAIN_VARIANT
string
default RG-2016.4-linux
gsource "arch/xtensa/soc/*/Kconfig" gsource "arch/xtensa/soc/*/Kconfig"
endmenu endmenu

4
arch/xtensa/soc/D_108mini/Kconfig.defconfig
View file

@ -13,8 +13,4 @@ config SOC
config IRQ_OFFLOAD_INTNUM config IRQ_OFFLOAD_INTNUM
default 7 default 7
config TOOLCHAIN_VARIANT
string
default RF-2016.4-linux
endif endif

4
arch/xtensa/soc/D_212GP/Kconfig.defconfig
View file

@ -13,8 +13,4 @@ config SOC
config IRQ_OFFLOAD_INTNUM config IRQ_OFFLOAD_INTNUM
default 7 default 7
config TOOLCHAIN_VARIANT
string
default RF-2016.4-linux
endif endif

4
arch/xtensa/soc/D_233L/Kconfig.defconfig
View file

@ -13,8 +13,4 @@ config SOC
config IRQ_OFFLOAD_INTNUM config IRQ_OFFLOAD_INTNUM
default 7 default 7
config TOOLCHAIN_VARIANT
string
default RF-2016.4-linux
endif endif

4
arch/xtensa/soc/intel_s1000/Kconfig.defconfig
View file

@ -12,8 +12,4 @@ config SOC
config IRQ_OFFLOAD_INTNUM config IRQ_OFFLOAD_INTNUM
default 0 default 0
config TOOLCHAIN_VARIANT
string
default RF-2015.3-linux
endif endif

1
boards/x86/qemu_x86/qemu_x86_iamcu_defconfig
View file

@ -15,7 +15,6 @@ CONFIG_SERIAL=y
CONFIG_UART_NS16550=y CONFIG_UART_NS16550=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TOOLCHAIN_VARIANT="iamcu"
CONFIG_X86_IAMCU=y CONFIG_X86_IAMCU=y
CONFIG_XIP=y CONFIG_XIP=y
CONFIG_X86_MMU=y CONFIG_X86_MMU=y

1
boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig
View file

@ -5,7 +5,6 @@ CONFIG_BOARD_QEMU_XTENSA=y
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_SOC_XTENSA_SAMPLE_CONTROLLER=y CONFIG_SOC_XTENSA_SAMPLE_CONTROLLER=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=10000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=10000000
CONFIG_TOOLCHAIN_VARIANT=""
CONFIG_STACK_SENTINEL=y CONFIG_STACK_SENTINEL=y
CONFIG_SW_ISR_TABLE=y CONFIG_SW_ISR_TABLE=y
CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_ISR_TABLES=y

13
cmake/toolchain/zephyr.cmake
View file

@ -13,13 +13,14 @@ if("${ARCH}" STREQUAL "arm")
set(CROSS_COMPILE_TARGET arm-${TOOLCHAIN_VENDOR}-eabi) set(CROSS_COMPILE_TARGET arm-${TOOLCHAIN_VENDOR}-eabi)
set(SYSROOT_TARGET armv5-${TOOLCHAIN_VENDOR}-eabi) set(SYSROOT_TARGET armv5-${TOOLCHAIN_VENDOR}-eabi)
elseif(CONFIG_TOOLCHAIN_VARIANT STREQUAL "iamcu")
set(CROSS_COMPILE_TARGET i586-${TOOLCHAIN_VENDOR}-elfiamcu)
set(SYSROOT_TARGET iamcu-${TOOLCHAIN_VENDOR}-elfiamcu)
elseif("${ARCH}" STREQUAL "x86") elseif("${ARCH}" STREQUAL "x86")
set(CROSS_COMPILE_TARGET i586-${TOOLCHAIN_VENDOR}-elf) if(CONFIG_X86_IAMCU)
set(SYSROOT_TARGET i586-${TOOLCHAIN_VENDOR}-elf) set(CROSS_COMPILE_TARGET i586-${TOOLCHAIN_VENDOR}-elfiamcu)
set(SYSROOT_TARGET iamcu-${TOOLCHAIN_VENDOR}-elfiamcu)
else()
set(CROSS_COMPILE_TARGET i586-${TOOLCHAIN_VENDOR}-elf)
set(SYSROOT_TARGET i586-${TOOLCHAIN_VENDOR}-elf)
endif()
elseif("${ARCH}" STREQUAL "xtensa") elseif("${ARCH}" STREQUAL "xtensa")
set(SYSROOT_DIR ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${SYSROOT_TARGET}/usr) set(SYSROOT_DIR ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${SYSROOT_TARGET}/usr)

6
misc/Kconfig
View file

@ -178,12 +178,6 @@ config COMPILER_OPT
and can be used to change compiler optimization, warning and error and can be used to change compiler optimization, warning and error
messages, and so on. messages, and so on.
config TOOLCHAIN_VARIANT
string "Cross-compiler variant name"
help
For optimized compilers with reduced features, specify the name
of the variant.
config CPLUSPLUS config CPLUSPLUS
bool "Enable C++ support for the application" bool "Enable C++ support for the application"
default n default n

1
tests/benchmarks/object_footprint/prj10.conf
View file

@ -13,5 +13,4 @@ CONFIG_OBJECTS_LIFO=y
CONFIG_OBJECTS_FIFO=y CONFIG_OBJECTS_FIFO=y
CONFIG_OBJECTS_STACK=y CONFIG_OBJECTS_STACK=y
CONFIG_STATIC_ISR=n CONFIG_STATIC_ISR=n
#CONFIG_TOOLCHAIN_VARIANT="iamcu"
CONFIG_KERNEL_BIN_NAME="prj10" CONFIG_KERNEL_BIN_NAME="prj10"