diff options
-rw-r--r-- | conf/machine/include/nios2/feature-nios2-divide.inc | 4 | ||||
-rw-r--r-- | conf/machine/include/nios2/feature-nios2-fpu.inc | 15 | ||||
-rw-r--r-- | conf/machine/include/nios2/feature-nios2-multiply.inc | 10 | ||||
-rw-r--r-- | conf/machine/include/tune-nios2.inc | 35 |
4 files changed, 32 insertions, 32 deletions
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 @@ | |||
1 | TUNEVALID[hw-div] = "Enable Nios2 hardware divider." | ||
2 | NIOS2CCARGSDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-mhw-div", "" ,d)}" | ||
3 | NIOS2PKGDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-div", "" ,d)}" | ||
4 | |||
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 @@ | |||
1 | TARGET_FPU = "fpu-other" | ||
2 | |||
3 | TUNEVALID[fpu-soft] = "Use Nios2 software FPU" | ||
4 | TUNEVALID[fpu-custom] = "Enable Nios2 hardware FPU" | ||
5 | TUNEVALID[fpu-customdiv] = "Enable Nios2 hardware FPU with divider" | ||
6 | |||
7 | # Establish which fpu is configured in TUNE_FEATURES. Soft is the default for gcc. | ||
8 | NIOS2CCARGSFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-mcustom-fpu-cfg=60-1", "", d)}" | ||
9 | NIOS2CCARGSFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-mcustom-fpu-cfg=60-2", "${NIOS2CCARGSFPU_BASIC}", d)}" | ||
10 | |||
11 | NIOS2PKGFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-fpu", "", d)}" | ||
12 | NIOS2PKGFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-fpudiv", "${NIOS2PKGFPU_BASIC}", d)}" | ||
13 | |||
14 | TUNECONFLICTS[fpu-custom] = "fpu-soft fpu-customdiv" | ||
15 | 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 @@ | |||
1 | TUNEVALID[hw-mul] = "Enable Nios2 Hardware Multiply" | ||
2 | TUNEVALID[hw-mulx] = "Enable Nios2 Extended Hardware Multiply" | ||
3 | |||
4 | # Establish which Multiply output result size to use | ||
5 | NIOS2CCARGSMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mhw-mul", "" ,d)}" | ||
6 | NIOS2CCARGSMUL += "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mhw-mulx", "" ,d)}" | ||
7 | |||
8 | NIOS2PKGMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mul", "" ,d)}" | ||
9 | NIOS2PKGMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mulx", "${NIOS2PKGMUL_BASIC}" ,d)}" | ||
10 | |||
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" | |||
5 | 5 | ||
6 | TUNE_ARCH = "nios2el" | 6 | TUNE_ARCH = "nios2el" |
7 | 7 | ||
8 | require conf/machine/include/nios2/feature-nios2-multiply.inc | 8 | # Multiply opcodes |
9 | require conf/machine/include/nios2/feature-nios2-divide.inc | 9 | TUNEVALID[hw-mul] = "Enable Nios2 Hardware Multiply" |
10 | require conf/machine/include/nios2/feature-nios2-fpu.inc | 10 | TUNEVALID[hw-mulx] = "Enable Nios2 Extended Hardware Multiply" |
11 | 11 | ||
12 | # Establish which Multiply output result size to use | ||
13 | NIOS2CCARGSMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mhw-mul", "" ,d)}" | ||
14 | NIOS2CCARGSMUL += "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mhw-mulx", "" ,d)}" | ||
15 | |||
16 | NIOS2PKGMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mul", "" ,d)}" | ||
17 | NIOS2PKGMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mulx", "${NIOS2PKGMUL_BASIC}" ,d)}" | ||
18 | |||
19 | # Divide opcodes | ||
20 | TUNEVALID[hw-div] = "Enable Nios2 hardware divider." | ||
21 | NIOS2CCARGSDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-mhw-div", "" ,d)}" | ||
22 | NIOS2PKGDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-div", "" ,d)}" | ||
23 | |||
24 | # FPU support | ||
25 | TARGET_FPU = "fpu-other" | ||
26 | TUNEVALID[fpu-soft] = "Use Nios2 software FPU" | ||
27 | TUNEVALID[fpu-custom] = "Enable Nios2 hardware FPU" | ||
28 | TUNEVALID[fpu-customdiv] = "Enable Nios2 hardware FPU with divider" | ||
29 | |||
30 | # 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)}" | ||
32 | NIOS2CCARGSFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-mcustom-fpu-cfg=60-2", "${NIOS2CCARGSFPU_BASIC}", d)}" | ||
33 | |||
34 | NIOS2PKGFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-fpu", "", d)}" | ||
35 | NIOS2PKGFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-fpudiv", "${NIOS2PKGFPU_BASIC}", d)}" | ||
36 | |||
37 | TUNECONFLICTS[fpu-custom] = "fpu-soft fpu-customdiv" | ||
38 | TUNECONFLICTS[fpu-customdiv] = "fpu-soft fpu-custom" | ||
39 | |||
40 | # Architecture configuration | ||
12 | AVAILTUNES += "nios2" | 41 | AVAILTUNES += "nios2" |
13 | TUNEVALID[nios2] = "nios2" | 42 | TUNEVALID[nios2] = "nios2" |
14 | TUNE_FEATURES_tune-nios2 += "nios2" | 43 | TUNE_FEATURES_tune-nios2 += "nios2" |