aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2014-11-06 15:46:48 +1000
committerElvis Dowson <elvis.dowson@gmail.com>2014-11-19 08:21:58 +0400
commit9d63027aa70c7b9d36fe54b514d80c5fdd57107a (patch)
tree6936f9a9f8e1a20981941f88d3d3675d5962691a
parent02e7ca09886d46e58ef52132749d2270be52024f (diff)
downloadmeta-xilinx-community-9d63027aa70c7b9d36fe54b514d80c5fdd57107a.tar.gz
meta-xilinx-community-9d63027aa70c7b9d36fe54b514d80c5fdd57107a.tar.bz2
meta-xilinx-community-9d63027aa70c7b9d36fe54b514d80c5fdd57107a.zip
microzed-zynq7: Update machine configuration
* Remove Kernel and U-Boot version specifiers, rely on machine-xilinx-default.inc to provide these * Remove MACHINE_KCONFIG fragments * blk-dev-ram.cfg - this config fragment is now provided by default in the meta-xilinx layer * disable-net-cadence.cfg - this config fragment is now provided by the meta-xilinx layer. Use the KERNEL_FEATURES variable to apply this config fragment for all linux-xlnx kernels as they have the EMACPS driver and it is preferred for the MicroZed Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
-rw-r--r--conf/machine/boards/microzed/microzed-blk-dev-ram.cfg11
-rw-r--r--conf/machine/boards/microzed/microzed-disable-net-cadence.cfg23
-rw-r--r--conf/machine/microzed-zynq7.conf10
3 files changed, 2 insertions, 42 deletions
diff --git a/conf/machine/boards/microzed/microzed-blk-dev-ram.cfg b/conf/machine/boards/microzed/microzed-blk-dev-ram.cfg
deleted file mode 100644
index 96ef556..0000000
--- a/conf/machine/boards/microzed/microzed-blk-dev-ram.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DRBD is not set
-# CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=4
-CONFIG_BLK_DEV_RAM_SIZE=32768
-# CONFIG_BLK_DEV_XIP is not set \ No newline at end of file
diff --git a/conf/machine/boards/microzed/microzed-disable-net-cadence.cfg b/conf/machine/boards/microzed/microzed-disable-net-cadence.cfg
deleted file mode 100644
index 19201a1..0000000
--- a/conf/machine/boards/microzed/microzed-disable-net-cadence.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-CONFIG_ETHERNET=y
-# CONFIG_NET_CADENCE is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_CALXEDA_XGMAC is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_DM9000 is not set
-# CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_ETHOC is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_NET_VENDOR_XILINX=y
-CONFIG_XILINX_EMACLITE=y
-CONFIG_XILINX_AXI_EMAC=y
-CONFIG_XILINX_PS_EMAC=y
-# CONFIG_XILINX_PS_EMAC_HWTSTAMP is not set
-CONFIG_PHYLIB=y
diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf
index b58e190..31bfb7b 100644
--- a/conf/machine/microzed-zynq7.conf
+++ b/conf/machine/microzed-zynq7.conf
@@ -3,10 +3,6 @@
#@NAME: microzed-zynq7
#@DESCRIPTION: Machine support for microZed. (http://www.microzed.org/)
-# Versions corresponding to microzed documentation
-PREFERRED_VERSION_linux-xlnx ?= "3.14%"
-PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"
-
require conf/machine/include/tune-zynq.inc
require conf/machine/include/machine-xilinx-default.inc
@@ -20,7 +16,5 @@ MACHINE_DEVICETREE := " \
microzed/microzed-zynq7-ram.dts \
"
-MACHINE_KCONFIG := " \
- microzed/microzed-blk-dev-ram.cfg \
- microzed/microzed-disable-net-cadence.cfg \
- "
+# Disable the MACB driver for all linux-xlnx kernels
+KERNEL_FEATURES_append_pn-linux-xlnx += "features/xilinx/disable-macb.scc"