summaryrefslogtreecommitdiff
path: root/config/binutils
diff options
context:
space:
mode:
Diffstat (limited to 'config/binutils')
-rw-r--r--config/binutils/binutils.in54
-rw-r--r--config/binutils/binutils.in.233
2 files changed, 57 insertions, 30 deletions
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: <name>-<version>/
+ 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: <name>-<version>/
+ 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