diff options
author | Nathan Rossi <nathan.rossi@xilinx.com> | 2015-05-05 14:07:16 +1000 |
---|---|---|
committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2015-05-05 14:07:16 +1000 |
commit | 373f5faed7bb2c616f866387a22fece03a870f2a (patch) | |
tree | 6a990198f878c1935054cd50ea7d06d0b072b960 | |
parent | 683e123845c7e4633eb9619c316d0c07bc2b5e18 (diff) | |
download | meta-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.inc | 5 |
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 @@ | |||
1 | DEFAULTTUNE ?= "microblaze" | 1 | DEFAULTTUNE ?= "microblaze" |
2 | SOC_FAMILY ?= "microblaze" | ||
3 | 2 | ||
4 | require conf/machine/include/tune-microblaze-features.inc | 3 | require conf/machine/include/tune-microblaze-features.inc |
5 | require conf/machine/include/soc-family.inc | ||
6 | 4 | ||
7 | TUNEVALID[microblaze] = "Microblaze" | 5 | TUNEVALID[microblaze] = "Microblaze" |
8 | AVAILTUNES += "microblaze" | 6 | AVAILTUNES += "microblaze" |
@@ -10,6 +8,9 @@ AVAILTUNES += "microblaze" | |||
10 | TUNE_FEATURES_tune-microblaze = "microblaze" | 8 | TUNE_FEATURES_tune-microblaze = "microblaze" |
11 | PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" | 9 | PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" |
12 | 10 | ||
11 | # override for architecture | ||
12 | MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "" ,d)}" | ||
13 | |||
13 | # Linux Configuration | 14 | # Linux Configuration |
14 | KERNEL_IMAGETYPE ?= "linux.bin.ub" | 15 | KERNEL_IMAGETYPE ?= "linux.bin.ub" |
15 | 16 | ||