Changeset 399 for trunk/softs

Timestamp:

May 30, 2013, 5:19:40 PM (12 years ago)

Author:

bouyer

Message:

Sync with reality: we have only one processor on the de2-115 and
we'll probably never have 4.

Location:

trunk/softs/tsar_boot/conf/platform_fpga_de2-115

Files:

• defs_platform.h (modified) (1 diff)
• platform_fpga.dts (modified) (4 diffs)

trunk/softs/tsar_boot/conf/platform_fpga_de2-115/defs_platform.h

@@ -1 @@
-#define NB_PROCS        4
+#define NB_PROCS        1
 #define NB_CLUSTERS     1
 

trunk/softs/tsar_boot/conf/platform_fpga_de2-115/platform_fpga.dts

@@ -16 +16 @@
         };
 
-        Mips,32@1 {
-            device_type = "cpu";
-            icudev_type = "cpu:mips";
-            name = "Mips,32";
-            reg = <0x00000001>;
-        };
-
-        Mips,32@2 {
-            device_type = "cpu";
-            icudev_type = "cpu:mips";
-            name = "Mips,32";
-            reg = <0x00000002>;
-        };
-
-        Mips,32@3 {
-            device_type = "cpu";
-            icudev_type = "cpu:mips";
-            name = "Mips,32";
-            reg = <0x00000003>;
-        };
     };
 
@@ -75 +55 @@
         device_type = "soclib:xicu:root";
         input_lines = <0x2>;
-        ipis = <0x4>;
+        ipis = <0x1>;
         reg = <0xfd000000 0x00001000>;
-        timers = <0x4>;
+        timers = <0x1>;
+        timer-freq = <25000000>;
 
         out@0 {
@@ -100 +81 @@
         };
 
-        out@3 {
-            device_type = "soclib:xicu:filter";
-            irq = <&{/cpus/Mips,32@1} 0x0>;
-            output_line = <0x3>;
-            parent = <&{/xicu@0xfd000000}>;
-        };
-
-        out@4 {
-            device_type = "soclib:xicu:filter";
-            irq = <&{/cpus/Mips,32@1} 0x1>;
-            output_line = <0x4>;
-            parent = <&{/xicu@0xfd000000}>;
-        };
-
-        out@5 {
-            device_type = "soclib:xicu:filter";
-            irq = <&{/cpus/Mips,32@1} 0x2>;
-            output_line = <0x5>;
-            parent = <&{/xicu@0xfd000000}>;
-        };
-
-        out@6 {
-            device_type = "soclib:xicu:filter";
-            irq = <&{/cpus/Mips,32@2} 0x0>;
-            output_line = <0x6>;
-            parent = <&{/xicu@0xfd000000}>;
-        };
-
-        out@7 {
-            device_type = "soclib:xicu:filter";
-            irq = <&{/cpus/Mips,32@2} 0x1>;
-            output_line = <0x7>;
-            parent = <&{/xicu@0xfd000000}>;
-        };
-
-        out@8 {
-            device_type = "soclib:xicu:filter";
-            irq = <&{/cpus/Mips,32@2} 0x2>;
-            output_line = <0x8>;
-            parent = <&{/xicu@0xfd000000}>;
-        };
-
-        out@9 {
-            device_type = "soclib:xicu:filter";
-            irq = <&{/cpus/Mips,32@3} 0x0>;
-            output_line = <0x9>;
-            parent = <&{/xicu@0xfd000000}>;
-        };
-        out@10 {
-            device_type = "soclib:xicu:filter";
-            irq = <&{/cpus/Mips,32@3} 0x1>;
-            output_line = <0xa>;
-            parent = <&{/xicu@0xfd000000}>;
-        };
-
-        out@11 {
-            device_type = "soclib:xicu:filter";
-            irq = <&{/cpus/Mips,32@3} 0x2>;
-            output_line = <0xb>;
-            parent = <&{/xicu@0xfd000000}>;
-        };
-
     };
   topology {
@@ -168 +87 @@
     cluster@0,0 {
         reg = <0 0>;
-        devices = <&{/cpus/Mips,32@0} &{/cpus/Mips,32@1} &{/cpus/Mips,32@2} &{/cpus/Mips,32@3} &{/xicu@0xfd000000} &{/tty@0xfc000000} &{/blockdevice@0xfb000000} &{/fb@0x07e00000} >;
+        devices = <&{/cpus/Mips,32@0} &{/xicu@0xfd000000} &{/tty@0xfc000000} &{/blockdevice@0xfb000000} &{/fb@0x07e00000} >;
     };
   };