]> code.ossystems Code Review - openembedded-core.git/commitdiff
microblaze tune: Allow no version to be set
authorMark Hatle <mark.hatle@xilinx.com>
Tue, 4 Feb 2020 21:06:27 +0000 (15:06 -0600)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 6 Feb 2020 12:16:02 +0000 (12:16 +0000)
We want to allow no version to be configured.  This should use the GCC default
which is the latest defined version, currently 11.0.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/conf/machine/include/microblaze/feature-microblaze-versions.inc

index 3221e2aab759ef54bbb8a04d3aa824ba40d5b0c9..5c37f49abb7d3445b8f30e672020ef9ecb85c703 100644 (file)
@@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3
 TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0"
 
 # Version flags
-TUNE_CCARGS += "-mcpu=${@microblaze_current_version(d, True)}"
-MBPKGARCH_VERSION = "-${@microblaze_current_version(d)}"
+TUNE_CCARGS += "${@'-mcpu=%s' % (microblaze_current_version(d, True)) if microblaze_current_version(d, True) != '' else ''}"
+MBPKGARCH_VERSION = "${@'-%s' % (microblaze_current_version(d, True)) if microblaze_current_version(d, True) != '' else ''}"