remove prebuilt v86d

We have added an Android porting of v86d, so remove the prebuilt one.

diff --git a/initrd/init b/initrd/init
index 26350fd..4756a38 100755 (executable)
--- a/initrd/init
+++ b/initrd/init
@@ -3,7 +3,7 @@
 # By Chih-Wei Huang <cwhuang@linux.org.tw>
 # and Thorsten Glaser <tg@mirbsd.org>
 #
-# Last updated 2011/02/25
+# Last updated 2011/04/15
 #
 # License: GNU Public License
 # We explicitely grant the right to use the scripts
@@ -49,6 +49,12 @@ fi
 # now running under a controlling tty; debug output from stderr into log file
 # boot up Android
 
+error()
+{
+       echo $*
+       return 1
+}
+
 try_mount()
 {
        RW=$1; shift

diff --git a/initrd/lib/libx86.so.1 b/initrd/lib/libx86.so.1
deleted file mode 100644 (file)
index b6939d3..0000000
Binary files a/initrd/lib/libx86.so.1 and /dev/null differ

diff --git a/initrd/sbin/v86d b/initrd/sbin/v86d
deleted file mode 100755 (executable)
index 7cd3ea5..0000000
Binary files a/initrd/sbin/v86d and /dev/null differ

diff --git a/initrd/scripts/0-auto-detect b/initrd/scripts/0-auto-detect
index 28391ee..4456528 100644 (file)
--- a/initrd/scripts/0-auto-detect
+++ b/initrd/scripts/0-auto-detect
@@ -1,18 +1,12 @@
 #
 # By Chih-Wei Huang <cwhuang@linux.org.tw>
-# Last updated 2009/12/10
+# Last updated 2011/04/20
 #
 # License: GNU Public License
 # We explicitely grant the right to use the scripts
 # with Android-x86 project.
 #
 
-error()
-{
-       echo $*
-       return 1
-}
-
 # An auto detect function provided by kinneko
 auto_detect()
 {
@@ -28,6 +22,7 @@ auto_detect()
 
 load_uvesafb()
 {
+       [ -x /sbin/v86d ] || ln -s ../android/sbin/v86d /sbin
        [ -c /dev/fb0 ] || modprobe uvesafb mode_option=${UVESA_MODE:-800x600}-16 ${UVESA_OPTION:-mtrr=3 scroll=redraw}
        [ -c /dev/card0 ] || export HWACCEL=0
 }