[meta-xilinx] [meta-xilinx-community][PATCH 1/7] microzed-zynq7: Update machine configuration
Nathan Rossi
nathan.rossi at xilinx.com
Mon Nov 10 04:48:31 PST 2014
* 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 is unnessecary, for a large ramdisk rootfs the
initramfs kernel feature is more optimal (use the .cpio rootfs, or
cpio.gz.u-boot for u-boot wrapped)
* disable-net-cadence.cfg - macb should be used by default as it is
mainline, alternatively the KERNEL_FEATURES variable can be used to
override (from local.conf or elsewhere) the use of the macb driver
with the "features/xilinx/disable-macb.scc" config fragment
Signed-off-by: Nathan Rossi <nathan.rossi at xilinx.com>
---
.../boards/microzed/microzed-blk-dev-ram.cfg | 11 -----------
.../microzed/microzed-disable-net-cadence.cfg | 23 ----------------------
conf/machine/microzed-zynq7.conf | 8 --------
3 files changed, 42 deletions(-)
delete mode 100644 conf/machine/boards/microzed/microzed-blk-dev-ram.cfg
delete mode 100644 conf/machine/boards/microzed/microzed-disable-net-cadence.cfg
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..db666d1 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,3 @@ MACHINE_DEVICETREE := " \
microzed/microzed-zynq7-ram.dts \
"
-MACHINE_KCONFIG := " \
- microzed/microzed-blk-dev-ram.cfg \
- microzed/microzed-disable-net-cadence.cfg \
- "
--
2.1.1
More information about the meta-xilinx
mailing list