none

1 files changed, 41 insertions, 14 deletions

diff --git a/Hurd/JoachimNilssonHurdPage.mdwn b/Hurd/JoachimNilssonHurdPage.mdwn
index a3a6a7e0..e919bc27 100644
--- a/Hurd/JoachimNilssonHurdPage.mdwn
+++ b/Hurd/JoachimNilssonHurdPage.mdwn
@@ -8,24 +8,51 @@ This page is a simple project page for me. I use it to keep track of things conc
 
 # <a name="Current_Project"> Current Project </a>
 
-I am currently working on updating the OSKit's Linux drivers from Linux 2.2.12 to 2.2.21 plus the ATA-100 patches for Linux 2.2.19. This because my Promise ATA-100 controller at home prevents me from running the Hurd on my SMP machine. (Even though I now have rigged another machine for my testing efforts ...)
+I am currently working on updating the OSKit's Linux drivers. The OSKit is currently at Linux version 2.2.12 for most of the drivers. My objective is to upgrade from 2.2.12 to 2.2.21 plus the ATA-100 patches for Linux 2.2.19.
 
-## <a name="Project_plan_Update_OSKit_Linux_"> </a> Project plan: Update OSKit Linux drivers
+What motivates me the most is my Promise ATA-100 controller. It prevents me from running the Hurd on my SMP machine. (Even though I now have rigged another machine for my testing efforts ...)
+
+## <a name="Update_OSKit_Linux_drivers"> </a> Update OSKit Linux drivers
 
 I have forked. I will now work on two paths:
 
-1. Patch ALL drivers, patch by patch, from 2.2.12 to 2.2.13 etc.
+1. Patch ALL Linux drivers, patch by patch, from 2.2.12 to 2.2.13 etc. up to 2.2.21
 2. Continue my work on patching only the IDE stuff.
 
-Yesterday I patched the Linux drivers (all of them) from 2.2.12 to 2.2.13, I found a **stable** oskit-mach (before the Roland messup with the GDT's) sitting in an old directory - dated June 2002. (Don't get me started on stable tags on the CVS and the likes!)
+### <a name="Plan_A_Update_all_Linux_drivers"> Plan A -- Update all Linux drivers </a>
 
-After having built both of them I finally, after almost six months of no results, managed to successfully boot the oskit-linux-2.2.13-mach-binary and start the Hurd!
+The stock Linux drivers in the OSKit is at version 2.2.12. Therefore the first patch to the OSKit contains patches to bring it up to 2.2.13, hence the name.
 
-* Diff file [patch-oskit-linux-2.2.13.diff.gz](http://vmlinux.org/joachim/hurd/patch-oskit-linux-2.2.13.diff.gz)
+The first patch also contains some other OSKit patches. I will soon add comments about them here (or elsewhere and link it to here). The patches are **NOT** incremental!
 
-This month (I'm getting more moderate in my time plan) I will **try** to continue patching towards Linux 2.2.21. As I progress I will update this page.
+NOTE! New drivers added in regular Linux patches are **NOT** added to the OSKit in this round. The updates are masked against the Linux drivers already present in the latest release of the OSKit. When I have reached the first goal of upgrading to 2.2.21 I might start adding support for various NIC's, and other hardware I am able to test on.
 
-## <a name="Old_Project_plan"> Old Project plan </a>
+<table border="1" cellpadding="1" cellspacing="0">
+  <tr>
+    <th bgcolor="#99CCCC"><strong>Part</strong></th>
+    <th bgcolor="#99CCCC"><strong>Brief description</strong></th>
+    <th bgcolor="#99CCCC"><strong>DIFF</strong></th>
+    <th bgcolor="#99CCCC"><strong>Date</strong></th>
+  </tr>
+  <tr>
+    <td> 2.2.13 </td>
+    <td> Upgrade from Linux 2.2.12 to 2.2.13 </td>
+    <td><a href="http://gnufans.org/joachim/hurd/patch-oskit-linux-2.2.13.diff.gz" target="_top">patch-oskit-linux-2.2.13.diff.gz</a></td>
+    <td> Oct 27, 2002 </td>
+  </tr>
+  <tr>
+    <td> 2.2.14 </td>
+    <td> Upgrade from Linux 2.2.12 to 2.2.14 </td>
+    <td><a href="http://gnufans.org/joachim/hurd/patch-oskit-linux-2.2.14.diff.gz" target="_top">patch-oskit-linux-2.2.14.diff.gz</a></td>
+    <td> Oct 30, 2002 </td>
+  </tr>
+</table>
+
+Testing against [[Mach/OskitMach]] is currently a real hassle. Fortunately I've found an older **stable** oskit-mach (before Roland messed up the GDT's) sitting in an old directory - dated June 2002. (Don't get me started on stable tags on the CVS and the likes!)
+
+### <a name="Plan_B_Update_only_IDE_stuff"> </a> Plan B -- Update only IDE stuff
+
+Plan B has reached much further than Plan A. With the only difference being that it currently doesn't work. When building against a stable [[Mach/OskitMach]] and then testing it on my standard PII-system the boot goes fine up till the part when partition detection starts. Then the system is automatically rebooted. I have started debugging it but I have no definitive results yet.
 
 1. Start off with OSKit, St. Patrick's Day release.
 2. Upgrade the Linux IDE drivers to Linux 2.2.19, and 2.2.21
@@ -34,10 +61,6 @@ This month (I'm getting more moderate in my time plan) I will **try** to continu
 5. Test again.
 6. Release fat patch.
 
-I will do this in parts, see status table below.
-
-## <a name="Old_Status"> Old Status </a>
-
 <table border="1" cellpadding="1" cellspacing="0">
   <tr>
     <th bgcolor="#99CCCC"><strong>Part</strong></th>
@@ -100,7 +123,7 @@ I will do this in parts, see status table below.
 
 # <a name="Future_Work"> Future Work </a>
 
-1. Enable [[FreeBSD]] drivers from OSKit in Mach. Checked that, does not work easily since the [[FreeBSD]] drivers are initialized from the [[FreeBSD]] PCI probe. OSKit-Mach uses the Linux PCI stuff and hence it would not be done easily.
+1. Enable [[FreeBSD]] drivers from OSKit in Mach. Checked that, does not work easily since the [[FreeBSD]] PCI related drivers are initialized from the [[FreeBSD]] PCI probe. OSKit-Mach uses the Linux PCI stuff and hence it would not be done easily.
 2. Use the sound drivers in the OSKit -- port a useful sound daemon.
 3. I want to get SMP working with OSKit-mach.
 
@@ -126,4 +149,8 @@ Mach docs
 
 ----
 
-Click here to [edit](http://hurd.gnufans.orghttp://LOCATIONHurd/JoachimNilssonHurdPage) this page. <br /> -- [[Main/JoachimNilsson]] - 28 Okt 2002
+# <a name="Comments"> Comments </a>
+
+----
+
+ Click here to [edit](http://hurd.gnufans.orghttp://LOCATIONHurd/JoachimNilssonHurdPage) this page. <br /> -- [[Main/JoachimNilsson]] - 30 Okt 2002