conf/machine/*.conf: Update MACHINE_FEATURES

* Update MACHINE_FEATURES for each machine to reflect the correct
  features provided on a per machine basis

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

8 files changed, 18 insertions, 7 deletions

diff --git a/conf/machine/kc705-trd-microblazeel.conf b/conf/machine/kc705-trd-microblazeel.conf
index 43063c6c..9c35a3df 100644
--- a/conf/machine/kc705-trd-microblazeel.conf
+++ b/conf/machine/kc705-trd-microblazeel.conf
@@ -11,14 +11,14 @@
 #     http://www.xilinx.com/support/index.html/content/xilinx/en/supportNav/boards_and_kits/kintex-7_boards_and_kits/kintex-7_fpga_embedded_kit.html
 #
 
-TARGET_CPU = "microblazeel"
-MACHINE_FEATURES := ""
-
 require conf/machine/include/tune-microblaze.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-board.inc
+
 TUNE_FEATURES_tune-microblaze += "v8.50 little-endian barrel-shift pattern-compare reorder multiply-low"
 
+MACHINE_FEATURES = ""
+
 USE_VT = ""
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf
index 2831eee3..374e7107 100644
--- a/conf/machine/microzed-zynq7.conf
+++ b/conf/machine/microzed-zynq7.conf
@@ -6,6 +6,8 @@ require conf/machine/include/tune-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-board.inc
 
+MACHINE_FEATURES = "ext2 vfat usbhost"
+
 # microZed machine definition known by Xilinx UBOOT
 UBOOT_MACHINE = "zynq_microzed_config"
 
diff --git a/conf/machine/picozed-zynq7.conf b/conf/machine/picozed-zynq7.conf
index 0573a30b..63466aee 100644
--- a/conf/machine/picozed-zynq7.conf
+++ b/conf/machine/picozed-zynq7.conf
@@ -10,6 +10,8 @@ require conf/machine/include/tune-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-board.inc
 
+MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
+
 # microZed machine definition known by Xilinx UBOOT
 UBOOT_MACHINE = "zynq_picozed_config"
 
diff --git a/conf/machine/qemumicroblaze.conf b/conf/machine/qemumicroblaze.conf
index 66e93a8b..e6593213 100644
--- a/conf/machine/qemumicroblaze.conf
+++ b/conf/machine/qemumicroblaze.conf
@@ -2,12 +2,13 @@
 #@NAME: qemumicroblaze
 #@DESCRIPTION: MicroBlaze QEMU machine support ('petalogix-ml605' model)
 
-MACHINE_FEATURES := ""
-
 require conf/machine/include/tune-microblaze.inc
 require conf/machine/include/machine-xilinx-default.inc
+
 TUNE_FEATURES_tune-microblaze += "v8.50 little-endian barrel-shift reorder pattern-compare divide-hard multiply-high fpu-hard"
 
+MACHINE_FEATURES = ""
+
 EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
 
 USE_VT = ""
diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf
index b67cf591..b674ae95 100644
--- a/conf/machine/qemuzynq.conf
+++ b/conf/machine/qemuzynq.conf
@@ -2,11 +2,11 @@
 #@NAME: qemuzynq
 #@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model)
 
-MACHINE_FEATURES := ""
-
 require conf/machine/include/tune-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 
+MACHINE_FEATURES = "ext2 vfat"
+
 EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf
index 46cfea35..096d9d11 100644
--- a/conf/machine/zc702-zynq7.conf
+++ b/conf/machine/zc702-zynq7.conf
@@ -13,6 +13,8 @@ require conf/machine/include/tune-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-board.inc
 
+MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
+
 # ZC70x machine definition known by Xilinx UBOOT
 UBOOT_MACHINE = "zynq_zc70x_config"
 
diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf
index 277d6101..8bc04836 100644
--- a/conf/machine/zc706-zynq7.conf
+++ b/conf/machine/zc706-zynq7.conf
@@ -13,6 +13,8 @@ require conf/machine/include/tune-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-board.inc
 
+MACHINE_FEATURES = "rtc ext2 vfat usbhost usbgadget"
+
 # ZC70x machine definition known by Xilinx UBOOT
 UBOOT_MACHINE = "zynq_zc70x_config"
 
diff --git a/conf/machine/zybo-zynq7.conf b/conf/machine/zybo-zynq7.conf
index 421a4907..b1be2a03 100644
--- a/conf/machine/zybo-zynq7.conf
+++ b/conf/machine/zybo-zynq7.conf
@@ -10,6 +10,8 @@ require conf/machine/include/tune-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-board.inc
 
+MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
+
 UBOOT_MACHINE = "zynq_zybo_config"
 
 SERIAL_CONSOLE = "115200 ttyPS0"