aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2014-11-06 15:56:27 +1000
committerElvis Dowson <elvis.dowson@gmail.com>2014-11-19 08:21:58 +0400
commit38aeb16a5ad0d20f5766315e77e9a8b2714a5e74 (patch)
tree96472fc4a42c446483bc654e1a5c807625ced121
parent9d63027aa70c7b9d36fe54b514d80c5fdd57107a (diff)
downloadmeta-xilinx-community-38aeb16a5ad0d20f5766315e77e9a8b2714a5e74.tar.gz
meta-xilinx-community-38aeb16a5ad0d20f5766315e77e9a8b2714a5e74.tar.bz2
meta-xilinx-community-38aeb16a5ad0d20f5766315e77e9a8b2714a5e74.zip
microzed-zynq7: Re-organize device-trees
* Re-organize the device-trees for the microZed board to provide a default device tree for generic boot purposes which defaults to ramdisk if the boot args are not overriden * Rename the board level dtsi to microzed-zynq7-board.dtsi so that the name of the default device-tree matches the name of the machine * Remove the including of the zynq7-base.dtsi from the board include to allow its reuse in other cases Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
-rwxr-xr-xconf/machine/boards/microzed/microzed-zynq7-board.dtsi (renamed from conf/machine/boards/microzed/microzed-zynq7.dtsi)7
-rw-r--r--conf/machine/boards/microzed/microzed-zynq7-ram.dts11
-rw-r--r--conf/machine/boards/microzed/microzed-zynq7.dts5
-rw-r--r--conf/machine/microzed-zynq7.conf4
4 files changed, 12 insertions, 15 deletions
diff --git a/conf/machine/boards/microzed/microzed-zynq7.dtsi b/conf/machine/boards/microzed/microzed-zynq7-board.dtsi
index d8bcba2..4898918 100755
--- a/conf/machine/boards/microzed/microzed-zynq7.dtsi
+++ b/conf/machine/boards/microzed/microzed-zynq7-board.dtsi
@@ -1,9 +1,12 @@
-/include/ "zynq7-base.dtsi"
+/*
+ * microZed DTS for generic boot.
+ */
+
/ {
model = "microZed";
chosen {
- bootargs = "console=ttyPS0,115200 earlyprintk";
+ bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/ram rw";
linux,stdout-path = "/axi@0/serial@e0001000";
} ;
diff --git a/conf/machine/boards/microzed/microzed-zynq7-ram.dts b/conf/machine/boards/microzed/microzed-zynq7-ram.dts
deleted file mode 100644
index a2c4b36..0000000
--- a/conf/machine/boards/microzed/microzed-zynq7-ram.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * microZed DTS file header for ramdisk boot.
- */
-
-/dts-v1/;
-/include/ "microzed-zynq7.dtsi"
-/ {
- chosen {
- bootargs = "console=ttyPS0,115200 root=/dev/ram rw ip=none earlyprintk";
- } ;
-} ;
diff --git a/conf/machine/boards/microzed/microzed-zynq7.dts b/conf/machine/boards/microzed/microzed-zynq7.dts
new file mode 100644
index 0000000..3470e5a
--- /dev/null
+++ b/conf/machine/boards/microzed/microzed-zynq7.dts
@@ -0,0 +1,5 @@
+/dts-v1/;
+/include/ "zynq7-base.dtsi"
+/include/ "microzed-zynq7-board.dtsi"
+/ {
+} ;
diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf
index 31bfb7b..b212de5 100644
--- a/conf/machine/microzed-zynq7.conf
+++ b/conf/machine/microzed-zynq7.conf
@@ -12,8 +12,8 @@ UBOOT_MACHINE = "zynq_zed_config"
SERIAL_CONSOLE = "115200 ttyPS0"
MACHINE_DEVICETREE := " \
- microzed/microzed-zynq7.dtsi \
- microzed/microzed-zynq7-ram.dts \
+ microzed/microzed-zynq7-board.dtsi \
+ microzed/microzed-zynq7.dts \
"
# Disable the MACB driver for all linux-xlnx kernels