From 51cb8939f830584b5b0db4f018dfa73e311308f6 Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Tue, 2 Feb 2021 20:01:38 +1300
Subject: config/cc/gcc.in: Fix typo CC_GCC_DEC_FLOAT -> CC_GCC_DEC_FLOATS

This has gone unnoticed for a while, it looks like all configurations
have probably been using the default floats behaviour. Newer kconfig
tells us the default value is not in the choice so lets fix this in
preparation.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
 config/cc/gcc.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 9d9b6921..21e7db06 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.
-- 
cgit v1.2.3


From 8fbf528681d1fa64a5d6fa6286fbf6f256c10a80 Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Wed, 9 Dec 2020 21:42:54 +1300
Subject: config: Update environment variable usage

Upstream changes in the way kconfig handles environment variables means
we need to update our usage of them.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
 config/config.in | 2 +-
 config/global.in | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'config')

diff --git a/config/config.in b/config/config.in
index f941301c..cc349aa0 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 94d2191b..d2a5c5ed 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.
-- 
cgit v1.2.3