[Astlinux-commits] SF.net SVN: astlinux:[5326] branches/1.0/project

[<abe...@us...>]

Revision: 5326
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5326&view=rev
Author:   abelbeck
Date:     2011-12-22 03:36:26 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
libata, use libata.dma=3 to disable CF DMA for runnix and astlinux

Modified Paths:
--------------
    branches/1.0/project/astlinux/board/alix/runnix.conf
    branches/1.0/project/astlinux/board/geni586/runnix.conf
    branches/1.0/project/astlinux/board/geni586-serial/runnix.conf
    branches/1.0/project/astlinux/board/net4801/runnix.conf
    branches/1.0/project/astlinux/board/net5501/runnix.conf
    branches/1.0/project/astlinux/board/net6501/runnix.conf
    branches/1.0/project/astlinux/board/via/runnix.conf
    branches/1.0/project/astlinux/board/via-serial/runnix.conf
    branches/1.0/project/astlinux/board/viac7/runnix.conf
    branches/1.0/project/astlinux/board/viac7-serial/runnix.conf
    branches/1.0/project/astlinux/board/wrap/runnix.conf
    branches/1.0/project/runnix/files/configs/alix.cfg
    branches/1.0/project/runnix/files/configs/default-serial.cfg
    branches/1.0/project/runnix/files/configs/default.cfg
    branches/1.0/project/runnix/files/configs/wrap.cfg

Modified: branches/1.0/project/astlinux/board/alix/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/alix/runnix.conf	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/astlinux/board/alix/runnix.conf	2011-12-22 03:36:26 UTC (rev 5326)
@@ -1,5 +1,5 @@
 # Kernel command line
-KCMD="root=/dev/ram0 rw init=/linuxrc astimg=ASTVER.run astlinux=alix astkd=auto asturw=auto astlive ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 console=ttyS0,38400n8"
+KCMD="root=/dev/ram0 rw init=/linuxrc astimg=ASTVER.run astlinux=alix astkd=auto asturw=auto astlive libata.dma=3 console=ttyS0,38400n8"
 # Offset for root filesystem
 # OFFSET="32256"
 # location of kernel binary inside root (include mountpoint)

Modified: branches/1.0/project/astlinux/board/geni586/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/geni586/runnix.conf	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/astlinux/board/geni586/runnix.conf	2011-12-22 03:36:26 UTC (rev 5326)
@@ -1,5 +1,5 @@
 # Kernel command line
-KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=geni586 astimg=ASTVER.run astkd=auto asturw=auto astlive ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1"
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=geni586 astimg=ASTVER.run astkd=auto asturw=auto astlive libata.dma=3"
 # Offset for root filesystem
 # OFFSET="32256"
 # location of kernel binary inside root (include mountpoint)

Modified: branches/1.0/project/astlinux/board/geni586-serial/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/geni586-serial/runnix.conf	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/astlinux/board/geni586-serial/runnix.conf	2011-12-22 03:36:26 UTC (rev 5326)
@@ -1,5 +1,5 @@
 # Kernel command line
-KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=geni586 astimg=ASTVER.run astkd=auto asturw=auto astlive astlive ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 console=ttyS0,19200n8"
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=geni586 astimg=ASTVER.run astkd=auto asturw=auto astlive astlive libata.dma=3 console=ttyS0,19200n8"
 # Offset for root filesystem
 # OFFSET="32256"
 # location of kernel binary inside root (include mountpoint)

Modified: branches/1.0/project/astlinux/board/net4801/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/net4801/runnix.conf	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/astlinux/board/net4801/runnix.conf	2011-12-22 03:36:26 UTC (rev 5326)
@@ -1,5 +1,5 @@
 # Kernel command line
-KCMD="root=/dev/ram0 rw init=/linuxrc astimg=ASTVER.run astlinux=net4801 astkd=auto asturw=auto astlive ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 console=ttyS0,19200n8"
+KCMD="root=/dev/ram0 rw init=/linuxrc astimg=ASTVER.run astlinux=net4801 astkd=auto asturw=auto astlive libata.dma=3 console=ttyS0,19200n8"
 # Offset for root filesystem
 # OFFSET="32256"
 # location of kernel binary inside root (include mountpoint)

Modified: branches/1.0/project/astlinux/board/net5501/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/net5501/runnix.conf	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/astlinux/board/net5501/runnix.conf	2011-12-22 03:36:26 UTC (rev 5326)
@@ -1,5 +1,5 @@
 # Kernel command line
-KCMD="root=/dev/ram0 rw init=/linuxrc astimg=ASTVER.run astlinux=net5501 astkd=auto asturw=auto astlive ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 console=ttyS0,19200n8"
+KCMD="root=/dev/ram0 rw init=/linuxrc astimg=ASTVER.run astlinux=net5501 astkd=auto asturw=auto astlive libata.dma=3 console=ttyS0,19200n8"
 # Offset for root filesystem
 # OFFSET="32256"
 # location of kernel binary inside root (include mountpoint)

