r1598 - in trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8: config debian

[Jens Schmalzing]

Author: jensen
Date: 2004-09-16 03:43:57 -0600 (Thu, 16 Sep 2004)
New Revision: 1598

Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/common.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/README.kernel-image
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
Log:
Enabled the VGA console fix checked into kernel-source.
Fiddled with the built-in command line following Hollis' suggestions.
Explained how to change the built-in command line.


Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/common.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/common.stub	2004-09-16 08:33:50 UTC (rev 1597)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/common.stub	2004-09-16 09:43:57 UTC (rev 1598)
@@ -100,7 +100,7 @@
 CONFIG_PREP_RESIDUAL=y
 CONFIG_PROC_PREPRESIDUAL=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyS0,9600 console=tty0 root=/dev/sda2"
+CONFIG_CMDLINE="console=ttyS0,9600 console=tty0"
 
 #
 # Bus options
@@ -1440,7 +1440,7 @@
 CONFIG_FB_CT65550=y
 # CONFIG_FB_ASILIANT is not set
 CONFIG_FB_IMSTT=y
-# CONFIG_FB_VGA16 is not set
+CONFIG_FB_VGA16=m
 CONFIG_FB_RIVA=m
 CONFIG_FB_RIVA_I2C=y
 # CONFIG_FB_RIVA_DEBUG is not set
@@ -1476,7 +1476,7 @@
 #
 # Console display driver support
 #
-# CONFIG_VGA_CONSOLE is not set
+CONFIG_VGA_CONSOLE=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/README.kernel-image
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/README.kernel-image	2004-09-16 08:33:50 UTC (rev 1597)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/README.kernel-image	2004-09-16 09:43:57 UTC (rev 1598)
@@ -1,3 +1,30 @@
+kernel-patch-powerpc (2.6.8-6) unstable; urgency=low
+
+  * As of the previous revision, a default command line is built into the
+    kernel.  The setting is found in three places:
+  
+    - in the config file /boot/config-<version>, parameter CONFIG_CMDLINE.
+    - in the object file /usr/lib/kernel-image-<version>/obj/simple/misc.o.
+    - in the uncompressed kernel image file /boot/vmlinux-<version>.
+  
+  * On most systems, the built-in command line is of no significance
+    whatsoever, since either Open Firmware or the boot loader can
+    overwrite it with their own setting.  However, on sub-architectures
+    that have neither, such as PReP, a default command line is very nice
+    to have for unattended booting.
+
+  * To change the built-in command line on a PReP system, run mkvmlinuz
+    and then open the vmlinuz file with a binary editor (emacs is fine).
+    Locate the default command line and change it to your liking.
+    However, make sure you preserve the exact length and don't change
+    anything else, after all you are editing a binary!
+
+  * To change the built-in command line on a CHRP or PowerMac system, edit
+    the vmlinux file following the instructions above and then run
+    mkvmlinuz.
+  
+ -- Jens Schmalzing <jensen@debian.org>  Thu, 16 Sep 2004 11:17:17 +0200
+
 kernel-patch-powerpc (2.6.5-1) unstable; urgency=low
 
   * This is the first official Debian package of the 2.6 Linux kernel for

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog	2004-09-16 08:33:50 UTC (rev 1597)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog	2004-09-16 09:43:57 UTC (rev 1598)
@@ -1,3 +1,17 @@
+kernel-patch-powerpc-2.6.8 (2.6.8-6) UNRELEASED; urgency=low
+
+  * Built support for the - now fixed - VGA console into the kernel, and
+    added the VGA16 framebuffer as a module (closes: Bug#271852).
+
+  * Removed the root filesystem option from the built-in command line
+    (closes: Bug#270321, Bug#270326).  On PReP, the kernel will find the
+    root filesystem anyway if it is located on the third partition of the
+    first hard disk.  If you keep your root filesystem elsewhere, you will
+    find a detailed explanation on changing the built-in command line in
+    the NEWS.Debian file.
+
+ -- Jens Schmalzing <jensen@debian.org>  Thu, 16 Sep 2004 11:31:34 +0200
+
 kernel-patch-powerpc-2.6.8 (2.6.8-5) unstable; urgency=low
 
   * Rebuilt against the latest revision 2.6.8-6 of kernel-source-2.6.8