aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2014-10-08 19:40:46 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2014-10-27 17:58:47 +1000
commit783a25eafb1ffed57f98c44b270577379356745b (patch)
treee1ffaa0563e9f4620201e9a9bff1d74a0d9cea4b
parent5ace286d7b941572edb8d3a61a8e045cfee35dc0 (diff)
downloadmeta-xilinx-783a25eafb1ffed57f98c44b270577379356745b.tar.gz
meta-xilinx-783a25eafb1ffed57f98c44b270577379356745b.tar.bz2
meta-xilinx-783a25eafb1ffed57f98c44b270577379356745b.zip
machine/*.conf: Remove use of MACHINE_KCONFIG
* Remove the use of MACHINE_KCONFIG, replace with KERNEL_FEATURES Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-rw-r--r--conf/machine/kc705-trd-microblazeel.conf1
-rw-r--r--conf/machine/qemumicroblaze.conf2
-rw-r--r--conf/machine/zc702-zynq7.conf3
-rw-r--r--conf/machine/zc706-zynq7.conf3
4 files changed, 5 insertions, 4 deletions
diff --git a/conf/machine/kc705-trd-microblazeel.conf b/conf/machine/kc705-trd-microblazeel.conf
index 56e2abd2..8c78f51d 100644
--- a/conf/machine/kc705-trd-microblazeel.conf
+++ b/conf/machine/kc705-trd-microblazeel.conf
@@ -22,5 +22,4 @@ TUNE_FEATURES_tune-microblaze += "v8.50 little-endian barrel-shift pattern-compa
SERIAL_CONSOLE = "115200 ttyS0"
MACHINE_DEVICETREE := "kc705/kc705-trd-microblazeel.dts"
-MACHINE_KCONFIG := "kc705/kc705-trd-microblazeel.kconfig.cfg"
MACHINE_XPARAMETERS := "kc705/kc705-trd-microblazeel.xparameters.h"
diff --git a/conf/machine/qemumicroblaze.conf b/conf/machine/qemumicroblaze.conf
index 43de00b1..0ff36bac 100644
--- a/conf/machine/qemumicroblaze.conf
+++ b/conf/machine/qemumicroblaze.conf
@@ -13,4 +13,4 @@ EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
SERIAL_CONSOLE = "115200 ttyS0"
MACHINE_DEVICETREE := "qemu/qemumicroblaze.dts"
-MACHINE_KCONFIG := "qemu/qemumicroblaze.cfg"
+
diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf
index 25bd3385..8613d4f5 100644
--- a/conf/machine/zc702-zynq7.conf
+++ b/conf/machine/zc702-zynq7.conf
@@ -23,4 +23,5 @@ MACHINE_DEVICETREE := " \
zc702/zc702-zynq7.dts \
"
-MACHINE_KCONFIG := "common/linux/rtc.cfg"
+KERNEL_FEATURES += "features/rtc/rtc.scc"
+
diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf
index 7b5123a3..29fc3178 100644
--- a/conf/machine/zc706-zynq7.conf
+++ b/conf/machine/zc706-zynq7.conf
@@ -23,4 +23,5 @@ MACHINE_DEVICETREE := " \
zc706/zc706-zynq7.dts \
"
-MACHINE_KCONFIG := "common/linux/rtc.cfg"
+KERNEL_FEATURES += "features/rtc/rtc.scc"
+