odroidc1: the watchdog kernel patch is no longer necessary

This commit is contained in:
Calin Crisan 2015-11-01 23:15:04 +02:00
parent eb41b3647e
commit f3fc12cfaa
3 changed files with 8 additions and 33 deletions

View File

@ -1,18 +0,0 @@
diff -uNr linux-odroidc-3.10.y/arch/arm/boot/dts/meson8b_odroidc.dts linux-odroidc-3.10.y.patched/arch/arm/boot/dts/meson8b_odroidc.dts
--- linux-odroidc-3.10.y/arch/arm/boot/dts/meson8b_odroidc.dts 2015-07-19 13:49:28.484871168 +0300
+++ linux-odroidc-3.10.y.patched/arch/arm/boot/dts/meson8b_odroidc.dts 2015-07-19 13:50:26.938200673 +0300
@@ -1001,4 +1001,14 @@
reserve-iomap = "true";
};
+ amlogic-watchdog {
+ compatible = "amlogic,aml-wdt";
+ default_timeout=<15>;
+ reset_watchdog_method=<0>;//0:sysfs,1:kernel
+ reset_watchdog_time=<2>;
+ shutdown_timeout=<10>;
+ firmware_timeout=<6>;
+ suspend_timeout=<6>;
+ };
+
}; /* end of / */

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -16,12 +16,12 @@
height="64"
xml:space="preserve"
sodipodi:docname="motioneye.svg"
inkscape:export-filename="/media/data/project/motioneyeos/resources/motioneye-256x256.png"
inkscape:export-filename="/media/data/projects/motioneyeos/resources/motioneye-256x256.png"
inkscape:export-xdpi="360"
inkscape:export-ydpi="360"><metadata
id="metadata8"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs6" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@ -35,9 +35,9 @@
inkscape:window-height="1018"
id="namedview4"
showgrid="false"
inkscape:zoom="2.8284271"
inkscape:cx="79.793189"
inkscape:cy="-10.62092"
inkscape:zoom="1"
inkscape:cx="31.099761"
inkscape:cy="76.252821"
inkscape:window-x="0"
inkscape:window-y="25"
inkscape:window-maximized="1"
@ -58,17 +58,10 @@
id="g10"
inkscape:groupmode="layer"
inkscape:label="ink_ext_XXXXXX"
transform="matrix(1.25,0,0,-1.25,0,64)"><rect
style="opacity:1;fill:#313131;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect4142"
width="51.200001"
height="51.200001"
x="0"
y="-51.200001"
transform="scale(1,-1)" /><path
transform="matrix(1.25,0,0,-1.25,0,64)"><path
style="fill:#3498db;fill-opacity:1;stroke:none"
d="m 32,6 c -5.264933,0 -10.15584,1.684955 -14.25,4.375 4.426748,0.474546 8.794165,1.616509 13.75,4.0625 5.014819,-2.5549 10.152222,-3.621792 14.78125,-4.15625 C 42.179879,7.5768125 37.280255,6 32,6 z m 17,5.59375 c -5.21085,0.03453 -12.330126,1.666208 -17.5,4.03125 -5.435679,-1.964064 -11.012887,-4.147356 -17.3125,-4 -0.419974,0.0099 -0.823167,0.03114 -1.25,0.0625 L 8,12.09375 l 4.6875,1.5625 c 6.429941,2.095118 12.084993,4.395085 17.0625,13.03125 1.154473,0 3.425649,5e-4 4.5,5e-4 4.957862,-8.587269 10.904708,-10.983331 17.03125,-13.03175 l 4.625,-1.5 -4.8125,-0.46875 C 50.437916,11.625136 49.744407,11.588818 49,11.59375 z M 12.65625,14.6875 C 8.5126665,19.293305 6,25.316864 6,32 6,46.359404 17.640596,58 32,58 46.359404,58 58,46.359404 58,32 58,25.341351 55.491547,19.287285 51.375,14.6875 49.406504,15.410957 47.442694,16.253379 45.5,17.34375 49.260018,18.43176 52,21.91463 52,26 c 0,4.945036 -4.027245,9 -9,9 -4.217962,0 -7.765819,-2.914031 -8.75,-6.8125 -1.243768,0 -3.31109,0 -4.5,0 C 28.774204,32.087724 25.219217,35 21,35 c -4.972755,0 -9.03125,-4.054964 -9.03125,-9 0,-4.133444 2.851912,-7.644 6.6875,-8.6875 -1.945667,-1.058808 -3.952016,-1.881003 -6,-2.625 z M 21,23 c -1.656854,0 -3,1.343146 -3,3 0,1.656854 1.343146,3 3,3 1.656854,0 3,-1.343146 3,-3 0,-1.656854 -1.343146,-3 -3,-3 z m 22,0 c -1.656854,0 -3,1.343146 -3,3 0,1.656854 1.343146,3 3,3 1.656854,0 3,-1.343146 3,-3 0,-1.656854 -1.343146,-3 -3,-3 z m -11,8 c 0.618234,2.299881 1.278866,4.581981 4,6 l -4,6 -4,-6 c 2.383634,-1.6888 3.483037,-3.758112 4,-6 z"
transform="matrix(0.8,0,0,-0.8,0,51.2)"
id="path3938"
inkscape:connector-curvature="0"
sodipodi:nodetypes="scccssccccccccccscsssccssccssccssssssssssccccc" /></g></svg>
sodipodi:nodetypes="scccssccccccccccscsssccssccssccssssssssssccccc"
transform="matrix(0.8,0,0,-0.8,0,51.2)" /></g></svg>

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB