summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2015-05-05 14:07:16 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2015-05-05 14:07:16 +1000
commit373f5faed7bb2c616f866387a22fece03a870f2a (patch)
tree6a990198f878c1935054cd50ea7d06d0b072b960
parent683e123845c7e4633eb9619c316d0c07bc2b5e18 (diff)
downloadmeta-xilinx-373f5faed7bb2c616f866387a22fece03a870f2a.tar.gz
tune-microblaze.inc: Remove SOC_FAMILY add MACHINEOVERRIDES addition
* Remove the use of SOC_FAMILY in the tune-microblaze.inc include * Add "microblaze" to MACHINEOVERRIDES when the "microblaze" feature is part of TUNE_FEATURES Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-rw-r--r--conf/machine/include/tune-microblaze.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/machine/include/tune-microblaze.inc b/conf/machine/include/tune-microblaze.inc
index cf65ace9..a5b6109e 100644
--- a/conf/machine/include/tune-microblaze.inc
+++ b/conf/machine/include/tune-microblaze.inc
@@ -1,8 +1,6 @@
1DEFAULTTUNE ?= "microblaze" 1DEFAULTTUNE ?= "microblaze"
2SOC_FAMILY ?= "microblaze"
3 2
4require conf/machine/include/tune-microblaze-features.inc 3require conf/machine/include/tune-microblaze-features.inc
5require conf/machine/include/soc-family.inc
6 4
7TUNEVALID[microblaze] = "Microblaze" 5TUNEVALID[microblaze] = "Microblaze"
8AVAILTUNES += "microblaze" 6AVAILTUNES += "microblaze"
@@ -10,6 +8,9 @@ AVAILTUNES += "microblaze"
10TUNE_FEATURES_tune-microblaze = "microblaze" 8TUNE_FEATURES_tune-microblaze = "microblaze"
11PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" 9PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
12 10
11# override for architecture
12MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "" ,d)}"
13
13# Linux Configuration 14# Linux Configuration
14KERNEL_IMAGETYPE ?= "linux.bin.ub" 15KERNEL_IMAGETYPE ?= "linux.bin.ub"
15 16