diff options
author | Marek Vasut <marex@denx.de> | 2017-04-19 13:27:33 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2017-04-25 17:49:59 -0700 |
commit | 3fd8debe0a087cdc53138028af8288969cb842e2 (patch) | |
tree | f470275205a08a2452c7c03022b17d7d236fcc26 | |
parent | 8896024c67625dca0ccdb3713d94c9454ee34d6d (diff) | |
download | meta-altera-3fd8debe0a087cdc53138028af8288969cb842e2.tar.gz |
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 <marex@denx.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | conf/machine/include/tune-nios2.inc | 11 |
1 files 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 @@ | |||
4 | DEFAULTTUNE ?= "nios2" | 4 | DEFAULTTUNE ?= "nios2" |
5 | 5 | ||
6 | TUNE_ARCH = "nios2el" | 6 | TUNE_ARCH = "nios2el" |
7 | 7 | TUNE_PKGARCH = "nios2" | |
8 | TUNE_CCARGS .= " mel" | 8 | TUNE_CCARGS .= " -mel" |
9 | 9 | ||
10 | # Multiply opcodes | 10 | # Multiply opcodes |
11 | TUNEVALID[hw-mul] = "Enable Nios2 Hardware Multiply" | 11 | TUNEVALID[hw-mul] = "Enable Nios2 Hardware Multiply" |
@@ -16,12 +16,12 @@ TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", " -mhw-mul", "" | |||
16 | TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", " -mhw-mulx", "" ,d)}" | 16 | TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", " -mhw-mulx", "" ,d)}" |
17 | 17 | ||
18 | NIOS2PKGMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mul", "" ,d)}" | 18 | NIOS2PKGMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "hw-mul", "-mul", "" ,d)}" |
19 | NIOS2PKGMUL = "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mulx", "${NIOS2PKGMUL_BASIC}" ,d)}" | 19 | TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "hw-mulx", "-mulx", "${NIOS2PKGMUL_BASIC}" ,d)}" |
20 | 20 | ||
21 | # Divide opcodes | 21 | # Divide opcodes |
22 | TUNEVALID[hw-div] = "Enable Nios2 hardware divider." | 22 | TUNEVALID[hw-div] = "Enable Nios2 hardware divider." |
23 | TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-div", " -mhw-div", "" ,d)}" | 23 | TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "hw-div", " -mhw-div", "" ,d)}" |
24 | NIOS2PKGDIV = "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-div", "" ,d)}" | 24 | TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "hw-div", "-div", "" ,d)}" |
25 | 25 | ||
26 | # FPU support | 26 | # FPU support |
27 | TARGET_FPU = "fpu-other" | 27 | TARGET_FPU = "fpu-other" |
@@ -34,7 +34,7 @@ NIOS2CCARGSFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", " -m | |||
34 | TUNE_CCARGS .= "${@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)}" |
35 | 35 | ||
36 | NIOS2PKGFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-fpu", "", d)}" | 36 | NIOS2PKGFPU_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "fpu-custom", "-fpu", "", d)}" |
37 | NIOS2PKGFPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-fpudiv", "${NIOS2PKGFPU_BASIC}", d)}" | 37 | TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-customdiv", "-fpudiv", "${NIOS2PKGFPU_BASIC}", d)}" |
38 | 38 | ||
39 | TUNECONFLICTS[fpu-custom] = "fpu-soft fpu-customdiv" | 39 | TUNECONFLICTS[fpu-custom] = "fpu-soft fpu-customdiv" |
40 | TUNECONFLICTS[fpu-customdiv] = "fpu-soft fpu-custom" | 40 | TUNECONFLICTS[fpu-customdiv] = "fpu-soft fpu-custom" |
@@ -44,5 +44,4 @@ AVAILTUNES += "nios2" | |||
44 | TUNEVALID[nios2] = "nios2" | 44 | TUNEVALID[nios2] = "nios2" |
45 | TUNE_FEATURES_tune-nios2 += "nios2" | 45 | TUNE_FEATURES_tune-nios2 += "nios2" |
46 | 46 | ||
47 | TUNE_PKGARCH = "nios2${NIOS2PKGMUL}${NIOS2PKGDIV}${NIOS2PKGFPU}" | ||
48 | PACKAGE_EXTRA_ARCHS_tune-nios2 = "${TUNE_PKGARCH}" | 47 | PACKAGE_EXTRA_ARCHS_tune-nios2 = "${TUNE_PKGARCH}" |