diff options
-rw-r--r-- | conf/machine/include/tune-nios2.inc | 13 |
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" | |||
5 | 5 | ||
6 | TUNE_ARCH = "nios2el" | 6 | TUNE_ARCH = "nios2el" |
7 | 7 | ||
8 | TUNE_CCARGS .= " mel" | ||
9 | |||
8 | # Multiply opcodes | 10 | # Multiply opcodes |
9 | TUNEVALID[hw-mul] = "Enable Nios2 Hardware Multiply" | 11 | TUNEVALID[hw-mul] = "Enable Nios2 Hardware Multiply" |
10 | TUNEVALID[hw-mulx] = "Enable Nios2 Extended Hardware Multiply" | 12 | TUNEVALID[hw-mulx] = "Enable Nios2 Extended Hardware Multiply" |
11 | 13 | ||
12 | # Establish which Multiply output result size to use | 14 | # Establish which Multiply output result size to use |
13 | NIOS2CCARGSMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mhw-mul", "" ,d)}" | 15 | TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", " -mhw-mul", "" ,d)}" |
14 | NIOS2CCARGSMUL += "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mhw-mulx", "" ,d)}" | 16 | TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", " -mhw-mulx", "" ,d)}" |
15 | 17 | ||
16 | NIOS2PKGMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mul", "" ,d)}" | 18 | NIOS2PKGMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mul", "" ,d)}" |
17 | NIOS2PKGMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mulx", "${NIOS2PKGMUL_BASIC}" ,d)}" | 19 | NIOS2PKGMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mulx", "${NIOS2PKGMUL_BASIC}" ,d)}" |
18 | 20 | ||
19 | # Divide opcodes | 21 | # Divide opcodes |
20 | TUNEVALID[hw-div] = "Enable Nios2 hardware divider." | 22 | TUNEVALID[hw-div] = "Enable Nios2 hardware divider." |
21 | NIOS2CCARGSDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-mhw-div", "" ,d)}" | 23 | TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-div", " -mhw-div", "" ,d)}" |
22 | NIOS2PKGDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-div", "" ,d)}" | 24 | NIOS2PKGDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-div", "" ,d)}" |
23 | 25 | ||
24 | # FPU support | 26 | # FPU support |
@@ -28,8 +30,8 @@ TUNEVALID[fpu-custom] = "Enable Nios2 hardware FPU" | |||
28 | TUNEVALID[fpu-customdiv] = "Enable Nios2 hardware FPU with divider" | 30 | TUNEVALID[fpu-customdiv] = "Enable Nios2 hardware FPU with divider" |
29 | 31 | ||
30 | # Establish which fpu is configured in TUNE_FEATURES. Soft is the default for gcc. | 32 | # Establish which fpu is configured in TUNE_FEATURES. Soft is the default for gcc. |
31 | NIOS2CCARGSFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-mcustom-fpu-cfg=60-1", "", d)}" | 33 | NIOS2CCARGSFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", " -mcustom-fpu-cfg=60-1", "", d)}" |
32 | NIOS2CCARGSFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-mcustom-fpu-cfg=60-2", "${NIOS2CCARGSFPU_BASIC}", d)}" | 34 | TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", " -mcustom-fpu-cfg=60-2", "${NIOS2CCARGSFPU_BASIC}", d)}" |
33 | 35 | ||
34 | NIOS2PKGFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-fpu", "", d)}" | 36 | NIOS2PKGFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-fpu", "", d)}" |
35 | NIOS2PKGFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-fpudiv", "${NIOS2PKGFPU_BASIC}", d)}" | 37 | NIOS2PKGFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-fpudiv", "${NIOS2PKGFPU_BASIC}", d)}" |
@@ -42,6 +44,5 @@ AVAILTUNES += "nios2" | |||
42 | TUNEVALID[nios2] = "nios2" | 44 | TUNEVALID[nios2] = "nios2" |
43 | TUNE_FEATURES_tune-nios2 += "nios2" | 45 | TUNE_FEATURES_tune-nios2 += "nios2" |
44 | 46 | ||
45 | TUNE_CCARGS += "-mel ${NIOS2CCARGSDIV} ${NIOS2CCARGSFPU} ${NIOS2CCARGSMUL}" | ||
46 | TUNE_PKGARCH = "nios2${NIOS2PKGMUL}${NIOS2PKGDIV}${NIOS2PKGFPU}" | 47 | TUNE_PKGARCH = "nios2${NIOS2PKGMUL}${NIOS2PKGDIV}${NIOS2PKGFPU}" |
47 | PACKAGE_EXTRA_ARCHS_tune-nios2 = "${TUNE_PKGARCH}" | 48 | PACKAGE_EXTRA_ARCHS_tune-nios2 = "${TUNE_PKGARCH}" |