From 783a25eafb1ffed57f98c44b270577379356745b Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 8 Oct 2014 19:40:46 +1000 Subject: machine/*.conf: Remove use of MACHINE_KCONFIG * Remove the use of MACHINE_KCONFIG, replace with KERNEL_FEATURES Signed-off-by: Nathan Rossi --- conf/machine/kc705-trd-microblazeel.conf | 1 - conf/machine/qemumicroblaze.conf | 2 +- conf/machine/zc702-zynq7.conf | 3 ++- conf/machine/zc706-zynq7.conf | 3 ++- 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" + -- cgit v1.2.3-54-g00ecf