From 514f1546d7fe83853c2c2020514e61a90cc26f95 Mon Sep 17 00:00:00 2001 From: Bryan Hundven Date: Thu, 26 Nov 2015 05:07:37 -0800 Subject: config: Update kconfig for new CT_GetCustom This commit sort of unifies the kconfigs to handle custom files and directories. Signed-off-by: Bryan Hundven diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index fc57412..ef59870 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -2,6 +2,41 @@ comment "GNU binutils" +config BINUTILS_CUSTOM + bool + prompt "Custom binutils" + depends on EXPERIMENTAL + select BINUTILS_2_25_or_later + help + The choosen binutils version shall be not downloaded. Instead use + a custom location to get the source. + +if BINUTILS_CUSTOM + +config BINUTILS_CUSTOM_LOCATION + string + prompt "Full path to custom binutils source" + help + Enter the path to the directory or tarball of your source for binutils. + + If the path is a tarball, it should extract to: -/ + where the name is this component, binutils, and the version is set + below in the custom version string. + +config BINUTILS_CUSTOM_VERSION + string + prompt "Binutils Custom Version number" + help + Enter the version number for your custom binutils. + +config BINUTILS_VERSION + string + default BINUTILS_CUSTOM_VERSION + +endif # BINUTILS_CUSTOM + +if ! BINUTILS_CUSTOM + config CC_BINUTILS_SHOW_LINARO bool prompt "Show Linaro versions" @@ -94,23 +129,6 @@ config BINUTILS_V_2_18a endchoice -config BINUTILS_CUSTOM - bool - prompt "Custom binutils" - depends on EXPERIMENTAL - -if BINUTILS_CUSTOM - -config BINUTILS_CUSTOM_LOCATION - string - prompt "Full path to custom binutils source" - default "" - help - Enter the path to the directory (or tarball) of your source for binutils, - or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/binutils - -endif # BINUTILS_CUSTOM - config BINUTILS_VERSION string # Don't remove next line @@ -129,6 +147,8 @@ config BINUTILS_VERSION default "2.19.1a" if BINUTILS_V_2_19_1a default "2.18a" if BINUTILS_V_2_18a +endif # ! BINUTILS_CUSTOM + config BINUTILS_2_25_1_or_later bool select BINUTILS_2_25_or_later diff --git a/config/binutils/binutils.in.2 b/config/binutils/binutils.in.2 index cb6c81c..e3d3799 100644 --- a/config/binutils/binutils.in.2 +++ b/config/binutils/binutils.in.2 @@ -18,12 +18,12 @@ config ELF2FLT_CUSTOM bool prompt "Custom elf2flt" depends on EXPERIMENTAL + help + The choosen elf2flt version shall be not downloaded. Instead use + a custom location to get the source. endchoice -config ELF2FLT_VERSION - string - if ELF2FLT_GIT config ELF2FLT_GIT_CSET @@ -35,23 +35,30 @@ config ELF2FLT_GIT_CSET The default currently points to the HEAD of the git tree. -config ELF2FLT_VERSION - default ELF2FLT_GIT_CSET - endif # ELF2FLT_GIT -if ELF2FLT_CUSTOM - config ELF2FLT_VERSION - default "custom" + string + default ELF2FLT_GIT_CSET if ELF2FLT_GIT + default ELF2FLT_CUSTOM_VERSION if ELF2FLT_CUSTOM + +if ELF2FLT_CUSTOM config ELF2FLT_CUSTOM_LOCATION string prompt "Full path to custom elf2flt source" - default "" help - Enter the path to the directory (or tarball) of your source for elf2flt, - or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/elf2flt + Enter the path to the directory or tarball of your source for elf2flt. + + If the path is a tarball, it should extract to: -/ + where the name is this component, elf2flt, and the version is set + below in the custom version string. + +config ELF2FLT_CUSTOM_VERSION + string + prompt "elf2flt custom version number" + help + Enter the version number for your custom elf2flt. endif # ELF2FLT_CUSTOM @@ -66,4 +73,4 @@ config ELF2FLT_EXTRA_CONFIG_ARRAY if they are properly quoted (or escaped, but prefer quotes). Eg.: --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space -endif +endif # ARCH_BINFMT_FLAT diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 4cf4628..887b106 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -13,6 +13,41 @@ ## help gcc supports many languages, a powerful code parser, optimised binary ## help output, and lots of other features. +config CC_GCC_CUSTOM + bool + prompt "Custom gcc" + depends on EXPERIMENTAL + select CC_GCC_latest + help + The choosen gcc version shall be not downloaded. Instead use + a custom location to get the source. + +if CC_GCC_CUSTOM + +config CC_GCC_CUSTOM_LOCATION + string + prompt "Full path to custom gcc source" + help + Enter the path to the directory or tarball of your source for gcc. + + If the path is a tarball, it should extract to: -/ + where the name is this component, gcc, and the version is set + below in the custom version string. + +config CC_GCC_CUSTOM_VERSION + string + prompt "Custom GCC Version" + help + Enter the version number for your custom gcc. + +config CC_GCC_VERSION + string + default CC_GCC_CUSTOM_VERSION + +endif #CC_GCC_CUSTOM + +if ! CC_GCC_CUSTOM + config CC_GCC_SHOW_LINARO bool prompt "Show Linaro versions" @@ -66,25 +101,7 @@ config CC_GCC_V_4_8_5 endchoice -config CC_GCC_CUSTOM - bool - prompt "Custom gcc" - depends on EXPERIMENTAL - help - The choosen compiler version shall be not downloaded. Instead use - a custom location to get the source. - -if CC_GCC_CUSTOM - -config CC_GCC_CUSTOM_LOCATION - string - prompt "Full path to custom gcc source" - default "" - help - Enter the path to the directory (or tarball) of your source for gcc, - or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/gcc - -endif #CC_GCC_CUSTOM +endif # ! CC_GCC_CUSTOM config CC_GCC_4_8 bool @@ -237,6 +254,8 @@ config CC_GCC_HAS_LIBQUADMATH config CC_GCC_HAS_LIBSANITIZER bool +if ! CC_GCC_CUSTOM + config CC_GCC_VERSION string # Don't remove next line @@ -247,6 +266,8 @@ config CC_GCC_VERSION default "linaro-4.8-2015.06" if CC_GCC_V_linaro_4_8 default "4.8.5" if CC_GCC_V_4_8_5 +endif # ! CC_GCC_CUSTOM + config CC_LANG_JAVA_USE_ECJ bool default y diff --git a/config/debug/gdb.in b/config/debug/gdb.in index d0d1aae..70d2ebf 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -10,6 +10,41 @@ if GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER comment "gdb version" +config GDB_CUSTOM + bool + prompt "Custom gdb" + depends on EXPERIMENTAL + select GDB_7_2_or_later + help + The choosen gdb version shall be not downloaded. Instead use + a custom location to get the source. + +if GDB_CUSTOM + +config GDB_CUSTOM_LOCATION + string + prompt "Full path to custom gdb source" + help + Enter the path to the directory or tarball of your source for gcc. + + If the path is a tarball, it should extract to: -/ + where the name is this component, gcc, and the version is set + below in the custom version string. + +config GDB_CUSTOM_VERSION + string + prompt "Custom GDB version" + help + Enter the version number for your custom gdb. + +config GDB_VERSION + string + default GDB_CUSTOM_VERSION + +endif # GDB_CUSTOM + +if ! GDB_CUSTOM + config DEBUG_GDB_SHOW_LINARO bool prompt "Show Linaro versions" @@ -166,13 +201,7 @@ config GDB_V_6_8a endchoice -config GDB_CUSTOM - bool - prompt "Custom gdb" - depends on EXPERIMENTAL - help - The choosen gdb version shall be not downloaded. Instead use - a custom location to get the source. +endif # ! GDB_CUSTOM config GDB_7_2_or_later bool @@ -193,6 +222,8 @@ config GDB_HAS_PYTHON config GDB_INSTALL_GDBINIT bool +if ! GDB_CUSTOM + config GDB_VERSION string # Don't remove next line @@ -223,17 +254,7 @@ config GDB_VERSION default "7.0a" if GDB_V_7_0a default "6.8a" if GDB_V_6_8a -if GDB_CUSTOM - -config GDB_CUSTOM_LOCATION - string - prompt "Full path to custom gdb source" - default "" - help - Enter the path to the directory (or tarball) of your source for gdb, - or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/gdb - -endif # GDB_CUSTOM +endif # ! GDB_CUSTOM -endif +endif # GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER diff --git a/config/kernel/linux.in b/config/kernel/linux.in index 5b429ec..2669951 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -5,6 +5,39 @@ ## ## help Build a toolchain targeting systems running Linux as a kernel. +config KERNEL_LINUX_CUSTOM + bool + prompt "custom tarball or directory" + help + The choosen linux version shall be not downloaded. Instead use + a custom location to get the source. + +if KERNEL_LINUX_CUSTOM + +config KERNEL_LINUX_CUSTOM_LOCATION + string + prompt "Path to custom source, tarball or directory" + help + Enter the path to the directory or tarball of your source for linux. + + If the path is a tarball, it should extract to: -/ + where the name is this component, linux, and the version is set + below in the custom version string. + +config KERNEL_LINUX_CUSTOM_VERSION + string + prompt "Custom Linux version" + help + Enter the version number for your custom linux. + +config KERNEL_VERSION + string + default KERNEL_LINUX_CUSTOM_VERSION + +endif # KERNEL_LINUX_CUSTOM + +if ! KERNEL_LINUX_CUSTOM + choice bool prompt "Linux kernel version" @@ -52,20 +85,6 @@ config KERNEL_V_2_6_32 prompt "2.6.32.68" help -config KERNEL_LINUX_CUSTOM - bool - prompt "custom tarball or directory" - help - Use a local tarball or local kernel directory of a complete kernel source tree. - -config KERNEL_LINUX_CUSTOM_LOCATION - string - prompt "Path to custom source, tarball or directory" - depends on KERNEL_LINUX_CUSTOM - help - Enter here the path to the tarball of your full kernel tree or - kernel directory - endchoice config KERNEL_VERSION @@ -82,4 +101,5 @@ config KERNEL_VERSION default "3.4.110" if KERNEL_V_3_4 default "3.2.72" if KERNEL_V_3_2 default "2.6.32.68" if KERNEL_V_2_6_32 - default "custom" if KERNEL_LINUX_CUSTOM + +endif # ! KERNEL_LINUX_CUSTOM diff --git a/config/libc/avr-libc.in b/config/libc/avr-libc.in index 968ca6b..f08acb3 100644 --- a/config/libc/avr-libc.in +++ b/config/libc/avr-libc.in @@ -9,6 +9,40 @@ ## help Atmel AVR 8-bit RISC microcontrollers. In addition, the library ## help provides the basic startup code needed by most applications. +config LIBC_AVR_LIBC_CUSTOM + bool + prompt "Custom avr-libc" + depends on EXPERIMENTAL + help + The choosen avr-libc version shall be not downloaded. Instead use + a custom location to get the source. + +if LIBC_AVR_LIBC_CUSTOM + +config LIBC_AVR_LIBC_CUSTOM_LOCATION + string + prompt "Full path to custom avr-libc source" + help + Enter the path to the directory or tarball of your source for avr-libc. + + If the path is a tarball, it should extract to: -/ + where the name is this component, avr-libc, and the version is set + below in the custom version string. + +config LIBC_AVR_LIBC_CUSTOM_VERSION + string + prompt "Custom AVR-Libc version" + help + Enter the version number for your custom avr-libc. + +config LIBC_VERSION + string + default LIBC_AVR_LIBC_CUSTOM_VERSION + +endif # LIBC_AVR_LIBC_CUSTOM + +if ! LIBC_AVR_LIBC_CUSTOM + choice bool prompt "avr-libc version" @@ -23,29 +57,13 @@ config LIBC_AVR_LIBC_V_1_8_0 bool prompt "1.8.0" -config LIBC_AVR_LIBC_CUSTOM - bool - prompt "Custom avr-libc" - depends on EXPERIMENTAL - endchoice -if LIBC_AVR_LIBC_CUSTOM - -config LIBC_AVR_LIBC_CUSTOM_LOCATION - string - prompt "Full path to custom avr-libc source" - default "" - help - Enter the path to the directory (or tarball) of your source for avr-libc, - or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/avr-libc - -endif # LIBC_AVR_LIBC_CUSTOM - config LIBC_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW default "1.8.1" if LIBC_AVR_LIBC_V_1_8_1 default "1.8.0" if LIBC_AVR_LIBC_V_1_8_0 - default "custom" if LIBC_AVR_LIBC_CUSTOM + +endif # ! LIBC_AVR_LIBC_CUSTOM diff --git a/config/libc/glibc.in b/config/libc/glibc.in index c2ba7b9..97b0107 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -12,6 +12,42 @@ config THREADS default "nptl" +config LIBC_GLIBC_CUSTOM + bool + prompt "Custom glibc" + depends on EXPERIMENTAL + select LIBC_CUSTOM + select LIBC_GLIBC_2_20_or_later + help + The choosen glibc version shall be not downloaded. Instead use + a custom location to get the source. + +if LIBC_GLIBC_CUSTOM + +config LIBC_GLIBC_CUSTOM_LOCATION + string + prompt "Full path to custom glibc source" + help + Enter the path to the directory or tarball of your source for glibc. + + If the path is a tarball, it should extract to: -/ + where the name is this component, glibc, and the version is set + below in the custom version string. + +config LIBC_GLIBC_CUSTOM_VERSION + string + prompt "Custom GLIBC version" + help + Enter the version number for your custom glibc. + +config LIBC_VERSION + string + default LIBC_GLIBC_CUSTOM_VERSION + +endif # LIBC_GLIBC_CUSTOM + +if ! LIBC_GLIBC_CUSTOM + config CC_GLIBC_SHOW_LINARO bool prompt "Show Linaro versions" @@ -132,15 +168,10 @@ config LIBC_GLIBC_V_2_8 prompt "2.8" select LIBC_GLIBC_PORTS_EXTERNAL -config LIBC_GLIBC_CUSTOM - bool - prompt "Custom glibc" - depends on EXPERIMENTAL - select LIBC_CUSTOM - select LIBC_GLIBC_2_20_or_later - endchoice +endif # ! LIBC_GLIBC_CUSTOM + config LIBC_GLIBC_2_20_or_later bool select LIBC_GLIBC_2_17_or_later @@ -149,20 +180,7 @@ config LIBC_GLIBC_2_20_or_later config LIBC_GLIBC_2_17_or_later bool -config LIBC_CUSTOM - bool - -if LIBC_GLIBC_CUSTOM - -config LIBC_GLIBC_CUSTOM_LOCATION - string - prompt "Full path to custom glibc source" - default "" - help - Enter the path to the directory (or tarball) of your source for glibc, - or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/glibc - -endif # LIBC_GLIBC_CUSTOM +if ! LIBC_GLIBC_CUSTOM config LIBC_VERSION string @@ -187,4 +205,5 @@ config LIBC_VERSION default "2.10.1" if LIBC_GLIBC_V_2_10_1 default "2.9" if LIBC_GLIBC_V_2_9 default "2.8" if LIBC_GLIBC_V_2_8 - default "custom" if LIBC_GLIBC_CUSTOM + +endif # ! LIBC_GLIBC_CUSTOM diff --git a/config/libc/musl.in b/config/libc/musl.in index 8df09df..522478a 100644 --- a/config/libc/musl.in +++ b/config/libc/musl.in @@ -12,6 +12,40 @@ config THREADS default "musl" +config LIBC_MUSL_CUSTOM + bool + prompt "Custom musl" + depends on EXPERIMENTAL + help + The choosen musl-libc version shall be not downloaded. Instead use + a custom location to get the source. + +if LIBC_MUSL_CUSTOM + +config LIBC_MUSL_CUSTOM_LOCATION + string + prompt "Full path to custom musl-libc source" + help + Enter the path to the directory or tarball of your source for musl. + + If the path is a tarball, it should extract to: -/ + where the name is this component, musl, and the version is set + below in the custom version string. + +config LIBC_MUSL_CUSTOM_VERSION + string + prompt "Custom MUSL version" + help + Enter the version number for your custom musl-libc. + +config LIBC_VERSION + string + default LIBC_MUSL_CUSTOM_VERSION + +endif # LIBC_MUSL_CUSTOM + +if ! LIBC_MUSL_CUSTOM + choice bool prompt "musl version" @@ -27,11 +61,6 @@ config LIBC_MUSL_V_1_0 bool prompt "1.0.5 (Stable)" -config LIBC_MUSL_V_CUSTOM - bool - prompt "Custom musl" - depends on EXPERIMENTAL - endchoice config LIBC_VERSION @@ -40,4 +69,5 @@ config LIBC_VERSION # CT_INSERT_VERSION_STRING_BELOW default "1.1.12" if LIBC_MUSL_V_1_1 default "1.0.5" if LIBC_MUSL_V_1_0 - default "custom" if LIBC_MUSL_V_CUSTOM + +endif # ! LIBC_MUSL_CUSTOM diff --git a/config/libc/newlib.in b/config/libc/newlib.in index eea89da..40203f7 100644 --- a/config/libc/newlib.in +++ b/config/libc/newlib.in @@ -12,6 +12,41 @@ ## help is only available in source form. It can be compiled for a wide ## help array of processors, and will usually work on any architecture with ## help the addition of a few low-level routines. +# +config LIBC_NEWLIB_CUSTOM + bool + prompt "Custom newlib" + depends on EXPERIMENTAL + select LIBC_NEWLIB_2_2_or_later + help + The choosen newlib version shall be not downloaded. Instead use + a custom location to get the source. + +if LIBC_NEWLIB_CUSTOM + +config LIBC_NEWLIB_CUSTOM_LOCATION + string + prompt "Full path to custom newlib source" + help + Enter the path to the directory or tarball of your source for newlib. + + If the path is a tarball, it should extract to: -/ + where the name is this component, newlib, and the version is set + below in the custom version string. + +config LIBC_NEWLIB_CUSTOM_VERSION + string + prompt "Custom NEWLIB version" + help + Enter the version number for your custom newlib. + +config LIBC_VERSION + string + default LIBC_NEWLIB_CUSTOM_VERSION + +endif # LIBC_NEWLIB_CUSTOM + +if ! LIBC_NEWLIB_CUSTOM config CC_NEWLIB_SHOW_LINARO bool @@ -81,13 +116,7 @@ config LIBC_NEWLIB_V_1_17_0 endchoice -config LIBC_NEWLIB_CUSTOM - bool - prompt "Custom newlib" - depends on EXPERIMENTAL - help - The choosen library version shall be not downloaded. Instead use - a custom location to get the source. +endif # ! LIBC_NEWLIB_CUSTOM config LIBC_NEWLIB_2_2 bool @@ -115,18 +144,7 @@ config LIBC_NEWLIB_2_0_or_later bool select LIBC_PROVIDES_CXA_ATEXIT -if LIBC_NEWLIB_CUSTOM - -config LIBC_NEWLIB_CUSTOM_LOCATION - string - prompt "Full path to custom newlib source" - default "" - help - Enter the path to the directory (or tarball) of your source for newlib, - or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/newlib - -endif # LIBC_NEWLIB_CUSTOM - +if ! LIBC_NEWLIB_CUSTOM config LIBC_VERSION string # Don't remove next line @@ -144,6 +162,8 @@ config LIBC_VERSION Enter the tag you want to use. Leave empty to use the 'head' of the repository. +endif # ! LIBC_NEWLIB_CUSTOM + config LIBC_NEWLIB_TARGET_CFLAGS string prompt "Target CFLAGS for newlib" diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index 06a8975..ae26f3a 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -20,6 +20,55 @@ comment "'softfp' ABI and uClibc is not entirely tested in crosstool-NG" comment "You may experience issues, although it should work just fine" endif # ARCH_FLOAT_SOFTFP +config LIBC_UCLIBC_CUSTOM + bool + prompt "Custom uClibc" + depends on EXPERIMENTAL + help + The choosen uclibc version shall be not downloaded. Instead use + a custom location to get the source. + +if LIBC_UCLIBC_CUSTOM + +choice + bool + prompt "uClibc Version Name" + +config LIBC_UCLIBC_CUSTOM_UCLIBC + bool "uClibc" + select LIBC_UCLIBC_0_9_33_2_or_later + +config LIBC_UCLIBC_CUSTOM_UCLIBC_NG + bool "uClibc-ng" + select LIBC_UCLIBC_NG_1_0_0_or_later + +endchoice + +config LIBC_UCLIBC_CUSTOM_LOCATION + string + prompt "Full path to custom uClibc source" + help + Enter the path to the directory or tarball of your source for uClibc. + + If the path is a tarball, it should extract to: -/ + where the name is this component will be set by the uClibc Version Name + option from above, and the version is set below in the custom version + string. + +config LIBC_UCLIBC_CUSTOM_VERSION + string + prompt "Custom uClibc Version" + help + Enter the version number for your custom uClibc. + +config LIBC_VERSION + string + default LIBC_UCLIBC_CUSTOM_VERSION + +endif # LIBC_UCLIBC_CUSTOM + +if ! LIBC_UCLIBC_CUSTOM + choice bool prompt "uClibc version" @@ -36,26 +85,8 @@ config LIBC_UCLIBC_V_0_9_33_2 prompt "0.9.33.2" select LIBC_UCLIBC_0_9_33_2_or_later -config LIBC_UCLIBC_CUSTOM - bool - prompt "Custom uClibc" - depends on EXPERIMENTAL - select LIBC_UCLIBC_0_9_33_2_or_later - endchoice -if LIBC_UCLIBC_CUSTOM - -config LIBC_UCLIBC_CUSTOM_LOCATION - string - prompt "Full path to custom uClibc source" - default "" - help - Enter the path to the directory (or tarball) of your source for uClibc, - or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/uClibc - -endif # LIBC_UCLIBC_CUSTOM - config LIBC_VERSION string # Don't remove next line @@ -63,6 +94,8 @@ config LIBC_VERSION default "1.0.9" if LIBC_UCLIBC_NG_V_1_0_9 default "0.9.33.2" if LIBC_UCLIBC_V_0_9_33_2 +endif # ! LIBC_UCLIBC_CUSTOM + config LIBC_UCLIBC_NG_1_0_9_or_later bool select LIBC_UCLIBC_NG_1_0_0_or_later -- cgit v0.10.2-6-g49f6