Modified: branches/1.0/project/astlinux/board/net6501/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/net6501/runnix.conf	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/astlinux/board/net6501/runnix.conf	2011-12-22 03:36:26 UTC (rev 5326)
@@ -1,5 +1,5 @@
 # Kernel command line
-KCMD="root=/dev/ram0 rw init=/linuxrc astimg=ASTVER.run astlinux=net6501 astkd=auto asturw=auto astlive ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 console=ttyS0,19200n8"
+KCMD="root=/dev/ram0 rw init=/linuxrc astimg=ASTVER.run astlinux=net6501 astkd=auto asturw=auto astlive libata.dma=3 console=ttyS0,19200n8"
 # Offset for root filesystem
 # OFFSET="32256"
 # location of kernel binary inside root (include mountpoint)

Modified: branches/1.0/project/astlinux/board/via/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/via/runnix.conf	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/astlinux/board/via/runnix.conf	2011-12-22 03:36:26 UTC (rev 5326)
@@ -1,5 +1,5 @@
 # Kernel command line
-KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=via astimg=ASTVER.run astkd=auto asturw=auto astlive ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1"
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=via astimg=ASTVER.run astkd=auto asturw=auto astlive libata.dma=3"
 # Offset for root filesystem
 # OFFSET="32256"
 # location of kernel binary inside root (include mountpoint)

Modified: branches/1.0/project/astlinux/board/via-serial/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/via-serial/runnix.conf	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/astlinux/board/via-serial/runnix.conf	2011-12-22 03:36:26 UTC (rev 5326)
@@ -1,5 +1,5 @@
 # Kernel command line
-KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=via astimg=ASTVER.run astkd=auto asturw=auto astlive ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 console=ttyS0,19200n8"
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=via astimg=ASTVER.run astkd=auto asturw=auto astlive libata.dma=3 console=ttyS0,19200n8"
 # Offset for root filesystem
 # OFFSET="32256"
 # location of kernel binary inside root (include mountpoint)

Modified: branches/1.0/project/astlinux/board/viac7/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/viac7/runnix.conf	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/astlinux/board/viac7/runnix.conf	2011-12-22 03:36:26 UTC (rev 5326)
@@ -1,5 +1,5 @@
 # Kernel command line
-KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=viac7 astimg=ASTVER.run astkd=auto asturw=auto astlive ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1"
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=viac7 astimg=ASTVER.run astkd=auto asturw=auto astlive libata.dma=3"
 # Offset for root filesystem
 # OFFSET="32256"
 # location of kernel binary inside root (include mountpoint)

Modified: branches/1.0/project/astlinux/board/viac7-serial/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/viac7-serial/runnix.conf	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/astlinux/board/viac7-serial/runnix.conf	2011-12-22 03:36:26 UTC (rev 5326)
@@ -1,5 +1,5 @@
 # Kernel command line
-KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=viac7 astimg=ASTVER.run astkd=auto asturw=auto astlive ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 console=ttyS0,19200n8"
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=viac7 astimg=ASTVER.run astkd=auto asturw=auto astlive libata.dma=3 console=ttyS0,19200n8"
 # Offset for root filesystem
 # OFFSET="32256"
 # location of kernel binary inside root (include mountpoint)

Modified: branches/1.0/project/astlinux/board/wrap/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/wrap/runnix.conf	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/astlinux/board/wrap/runnix.conf	2011-12-22 03:36:26 UTC (rev 5326)
@@ -1,5 +1,5 @@
 # Kernel command line
-KCMD="root=/dev/ram0 rw init=/linuxrc astimg=ASTVER.run astlinux=wrap astkd=auto asturw=auto astlive ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 reboot=bios console=ttyS0,38400n8"
+KCMD="root=/dev/ram0 rw init=/linuxrc astimg=ASTVER.run astlinux=wrap astkd=auto asturw=auto astlive libata.dma=3 reboot=bios console=ttyS0,38400n8"
 # Offset for root filesystem
 # OFFSET="32256"
 # location of kernel binary inside root (include mountpoint)

Modified: branches/1.0/project/runnix/files/configs/alix.cfg
===================================================================
--- branches/1.0/project/runnix/files/configs/alix.cfg	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/runnix/files/configs/alix.cfg	2011-12-22 03:36:26 UTC (rev 5326)
@@ -7,19 +7,19 @@
 
 label runnix
     kernel runnix
-    append initrd=runnix.img root=/dev/ram0 rw init=/runnix runimg=auto ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 rootdelay=10 console=ttyS0,38400n8
+    append initrd=runnix.img root=/dev/ram0 rw init=/runnix runimg=auto libata.dma=3 rootdelay=10 console=ttyS0,38400n8
 
 label shell
     kernel runnix
