Some locations were missed while renaming kconfig symbols

... because there the symbols were constructer part by part.

Also, remove cc.sh and source $(CT_CC).sh directly - we only build
a single compiler at a time.

Signed-off-by: Alexey Neyman <stilor@att.net>

6 files changed, 10 insertions, 70 deletions

diff --git a/scripts/build/cc.sh b/scripts/build/cc.sh
deleted file mode 100644
index 0db6b9c..0000000
--- a/scripts/build/cc.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-# Wrapper to build the companion tools facilities
-
-# List all companion tools facilities, and parse their scripts
-CT_CC_FACILITY_LIST=
-for f in "${CT_LIB_DIR}/scripts/build/cc/"*.sh; do
-    _f="$(basename "${f}" .sh)"
-    _f="${_f#???-}"
-    __f="CT_CC_${_f}"
-    if [ "${!__f}" = "y" ]; then
-        CT_DoLog DEBUG "Enabling cc '${_f}'"
-        . "${f}"
-        CT_CC_FACILITY_LIST="${CT_CC_FACILITY_LIST} ${_f}"
-    else
-        CT_DoLog DEBUG "Disabling cc '${_f}'"
-    fi
-done
-
-# Download the cc facilities
-do_cc_get() {
-    for f in ${CT_CC_FACILITY_LIST}; do
-        do_${f}_get
-    done
-}
-
-# Extract and patch the cc facilities
-do_cc_extract() {
-    for f in ${CT_CC_FACILITY_LIST}; do
-        do_${f}_extract
-    done
-}
-
-# Core pass 1 the cc facilities
-do_cc_core_pass_1() {
-    for f in ${CT_CC_FACILITY_LIST}; do
-        do_${f}_core_pass_1
-    done
-}
-
-# Core pass 2 the cc facilities
-do_cc_core_pass_2() {
-    for f in ${CT_CC_FACILITY_LIST}; do
-        do_${f}_core_pass_2
-    done
-}
-
-# Build for build the cc facilities
-do_cc_for_build() {
-    for f in ${CT_CC_FACILITY_LIST}; do
-        do_${f}_for_build
-    done
-}
-
-# Build for host the cc facilities
-do_cc_for_host() {
-    for f in ${CT_CC_FACILITY_LIST}; do
-        do_${f}_for_host
-    done
-}
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index e836c82..2f0d3f7 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -3,7 +3,7 @@
 # Licensed under the GPL v2. See COPYING in the root of this package
 
 # Download gcc
-do_gcc_get() {
+do_cc_get() {
     local linaro_version=""
     local linaro_series=""
 
@@ -22,8 +22,7 @@ do_gcc_get() {
 }
 
 # Extract gcc
-do_gcc_extract() {
-    # TBD handle xtensa overlays
+do_cc_extract() {
     CT_ExtractPatch GCC
 
     # Copy ecj-latest.jar to ecj.jar at the top of the GCC source tree
@@ -184,7 +183,7 @@ cc_gcc_multilib_housekeeping() {
 
 #------------------------------------------------------------------------------
 # Core gcc pass 1
-do_gcc_core_pass_1() {
+do_cc_core_pass_1() {
     local -a core_opts
 
     if [ "${CT_CC_CORE_PASS_1_NEEDED}" != "y" ]; then
@@ -210,7 +209,7 @@ do_gcc_core_pass_1() {
 }
 
 # Core gcc pass 2
-do_gcc_core_pass_2() {
+do_cc_core_pass_2() {
     local -a core_opts
 
     if [ "${CT_CC_CORE_PASS_2_NEEDED}" != "y" ]; then
@@ -690,7 +689,7 @@ do_gcc_core_backend() {
 
 #------------------------------------------------------------------------------
 # Build complete gcc to run on build
-do_gcc_for_build() {
+do_cc_for_build() {
     local -a build_final_opts
     local build_final_backend
 
@@ -775,7 +774,7 @@ gcc_movelibs() {
 
 #------------------------------------------------------------------------------
 # Build final gcc to run on host
-do_gcc_for_host() {
+do_cc_for_host() {
     local -a final_opts
     local final_backend
 
diff --git a/scripts/build/companion_tools.sh b/scripts/build/companion_tools.sh
index b190ed7..7776f64 100644
--- a/scripts/build/companion_tools.sh
+++ b/scripts/build/companion_tools.sh
@@ -5,7 +5,7 @@ CT_COMP_TOOLS_FACILITY_LIST=
 for f in "${CT_LIB_DIR}/scripts/build/companion_tools/"*.sh; do
     _f="$(basename "${f}" .sh)"
     _f="${_f#???-}"
-    __f="CT_COMP_TOOLS_${_f}"
+    __f="CT_COMP_TOOLS_${_f^^}"
     if [ "${!__f}" = "y" ]; then
         CT_DoLog DEBUG "Enabling companion tool '${_f}'"
         . "${f}"
diff --git a/scripts/build/debug.sh b/scripts/build/debug.sh
index f07b295..f8178dd 100644
--- a/scripts/build/debug.sh
+++ b/scripts/build/debug.sh
@@ -5,7 +5,7 @@ CT_DEBUG_FACILITY_LIST=
 for f in "${CT_LIB_DIR}/scripts/build/debug/"*.sh; do
     _f="$(basename "${f}" .sh)"
     _f="${_f#???-}"
-    __f="CT_DEBUG_${_f}"
+    __f="CT_DEBUG_${_f^^}"
     if [ "${!__f}" = "y" ]; then
         CT_DoLog DEBUG "Enabling debug '${_f}'"
         . "${f}"
diff --git a/scripts/build/test_suite.sh b/scripts/build/test_suite.sh
index 8fabf42..e963a99 100644
--- a/scripts/build/test_suite.sh
+++ b/scripts/build/test_suite.sh
@@ -7,8 +7,7 @@
 CT_TEST_SUITE_FACILITY_LIST=
 for f in "${CT_LIB_DIR}/scripts/build/test_suite/"*.sh; do
     _f="$(basename "${f}" .sh)"
-    __f="CT_TEST_SUITE_${_f}"
-    __f=`echo ${__f} | tr "[:lower:]" "[:upper:]"`
+    __f="CT_TEST_SUITE_${_f^^}"
     if [ "${!__f}" = "y" ]; then
         CT_DoLog DEBUG "Enabling test suite '${_f}'"
         . "${f}"
diff --git a/scripts/functions b/scripts/functions
index 7ec6e83..1a8db3b 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -23,7 +23,7 @@ CT_LoadConfig() {
     . "${CT_LIB_DIR}/scripts/build/companion_libs.sh"
     . "${CT_LIB_DIR}/scripts/build/binutils/${CT_BINUTILS}.sh"
     . "${CT_LIB_DIR}/scripts/build/libc/${CT_LIBC}.sh"
-    . "${CT_LIB_DIR}/scripts/build/cc.sh"
+    . "${CT_LIB_DIR}/scripts/build/cc/${CT_CC}.sh"
     . "${CT_LIB_DIR}/scripts/build/debug.sh"
     . "${CT_LIB_DIR}/scripts/build/test_suite.sh"