From 3fd8debe0a087cdc53138028af8288969cb842e2 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 19 Apr 2017 13:27:33 +0200 Subject: nios2: Zap NIOS2PKG* Just append TUNE_PKGARCH instead of having all sorts of ad-hoc variables all over the place. Signed-off-by: Marek Vasut Signed-off-by: Khem Raj --- conf/machine/include/tune-nios2.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/tune-nios2.inc b/conf/machine/include/tune-nios2.inc index 304adbc..1b131bd 100644 --- a/conf/machine/include/tune-nios2.inc +++ b/conf/machine/include/tune-nios2.inc @@ -4,8 +4,8 @@ DEFAULTTUNE ?= "nios2" TUNE_ARCH = "nios2el" - -TUNE_CCARGS .= " mel" +TUNE_PKGARCH = "nios2" +TUNE_CCARGS .= " -mel" # Multiply opcodes TUNEVALID[hw-mul] = "Enable Nios2 Hardware Multiply" @@ -16,12 +16,12 @@ TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", " -mhw-mul", "" 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)}" +TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mulx", "${NIOS2PKGMUL_BASIC}" ,d)}" # Divide opcodes TUNEVALID[hw-div] = "Enable Nios2 hardware divider." TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-div", " -mhw-div", "" ,d)}" -NIOS2PKGDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-div", "" ,d)}" +TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-div", "" ,d)}" # FPU support TARGET_FPU = "fpu-other" @@ -34,7 +34,7 @@ NIOS2CCARGSFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", " -m 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)}" +TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-fpudiv", "${NIOS2PKGFPU_BASIC}", d)}" TUNECONFLICTS[fpu-custom] = "fpu-soft fpu-customdiv" TUNECONFLICTS[fpu-customdiv] = "fpu-soft fpu-custom" @@ -44,5 +44,4 @@ AVAILTUNES += "nios2" TUNEVALID[nios2] = "nios2" TUNE_FEATURES_tune-nios2 += "nios2" -TUNE_PKGARCH = "nios2${NIOS2PKGMUL}${NIOS2PKGDIV}${NIOS2PKGFPU}" PACKAGE_EXTRA_ARCHS_tune-nios2 = "${TUNE_PKGARCH}" -- cgit v1.2.3-54-g00ecf