diff options
author | Chris Packham <judge.packham@gmail.com> | 2021-02-08 07:49:36 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-08 07:49:36 (GMT) |
commit | 5b0e0127e189c08e433ae25dbceead63da5ef2d7 (patch) | |
tree | bc9619a09931ac13904711ebf2721c7b2f355bce /config | |
parent | 30316cd27ab0a6f8cb2a96771661fc88e1b05a6b (diff) | |
parent | d0e328c8ad357a705b6218e20f74ec1ec1869e8d (diff) |
Merge pull request #1430 from cpackham/kconfig-update
Kconfig update
Diffstat (limited to 'config')
-rw-r--r-- | config/cc/gcc.in | 6 | ||||
-rw-r--r-- | config/config.in | 2 | ||||
-rw-r--r-- | config/global.in | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 9d9b692..21e7db0 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -382,7 +382,7 @@ choice CC_GCC_DEC_FLOATS_CHOICE The default is to let ./configure decide. -config CC_GCC_DEC_FLOAT_AUTO +config CC_GCC_DEC_FLOATS_AUTO bool "auto" help Let ./configure decide. If you say 'y' here, gcc will default to: @@ -390,12 +390,12 @@ config CC_GCC_DEC_FLOAT_AUTO - 'dpd' for powerpc - 'no' for the other architectures -config CC_GCC_DEC_FLOAT_BID +config CC_GCC_DEC_FLOATS_BID bool "bid" help Use the 'binary integer decimal' format for decimal floats. -config CC_GCC_DEC_FLOAT_DPD +config CC_GCC_DEC_FLOATS_DPD bool "dpd" help Use the 'densely packed decimal' for decimal floats. diff --git a/config/config.in b/config/config.in index f941301..cc349aa 100644 --- a/config/config.in +++ b/config/config.in @@ -1,4 +1,4 @@ -mainmenu "crosstool-NG $CT_VERSION Configuration" +mainmenu "crosstool-NG $(CT_VERSION) Configuration" source "config/configure.in" source "config/global.in" source "config/target.in" diff --git a/config/global.in b/config/global.in index 94d2191..d2a5c5e 100644 --- a/config/global.in +++ b/config/global.in @@ -2,7 +2,7 @@ config VERSION string - option env="CT_VERSION" + default "$(CT_VERSION)" # Config version checking framework. If CONFIG_VERSION is unset in the current .config # or defconfig, it is loaded as 0 (possibly triggering a user prompt during 'ct-ng oldconfig'). @@ -16,13 +16,13 @@ config VERSION # i.e. 'ct-ng saveconfig' or 'ct-ng savedefconfig'. config VCHECK string - option env="CT_VCHECK" + default "$(CT_VCHECK)" # Kconfig's idiosynchrasy: it does not output the config settings declared with 'option env' # to the generated .config file. Must use one extra level of indirection. config CONFIG_VERSION_ENV string - option env="CT_CONFIG_VERSION_CURRENT" + default "$(CT_CONFIG_VERSION_CURRENT)" # Up-to-date version of the configuration file. If saving a defconfig, choose a default that # is guaranteed not to match - so that kconfig saves the value to .config. |