[XenPPC] [pushed] [ppc] Flattened Devtree infput files and generating sctip for use by DTC

[jimix@xxxxxxxxxxxxxx]

changeset:   10278:cdd80419bcfe2a4d3c53876e0f45eea3f19e929a
parent:      10276:b017cf1a0e0555ad5449009b1a5e166d36a5c97e
user:        jimix@xxxxxxxxxxxxxxxxxxxxx
date:        Mon May 15 17:36:44 2006 -0400
files:       tools/domctrl/DomU.dts.in tools/domctrl/DomU.sh
description:
[ppc] Flattened Devtree infput files and generating sctip for use by DTC


diff -r b017cf1a0e0555ad5449009b1a5e166d36a5c97e -r 
cdd80419bcfe2a4d3c53876e0f45eea3f19e929a tools/domctrl/DomU.dts.in
--- a/tools/domctrl/DomU.dts.in Mon May 15 17:13:00 2006 -0400
+++ b/tools/domctrl/DomU.dts.in Mon May 15 17:36:44 2006 -0400
@@ -1,24 +1,22 @@
-/memreserve/   @START_INFO@-@RESV_END@;
+/memreserve/   @START_INFO@ @RESV_SIZE@;
 / {
        name = "";
-       ibm,partition-name = "@DOMAIN_NAME@";
-       ibm,partition-no = <@DOMAIN_ID@>;
        device_type = "chrp-but-not-really";
        #size-cells = <2>;
        #address-cells = <2>;
        model = "@MODEL@";
-       compatible = [4d 6f 6d 65 6e 74 75 6d 2c 4d 61 70 6c 65 00 70 73 65 75 
64 6f 2d 63 68 72 70 00];
+       compatible = "@COMPATIBLE@";
 
        xen {
                name = "xen";
-               reserved = <0 @START_INFO@ 0 @RESV_SIZE@>;
                start-info = <0 @START_INFO@ 0 1000>;
                version = "Xen-3.0-unstable";
-               reg = <@DOMAIN_ID@>;
+               reg = <0 @DOMAIN_ID@ 0 0>;
+               domain-name = "@DOMAIN_NAME@";
 
                console {
                        name = "console";
-                       reg = <@CONSOLE_EVTCHN@>;
+                       interrupts = <@CONSOLE_EVTCHN@ 0>;
                };
        };
 
@@ -28,24 +26,14 @@
                device_type = "memory";
        };
 
-       chosen {
-               name = "chosen";
-               linux,platform = <501>;
-               linux,stdout-package = "&/xen/console";
-               linux,stdout-path = "/xen/console";
-               cpu = <&/cpus/@CPU_TYPE@@0>;
-               memory = <&/memory@>;
-               bootpath;
-               bootargs = "@BOOTARGS@";
-       };
-
        cpus {
                name = "cpus";
                smp-enabled;
-               #size-cells = <1>;
+               #size-cells = <0>;
                #address-cells = <1>;
 
                @CPU_TYPE@@0 {
+                       linux,boot-cpu;
                        name = "PowerPC,970";
                        ibm,pft-size = <0 14>;
                        reg = <0>;
@@ -72,4 +60,19 @@
                        };
                };
        };
+
+       chosen {
+               name = "chosen";
+               linux,platform = <501>;
+               linux,initrd-start = <@INITRD_START@>;
+               linux,initrd-end = <@INITRD_END@>;
+               linux,stdout-package = "&/xen/console";
+               linux,stdout-path = "/xen/console";
+               interrupt-controller = <&/xen>;
+               cpu = <&/cpus/@CPU_TYPE@@0>;
+               memory = <&/memory@0>;
+               bootpath;
+               bootargs = "@BOOTARGS@";
+       };
+
 };
diff -r b017cf1a0e0555ad5449009b1a5e166d36a5c97e -r 
cdd80419bcfe2a4d3c53876e0f45eea3f19e929a tools/domctrl/DomU.sh
--- a/tools/domctrl/DomU.sh     Mon May 15 17:13:00 2006 -0400
+++ b/tools/domctrl/DomU.sh     Mon May 15 17:36:44 2006 -0400
@@ -2,23 +2,27 @@
 
 START_INFO=3ffc000
 RESV_SIZE=4000
-RESV_END=3ffffff
 DOMAIN_NAME="User Domain"
 DOMAIN_ID=1
 MODEL="Momentum,Maple-D"
+COMPATIBLE="Momentum,Maple"
 BOOTARGS="console=ttyS0"
 CONSOLE_EVTCHN=1
 CPU_TYPE=PowerPC,970
 TIMEBASE=a6e49c0
+INITRD_START=0
+INITRD_END=0
 
 sed -f - $1 <<EOF
 s%@START_INFO@%$START_INFO%g;
 s%@RESV_SIZE@%$RESV_SIZE%g;
-s%@RESV_END@%$RESV_END%g;
 s%@DOMAIN_NAME@%$DOMAIN_NAME%g;
 s%@DOMAIN_ID@%$DOMAIN_ID%g;
 s%@MODEL@%$MODEL%g;
+s%@COMAPTIBLE@%$COMPATIBLE%g;
 s%@BOOTARGS@%$BOOTARGS%g;
+s%@INITRD_START@%$INITRD_START%g;
+s%@INITRD_END@%$INITRD_END%g;
 s%@CONSOLE_EVTCHN@%$CONSOLE_EVTCHN%g;
 s%@CPU_TYPE@%$CPU_TYPE%g;
 s%@TIMEBASE@%$TIMEBASE%g;



_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel