aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-04-20 23:03:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-04-20 23:03:42 +0000
commit47fe20b27ad3248907861c87c462797913c9288f (patch)
tree035bf80d4241bd04b8e332ac413ecf381ef5ba33 /toolchain
parent320b38dc4fd903d1668b448276059041fa6c8af3 (diff)
downloadupstream-47fe20b27ad3248907861c87c462797913c9288f.tar.gz
upstream-47fe20b27ad3248907861c87c462797913c9288f.tar.bz2
upstream-47fe20b27ad3248907861c87c462797913c9288f.zip
menuconfig cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3684 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/Config.in42
-rw-r--r--toolchain/Config.in.devel56
-rw-r--r--toolchain/binutils/Config.in38
-rw-r--r--toolchain/gcc/Config.in78
-rw-r--r--toolchain/uClibc/Config.in18
5 files changed, 74 insertions, 158 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 080d87761f..d376c14625 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,29 +1,45 @@
#
-source "toolchain/uClibc/Config.in"
+menuconfig TOOLCHAINOPTS
+ bool "Toolchain Options" if DEVEL
+
source "toolchain/binutils/Config.in"
source "toolchain/gcc/Config.in"
-if CONFIG_DEVEL
- comment "Common Toolchain Options"
-endif
-
-config BR2_ENABLE_MULTILIB
+config ENABLE_MULTILIB
bool
+ prompt "Enable multilib support?" if TOOLCHAINOPTS
default n
+ help
+ If you want multilib enabled, enable this...
-config BR2_LARGEFILE
+config LARGEFILE
bool
- depends on !BR2_cris
+ prompt "Enable large file (files > 2 GB) support?" if TOOLCHAINOPTS
+ depends on !cris
default y
+ help
+ Enable large file (files > 2 GB) support
-config BR2_SOFT_FLOAT
+config SOFT_FLOAT
bool
+ prompt "Use software floating point by default" if TOOLCHAINOPTS
default n
- depends on BR2_arm || BR2_mips || BR2_powerpc
+ depends on arm || mips || powerpc
+ help
+ If your target CPU does not have a Floating Point Unit (FPU) or a
+ kernel FPU emulator, but you still wish to support floating point
+ functions, then everything will need to be compiled with soft floating
+ point support (-msoft-float).
-config BR2_TARGET_OPTIMIZATION
+ Most people will answer N.
+
+config TARGET_OPTIMIZATION
string
- default "-Os -pipe -march=i486 -funit-at-a-time" if BR2_i386
- default "-Os -pipe -mips32 -mtune=mips32 -funit-at-a-time" if BR2_mipsel || BR2_mips
+ prompt "Target Optimizations" if TOOLCHAINOPTS
+ default "-Os -pipe -march=i486 -funit-at-a-time" if i386
+ default "-Os -pipe -mips32 -mtune=mips32 -funit-at-a-time" if mipsel || mips
default "-Os -pipe -funit-at-a-time"
+ help
+ Optimizations to use when building for the target host.
+
diff --git a/toolchain/Config.in.devel b/toolchain/Config.in.devel
deleted file mode 100644
index d9223fbcd3..0000000000
--- a/toolchain/Config.in.devel
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-
-menu "Toolchain Options"
-
-source "toolchain/uClibc/Config.in"
-source "toolchain/binutils/Config.in"
-source "toolchain/gcc/Config.in"
-
-
-comment "Common Toolchain Options"
-
-config BR2_ENABLE_MULTILIB
- bool "Enable multilib support?"
- default n
- help
- If you want multilib enabled, enable this...
-
-config BR2_LARGEFILE
- bool "Enable large file (files > 2 GB) support?"
- depends on !BR2_cris
- default y
- help
- Enable large file (files > 2 GB) support
-
-config BR2_SOFT_FLOAT
- bool "Use software floating point by default"
- default n
- depends on BR2_arm || BR2_mips || BR2_powerpc
- help
- If your target CPU does not have a Floating Point Unit (FPU) or a
- kernel FPU emulator, but you still wish to support floating point
- functions, then everything will need to be compiled with soft floating
- point support (-msoft-float).
-
- Most people will answer N.
-
-config BR2_TARGET_OPTIMIZATION
- string "Target Optimizations"
- default "-Os -pipe -march=i486 -funit-at-a-time" if BR2_i386
- default "-Os -pipe -mips32 -mtune=mips32 -funit-at-a-time" if BR2_mipsel || BR2_mips
- default "-Os -pipe -funit-at-a-time"
- help
- Optimizations to use when building for the target host.
-
-# Might be worth experimenting with for gcc 3.4.x.
-#GCC_WITH_CPU:=
-#GCC_WITH_ARCH:=
-#GCC_WITH_TUNE:=
-
-#GCC_WITH_CPU:=--with-cpu=
-#GCC_WITH_ARCH:=--with-arch=
-#GCC_WITH_TUNE:=--with-tune=
-
-
-endmenu
-
diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 7874638841..56b29c3ec1 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -1,40 +1,40 @@
# Choose binutils version.
-if CONFIG_DEVEL
- comment "Binutils Options"
-endif
-
choice
- prompt "Binutils Version" if CONFIG_DEVEL
- default BR2_BINUTILS_VERSION_2_16_1
+ prompt "Binutils Version" if TOOLCHAINOPTS
+ default BINUTILS_VERSION_2_16_1
help
Select the version of binutils you wish to use.
- config BR2_BINUTILS_VERSION_2_15_94_0_2
+ config BINUTILS_VERSION_2_15_94_0_2
bool "binutils 2.15.94.0.2"
- config BR2_BINUTILS_VERSION_2_16_1
+ config BINUTILS_VERSION_2_16_1
bool "binutils 2.16.1"
- config BR2_BINUTILS_VERSION_2_16_90_0_3
+ config BINUTILS_VERSION_2_16_90_0_3
bool "binutils 2.16.90.0.3"
- config BR2_BINUTILS_VERSION_2_16_91_0_1
+ config BINUTILS_VERSION_2_16_91_0_1
bool "binutils 2.16.91.0.1"
- config BR2_BINUTILS_VERSION_2_16_91_0_2
+ config BINUTILS_VERSION_2_16_91_0_2
bool "binutils 2.16.91.0.2"
- config BR2_BINUTILS_VERSION_2_16_91_0_6
+ config BINUTILS_VERSION_2_16_91_0_6
bool "binutils 2.16.91.0.6"
endchoice
-config BR2_BINUTILS_VERSION
+config BINUTILS_VERSION
string
- default "2.15.94.0.2" if BR2_BINUTILS_VERSION_2_15_94_0_2
- default "2.16.1" if BR2_BINUTILS_VERSION_2_16_1 || !CONFIG_DEVEL
- default "2.16.90.0.3" if BR2_BINUTILS_VERSION_2_16_90_0_3
- default "2.16.91.0.1" if BR2_BINUTILS_VERSION_2_16_91_0_1
- default "2.16.91.0.2" if BR2_BINUTILS_VERSION_2_16_91_0_2
- default "2.16.91.0.6" if BR2_BINUTILS_VERSION_2_16_91_0_6
+ prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
+ default "2.15.94.0.2" if BINUTILS_VERSION_2_15_94_0_2
+ default "2.16.1" if BINUTILS_VERSION_2_16_1
+ default "2.16.90.0.3" if BINUTILS_VERSION_2_16_90_0_3
+ default "2.16.91.0.1" if BINUTILS_VERSION_2_16_91_0_1
+ default "2.16.91.0.2" if BINUTILS_VERSION_2_16_91_0_2
+ default "2.16.91.0.6" if BINUTILS_VERSION_2_16_91_0_6
+ default "2.16.1"
+
+
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 5d525bd8bc..0835b5c8a1 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -1,88 +1,62 @@
# Choose gcc version.
-# WARNING -- 2.95 currently only builds for i386, arm, mips*, and powerpc.
-# WARNING -- 2.95 does not currently build natively for the target.
-
-if CONFIG_DEVEL
- comment "Gcc Options"
-endif
-
-
-# the choice option below is completely ignored
-# if CONFIG_DEVEL isn't set, so we have to set
-# these manually ... annoying.
-config BR2_GCC_VERSION_3_4_4
- bool
- default y if BR2_LINUX_2_4_BRCM
-
-config BR2_GCC_VERSION_4_0_3
- bool
- default y if BR2_LINUX_2_6_ARUBA
choice
- prompt "GCC compiler Version" if CONFIG_DEVEL
- default BR2_GCC_VERSION_4_0_3 if BR2_LINUX_2_6_ARUBA
- default BR2_GCC_VERSION_3_4_4 if BR2_LINUX_2_4_BRCM
- default BR2_GCC_VERSION_3_4_6
+ prompt "GCC compiler Version" if TOOLCHAINOPTS
+ default GCC_VERSION_4_0_3 if LINUX_2_6_ARUBA
+ default GCC_VERSION_3_4_4 if LINUX_2_4_BRCM
+ default GCC_VERSION_3_4_6
help
Select the version of gcc you wish to use.
- config BR2_GCC_VERSION_3_4_4
+ config GCC_VERSION_3_4_4
bool "gcc 3.4.4"
- config BR2_GCC_VERSION_3_4_5
+ config GCC_VERSION_3_4_5
bool "gcc 3.4.5"
- config BR2_GCC_VERSION_3_4_6
+ config GCC_VERSION_3_4_6
bool "gcc 3.4.6"
- config BR2_GCC_VERSION_4_0_2
+ config GCC_VERSION_4_0_2
bool "gcc 4.0.2"
- config BR2_GCC_VERSION_4_0_3
+ config GCC_VERSION_4_0_3
bool "gcc 4.0.3"
- config BR2_GCC_VERSION_4_1_0
+ config GCC_VERSION_4_1_0
bool "gcc 4.1.0"
endchoice
-# more nasty hacks
-config BR2_PACKAGE_LIBGCC
+config PACKAGE_LIBGCC
tristate
- default y if BR2_GCC_VERSION_4_0_2 || BR2_GCC_VERSION_4_0_3 || BR2_GCC_VERSION_4_1_0
- default m if CONFIG_DEVEL
- default n
+ prompt "libgcc package" if TOOLCHAINOPTS
+ default y if GCC_VERSION_4_0_2 || GCC_VERSION_4_0_3 || GCC_VERSION_4_1_0
+ default m
-config BR2_GCC_VERSION
+config GCC_VERSION
string
- default "3.4.4" if BR2_GCC_VERSION_3_4_4
- default "3.4.5" if BR2_GCC_VERSION_3_4_5
- default "3.4.6" if BR2_GCC_VERSION_3_4_6
- default "4.0.2" if BR2_GCC_VERSION_4_0_2
- default "4.0.3" if BR2_GCC_VERSION_4_0_3
- default "4.1.0" if BR2_GCC_VERSION_4_1_0
+ prompt "GCC compiler Version" if (TOOLCHAINOPTS && NULL)
+ default "3.4.4" if GCC_VERSION_3_4_4 || LINUX_2_4_BRCM
+ default "3.4.5" if GCC_VERSION_3_4_5
+ default "3.4.6" if GCC_VERSION_3_4_6
+ default "4.0.2" if GCC_VERSION_4_0_2
+ default "4.0.3" if GCC_VERSION_4_0_3 || LINUX_2_6_ARUBA
+ default "4.1.0" if GCC_VERSION_4_1_0
default "3.4.6"
-config BR2_GCC_USE_SJLJ_EXCEPTIONS
- string
-# default "--enable-sjlj-exceptions"
- default ""
- help
- Currently the unwind stuff seems to work for staticly linked apps
- but not dynamic. So use setjmp/longjmp exceptions by default.
-
-config BR2_EXTRA_GCC_CONFIG_OPTIONS
+config EXTRA_GCC_CONFIG_OPTIONS
string
- prompt "Additional gcc options" if CONFIG_DEVEL
+ prompt "Additional gcc options" if TOOLCHAINOPTS
default ""
help
Any additional gcc options you may want to include....
-config BR2_INSTALL_LIBSTDCPP
+config INSTALL_LIBSTDCPP
bool
- prompt "Build/install c++ compiler and libstdc++?" if CONFIG_DEVEL
+ prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
default y
help
Build/install c++ compiler and libstdc++?
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
deleted file mode 100644
index 4b016c951f..0000000000
--- a/toolchain/uClibc/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-# Choose uClibc options
-#
-if CONFIG_DEVEL
- comment "uClibc Options"
-endif
-
-config BR2_UCLIBC_VERSION_SNAPSHOT
- bool
- prompt "Use the daily snapshot of uClibc?" if CONFIG_DEVEL
- default n
- help
- Would you like to use the latest daily snapshot?
-
-config BR2_USE_UCLIBC_SNAPSHOT
- string
- default "snapshot"
- depends on BR2_UCLIBC_VERSION_SNAPSHOT
-