-    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 rootdelay=10 console=ttyS0,38400n8 doshell
+    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=10 console=ttyS0,38400n8 doshell
 
 label ssh
     kernel runnix
-    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 rootdelay=10 console=ttyS0,38400n8 doshell_ssh
+    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=10 console=ttyS0,38400n8 doshell_ssh
 
 label xrunnix
     kernel Xrunnix
-    append initrd=Xrunnix.img root=/dev/ram0 rw init=/runnix runimg=auto ide=nodma rootdelay=10 console=ttyS0,38400n8
+    append initrd=Xrunnix.img root=/dev/ram0 rw init=/runnix runimg=auto libata.dma=3 rootdelay=10 console=ttyS0,38400n8
 
 label memtest
     kernel memtest

Modified: branches/1.0/project/runnix/files/configs/default-serial.cfg
===================================================================
--- branches/1.0/project/runnix/files/configs/default-serial.cfg	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/runnix/files/configs/default-serial.cfg	2011-12-22 03:36:26 UTC (rev 5326)
@@ -7,19 +7,19 @@
 
 label runnix
     kernel runnix
-    append initrd=runnix.img root=/dev/ram0 rw init=/runnix runimg=auto ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 rootdelay=10 console=ttyS0,19200n8
+    append initrd=runnix.img root=/dev/ram0 rw init=/runnix runimg=auto libata.dma=3 rootdelay=10 console=ttyS0,19200n8
 
 label shell
     kernel runnix
-    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 rootdelay=10 console=ttyS0,19200n8 doshell
+    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=10 console=ttyS0,19200n8 doshell
 
 label ssh
     kernel runnix
-    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 rootdelay=10 console=ttyS0,19200n8 doshell_ssh
+    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=10 console=ttyS0,19200n8 doshell_ssh
 
 label xrunnix
     kernel Xrunnix
-    append initrd=Xrunnix.img root=/dev/ram0 rw init=/runnix runimg=auto ide=nodma rootdelay=10 console=ttyS0,19200n8
+    append initrd=Xrunnix.img root=/dev/ram0 rw init=/runnix runimg=auto libata.dma=3 rootdelay=10 console=ttyS0,19200n8
 
 label memtest
     kernel memtest

Modified: branches/1.0/project/runnix/files/configs/default.cfg
===================================================================
--- branches/1.0/project/runnix/files/configs/default.cfg	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/runnix/files/configs/default.cfg	2011-12-22 03:36:26 UTC (rev 5326)
@@ -7,19 +7,19 @@
 
 label runnix
     kernel runnix
-    append initrd=runnix.img root=/dev/ram0 rw init=/runnix runimg=auto ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 rootdelay=10
+    append initrd=runnix.img root=/dev/ram0 rw init=/runnix runimg=auto libata.dma=3 rootdelay=10
 
 label shell
     kernel runnix
-    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 rootdelay=10 doshell
+    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=10 doshell
 
 label ssh
     kernel runnix
-    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 rootdelay=10 doshell_ssh
+    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=10 doshell_ssh
 
 label xrunnix
     kernel Xrunnix
-    append initrd=Xrunnix.img root=/dev/ram0 rw init=/runnix runimg=auto ide=nodma rootdelay=10
+    append initrd=Xrunnix.img root=/dev/ram0 rw init=/runnix runimg=auto libata.dma=3 rootdelay=10
 
 label memtest
     kernel memtest

Modified: branches/1.0/project/runnix/files/configs/wrap.cfg
===================================================================
--- branches/1.0/project/runnix/files/configs/wrap.cfg	2011-12-21 23:59:05 UTC (rev 5325)
+++ branches/1.0/project/runnix/files/configs/wrap.cfg	2011-12-22 03:36:26 UTC (rev 5326)
@@ -7,19 +7,19 @@
 
 label runnix
     kernel runnix
-    append initrd=runnix.img root=/dev/ram0 rw init=/runnix runimg=auto ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 rootdelay=10 console=ttyS0,38400n8
+    append initrd=runnix.img root=/dev/ram0 rw init=/runnix runimg=auto libata.dma=3 rootdelay=10 console=ttyS0,38400n8
 
 label shell
     kernel runnix
-    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 rootdelay=10 console=ttyS0,38400n8 doshell
+    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=10 console=ttyS0,38400n8 doshell
 
 label ssh
     kernel runnix
-    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 rootdelay=10 console=ttyS0,38400n8 doshell_ssh
+    append initrd=runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=10 console=ttyS0,38400n8 doshell_ssh
 
 label xrunnix
     kernel Xrunnix
-    append initrd=Xrunnix.img root=/dev/ram0 rw init=/runnix runimg=auto ide=nodma rootdelay=10 console=ttyS0,38400n8
+    append initrd=Xrunnix.img root=/dev/ram0 rw init=/runnix runimg=auto libata.dma=3 rootdelay=10 console=ttyS0,38400n8
 
 label memtest
     kernel memtest

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.