diff options
author | Marek Vasut <marex@denx.de> | 2017-04-19 13:27:34 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2017-04-25 17:50:00 -0700 |
commit | ec4aa12f74674de874b4ba909f08d97d77f2e9ec (patch) | |
tree | 506c7b8383a5a883272346d10e0a0cc0bba1b269 | |
parent | 3fd8debe0a087cdc53138028af8288969cb842e2 (diff) | |
download | meta-altera-ec4aa12f74674de874b4ba909f08d97d77f2e9ec.tar.gz |
nios2: Consolidate Nios2 R1 EL
Rewrite the tune description and drop duplicate TUNE_ARCH.
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | conf/machine/10m50.conf | 1 | ||||
-rw-r--r-- | conf/machine/generic-nios2.conf | 2 | ||||
-rw-r--r-- | conf/machine/include/tune-nios2.inc | 8 |
3 files changed, 4 insertions, 7 deletions
diff --git a/conf/machine/10m50.conf b/conf/machine/10m50.conf index 9716740..0e7d0c6 100644 --- a/conf/machine/10m50.conf +++ b/conf/machine/10m50.conf | |||
@@ -4,7 +4,6 @@ | |||
4 | 4 | ||
5 | require conf/machine/include/tune-nios2.inc | 5 | require conf/machine/include/tune-nios2.inc |
6 | 6 | ||
7 | TUNE_ARCH = "nios2" | ||
8 | TUNE_FEATURES += "hw-div hw-mul" | 7 | TUNE_FEATURES += "hw-div hw-mul" |
9 | 8 | ||
10 | UBOOT_CONFIG ??= "qspi" | 9 | UBOOT_CONFIG ??= "qspi" |
diff --git a/conf/machine/generic-nios2.conf b/conf/machine/generic-nios2.conf index 12c9564..2d093a0 100644 --- a/conf/machine/generic-nios2.conf +++ b/conf/machine/generic-nios2.conf | |||
@@ -4,8 +4,6 @@ | |||
4 | 4 | ||
5 | require conf/machine/include/tune-nios2.inc | 5 | require conf/machine/include/tune-nios2.inc |
6 | 6 | ||
7 | TUNE_ARCH = "nios2" | ||
8 | |||
9 | MACHINE_FEATURES = "kernel26 serial" | 7 | MACHINE_FEATURES = "kernel26 serial" |
10 | 8 | ||
11 | KERNEL_IMAGETYPE = "zImage" | 9 | KERNEL_IMAGETYPE = "zImage" |
diff --git a/conf/machine/include/tune-nios2.inc b/conf/machine/include/tune-nios2.inc index 1b131bd..71755f3 100644 --- a/conf/machine/include/tune-nios2.inc +++ b/conf/machine/include/tune-nios2.inc | |||
@@ -3,8 +3,8 @@ | |||
3 | 3 | ||
4 | DEFAULTTUNE ?= "nios2" | 4 | DEFAULTTUNE ?= "nios2" |
5 | 5 | ||
6 | TUNE_ARCH = "nios2el" | 6 | TUNE_ARCH = "nios2" |
7 | TUNE_PKGARCH = "nios2" | 7 | TUNE_PKGARCH = "${DEFAULTTUNE}" |
8 | TUNE_CCARGS .= " -mel" | 8 | TUNE_CCARGS .= " -mel" |
9 | 9 | ||
10 | # Multiply opcodes | 10 | # Multiply opcodes |
@@ -41,7 +41,7 @@ TUNECONFLICTS[fpu-customdiv] = "fpu-soft fpu-custom" | |||
41 | 41 | ||
42 | # Architecture configuration | 42 | # Architecture configuration |
43 | AVAILTUNES += "nios2" | 43 | AVAILTUNES += "nios2" |
44 | TUNEVALID[nios2] = "nios2" | ||
45 | TUNE_FEATURES_tune-nios2 += "nios2" | ||
46 | 44 | ||
45 | TUNEVALID[nios2] = "Nios2 R1 Little-Endian" | ||
46 | TUNE_FEATURES_tune-nios2 = "nios2" | ||
47 | PACKAGE_EXTRA_ARCHS_tune-nios2 = "${TUNE_PKGARCH}" | 47 | PACKAGE_EXTRA_ARCHS_tune-nios2 = "${TUNE_PKGARCH}" |