summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2017-04-19 13:27:31 +0200
committerKhem Raj <raj.khem@gmail.com>2017-04-25 17:49:59 -0700
commit91aa15bbce8a7430c3ed25b03d20246adf5ea583 (patch)
treec1fce81be33bb09fa86d3345891392665f5d974d
parent4f0215c88e609dc07b061d691e3c01652261b460 (diff)
downloadmeta-altera-91aa15bbce8a7430c3ed25b03d20246adf5ea583.tar.gz
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 <marex@denx.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--conf/machine/include/nios2/feature-nios2-divide.inc4
-rw-r--r--conf/machine/include/nios2/feature-nios2-fpu.inc15
-rw-r--r--conf/machine/include/nios2/feature-nios2-multiply.inc10
-rw-r--r--conf/machine/include/tune-nios2.inc35
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 @@
1TUNEVALID[hw-div] = "Enable Nios2 hardware divider."
2NIOS2CCARGSDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-mhw-div", "" ,d)}"
3NIOS2PKGDIV = "${@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 @@
1TARGET_FPU = "fpu-other"
2
3TUNEVALID[fpu-soft] = "Use Nios2 software FPU"
4TUNEVALID[fpu-custom] = "Enable Nios2 hardware FPU"
5TUNEVALID[fpu-customdiv] = "Enable Nios2 hardware FPU with divider"
6
7# Establish which fpu is configured in TUNE_FEATURES. Soft is the default for gcc.
8NIOS2CCARGSFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-mcustom-fpu-cfg=60-1", "", d)}"
9NIOS2CCARGSFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-mcustom-fpu-cfg=60-2", "${NIOS2CCARGSFPU_BASIC}", d)}"
10
11NIOS2PKGFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-fpu", "", d)}"
12NIOS2PKGFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-fpudiv", "${NIOS2PKGFPU_BASIC}", d)}"
13
14TUNECONFLICTS[fpu-custom] = "fpu-soft fpu-customdiv"
15TUNECONFLICTS[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 @@
1TUNEVALID[hw-mul] = "Enable Nios2 Hardware Multiply"
2TUNEVALID[hw-mulx] = "Enable Nios2 Extended Hardware Multiply"
3
4# Establish which Multiply output result size to use
5NIOS2CCARGSMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mhw-mul", "" ,d)}"
6NIOS2CCARGSMUL += "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mhw-mulx", "" ,d)}"
7
8NIOS2PKGMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mul", "" ,d)}"
9NIOS2PKGMUL = "${@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
6TUNE_ARCH = "nios2el" 6TUNE_ARCH = "nios2el"
7 7
8require conf/machine/include/nios2/feature-nios2-multiply.inc 8# Multiply opcodes
9require conf/machine/include/nios2/feature-nios2-divide.inc 9TUNEVALID[hw-mul] = "Enable Nios2 Hardware Multiply"
10require conf/machine/include/nios2/feature-nios2-fpu.inc 10TUNEVALID[hw-mulx] = "Enable Nios2 Extended Hardware Multiply"
11 11
12# Establish which Multiply output result size to use
13NIOS2CCARGSMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mhw-mul", "" ,d)}"
14NIOS2CCARGSMUL += "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mhw-mulx", "" ,d)}"
15
16NIOS2PKGMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mul", "" ,d)}"
17NIOS2PKGMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mulx", "${NIOS2PKGMUL_BASIC}" ,d)}"
18
19# Divide opcodes
20TUNEVALID[hw-div] = "Enable Nios2 hardware divider."
21NIOS2CCARGSDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-mhw-div", "" ,d)}"
22NIOS2PKGDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-div", "" ,d)}"
23
24# FPU support
25TARGET_FPU = "fpu-other"
26TUNEVALID[fpu-soft] = "Use Nios2 software FPU"
27TUNEVALID[fpu-custom] = "Enable Nios2 hardware FPU"
28TUNEVALID[fpu-customdiv] = "Enable Nios2 hardware FPU with divider"
29
30# Establish which fpu is configured in TUNE_FEATURES. Soft is the default for gcc.
31NIOS2CCARGSFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-mcustom-fpu-cfg=60-1", "", d)}"
32NIOS2CCARGSFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-mcustom-fpu-cfg=60-2", "${NIOS2CCARGSFPU_BASIC}", d)}"
33
34NIOS2PKGFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-fpu", "", d)}"
35NIOS2PKGFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-fpudiv", "${NIOS2PKGFPU_BASIC}", d)}"
36
37TUNECONFLICTS[fpu-custom] = "fpu-soft fpu-customdiv"
38TUNECONFLICTS[fpu-customdiv] = "fpu-soft fpu-custom"
39
40# Architecture configuration
12AVAILTUNES += "nios2" 41AVAILTUNES += "nios2"
13TUNEVALID[nios2] = "nios2" 42TUNEVALID[nios2] = "nios2"
14TUNE_FEATURES_tune-nios2 += "nios2" 43TUNE_FEATURES_tune-nios2 += "nios2"