nios2: Zap NIOS2CCARGS*

Just append TUNE_CCARGS instead of having all sorts of ad-hoc variables
all over the place.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/conf/machine/include/tune-nios2.inc b/conf/machine/include/tune-nios2.inc
index a16d836..304adbc 100644
--- a/conf/machine/include/tune-nios2.inc
+++ b/conf/machine/include/tune-nios2.inc
@@ -5,20 +5,22 @@ DEFAULTTUNE ?= "nios2"
 
 TUNE_ARCH = "nios2el"
 
+TUNE_CCARGS .= " mel"
+
 # Multiply opcodes
 TUNEVALID[hw-mul] = "Enable Nios2 Hardware Multiply"
 TUNEVALID[hw-mulx] = "Enable Nios2 Extended Hardware Multiply"
 
 # Establish which Multiply output result size to use
-NIOS2CCARGSMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mhw-mul", "" ,d)}"
-NIOS2CCARGSMUL += "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mhw-mulx", "" ,d)}"
+TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", " -mhw-mul", "" ,d)}"
+TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", " -mhw-mulx", "" ,d)}"
 
 NIOS2PKGMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mul", "" ,d)}"
 NIOS2PKGMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mulx", "${NIOS2PKGMUL_BASIC}" ,d)}"
 
 # Divide opcodes
 TUNEVALID[hw-div] = "Enable Nios2 hardware divider."
-NIOS2CCARGSDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-mhw-div", "" ,d)}"
+TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-div", " -mhw-div", "" ,d)}"
 NIOS2PKGDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-div", "" ,d)}"
 
 # FPU support
@@ -28,8 +30,8 @@ TUNEVALID[fpu-custom] = "Enable Nios2 hardware FPU"
 TUNEVALID[fpu-customdiv] = "Enable Nios2 hardware FPU with divider"
 
 # Establish which fpu is configured in TUNE_FEATURES. Soft is the default for gcc.
-NIOS2CCARGSFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-mcustom-fpu-cfg=60-1", "", d)}"
-NIOS2CCARGSFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-mcustom-fpu-cfg=60-2", "${NIOS2CCARGSFPU_BASIC}", d)}"
+NIOS2CCARGSFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", " -mcustom-fpu-cfg=60-1", "", d)}"
+TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", " -mcustom-fpu-cfg=60-2", "${NIOS2CCARGSFPU_BASIC}", d)}"
 
 NIOS2PKGFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-fpu", "", d)}"
 NIOS2PKGFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-fpudiv", "${NIOS2PKGFPU_BASIC}", d)}"
@@ -42,6 +44,5 @@ AVAILTUNES += "nios2"
 TUNEVALID[nios2] = "nios2"
 TUNE_FEATURES_tune-nios2 += "nios2"
 
-TUNE_CCARGS += "-mel ${NIOS2CCARGSDIV} ${NIOS2CCARGSFPU} ${NIOS2CCARGSMUL}"
 TUNE_PKGARCH = "nios2${NIOS2PKGMUL}${NIOS2PKGDIV}${NIOS2PKGFPU}"
 PACKAGE_EXTRA_ARCHS_tune-nios2 = "${TUNE_PKGARCH}"