From 91aa15bbce8a7430c3ed25b03d20246adf5ea583 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 19 Apr 2017 13:27:31 +0200 Subject: nios2: Inline tunables into tune-nios2.inc All of these feature-nios-* files are small, so inline them to make it easier to see the changes they make. Signed-off-by: Marek Vasut Signed-off-by: Khem Raj --- .../machine/include/nios2/feature-nios2-divide.inc | 4 --- conf/machine/include/nios2/feature-nios2-fpu.inc | 15 ---------- .../include/nios2/feature-nios2-multiply.inc | 10 ------- conf/machine/include/tune-nios2.inc | 35 ++++++++++++++++++++-- 4 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 conf/machine/include/nios2/feature-nios2-divide.inc delete mode 100644 conf/machine/include/nios2/feature-nios2-fpu.inc delete mode 100644 conf/machine/include/nios2/feature-nios2-multiply.inc diff --git a/conf/machine/include/nios2/feature-nios2-divide.inc b/conf/machine/include/nios2/feature-nios2-divide.inc deleted file mode 100644 index 5a29570..0000000 --- a/conf/machine/include/nios2/feature-nios2-divide.inc +++ /dev/null @@ -1,4 +0,0 @@ -TUNEVALID[hw-div] = "Enable Nios2 hardware divider." -NIOS2CCARGSDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-mhw-div", "" ,d)}" -NIOS2PKGDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-div", "" ,d)}" - diff --git a/conf/machine/include/nios2/feature-nios2-fpu.inc b/conf/machine/include/nios2/feature-nios2-fpu.inc deleted file mode 100644 index 5baeb40..0000000 --- a/conf/machine/include/nios2/feature-nios2-fpu.inc +++ /dev/null @@ -1,15 +0,0 @@ -TARGET_FPU = "fpu-other" - -TUNEVALID[fpu-soft] = "Use Nios2 software FPU" -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)}" - -NIOS2PKGFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-fpu", "", d)}" -NIOS2PKGFPU = "${@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" diff --git a/conf/machine/include/nios2/feature-nios2-multiply.inc b/conf/machine/include/nios2/feature-nios2-multiply.inc deleted file mode 100644 index 3dc2ccb..0000000 --- a/conf/machine/include/nios2/feature-nios2-multiply.inc +++ /dev/null @@ -1,10 +0,0 @@ -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)}" - -NIOS2PKGMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mul", "" ,d)}" -NIOS2PKGMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mulx", "${NIOS2PKGMUL_BASIC}" ,d)}" - diff --git a/conf/machine/include/tune-nios2.inc b/conf/machine/include/tune-nios2.inc index 33c5539..a16d836 100644 --- a/conf/machine/include/tune-nios2.inc +++ b/conf/machine/include/tune-nios2.inc @@ -5,10 +5,39 @@ DEFAULTTUNE ?= "nios2" TUNE_ARCH = "nios2el" -require conf/machine/include/nios2/feature-nios2-multiply.inc -require conf/machine/include/nios2/feature-nios2-divide.inc -require conf/machine/include/nios2/feature-nios2-fpu.inc +# 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)}" + +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)}" +NIOS2PKGDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-div", "" ,d)}" + +# FPU support +TARGET_FPU = "fpu-other" +TUNEVALID[fpu-soft] = "Use Nios2 software FPU" +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)}" + +NIOS2PKGFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-fpu", "", d)}" +NIOS2PKGFPU = "${@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" + +# Architecture configuration AVAILTUNES += "nios2" TUNEVALID[nios2] = "nios2" TUNE_FEATURES_tune-nios2 += "nios2" -- cgit v1.2.3-54-g00ecf