From ec4aa12f74674de874b4ba909f08d97d77f2e9ec Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 19 Apr 2017 13:27:34 +0200 Subject: nios2: Consolidate Nios2 R1 EL Rewrite the tune description and drop duplicate TUNE_ARCH. Signed-off-by: Marek Vasut Signed-off-by: Khem Raj --- conf/machine/10m50.conf | 1 - conf/machine/generic-nios2.conf | 2 -- 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 @@ require conf/machine/include/tune-nios2.inc -TUNE_ARCH = "nios2" TUNE_FEATURES += "hw-div hw-mul" 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 @@ require conf/machine/include/tune-nios2.inc -TUNE_ARCH = "nios2" - MACHINE_FEATURES = "kernel26 serial" 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 @@ DEFAULTTUNE ?= "nios2" -TUNE_ARCH = "nios2el" -TUNE_PKGARCH = "nios2" +TUNE_ARCH = "nios2" +TUNE_PKGARCH = "${DEFAULTTUNE}" TUNE_CCARGS .= " -mel" # Multiply opcodes @@ -41,7 +41,7 @@ TUNECONFLICTS[fpu-customdiv] = "fpu-soft fpu-custom" # Architecture configuration AVAILTUNES += "nios2" -TUNEVALID[nios2] = "nios2" -TUNE_FEATURES_tune-nios2 += "nios2" +TUNEVALID[nios2] = "Nios2 R1 Little-Endian" +TUNE_FEATURES_tune-nios2 = "nios2" PACKAGE_EXTRA_ARCHS_tune-nios2 = "${TUNE_PKGARCH}" -- cgit v1.2.3-54-g00ecf