debxo: update UBIFS-related stuff for generic kernels

Stock Debian 3.2 kernels now run on XO-1 without modification (finally!).
However, they require some mount and boot option changes for our custom
hardware.

Since OFW does not support JFFS2 with LZO compression, we need to be
sure to mount /boot with compr=zlib so that any blocks written out to
the partition use zlib instead of lzo.

The Debian kernels also compile the redboot directory number to -1, so
we have to override that through a boot argument.

Note that a newer version of olpc-xo1-hw (0.3) is necessary to ensure
that all needed kernel modules are included in the initramfs images.

Signed-off-by: Andres Salomon <dilinger@queued.net>

diff --git a/configs/debxo-awesome/fstab-ubifs b/configs/debxo-awesome/fstab-ubifs
index dd3a20dfb16efd81466c9b57a6a9bdefa97b2096..667558075af45c96f6e08d3e10e22f6ef0141fc3 100644 (file)
--- a/configs/debxo-awesome/fstab-ubifs
+++ b/configs/debxo-awesome/fstab-ubifs
@@ -2,5 +2,5 @@
 #
 # <file system>        <mount point>   <type>  <options>       <dump>  <pass>
 proc           /proc           proc    defaults        0       0       # <partition size in MB>
-mtd:boot       /boot           jffs2   defaults,noatime 1      1       # 50
+mtd:boot       /boot           jffs2   defaults,noatime,compr=zlib 1   1       # 50
 ubi:root       /               ubifs   defaults,noatime 1      1

diff --git a/configs/debxo-awesome/olpc.fth-ubifs b/configs/debxo-awesome/olpc.fth-ubifs
index 206ed8f053b95ff5a34faf26883c236d4efb5013..21938b2592e93f94196fc70cf75b672bd0705b09 100644 (file)
--- a/configs/debxo-awesome/olpc.fth-ubifs
+++ b/configs/debxo-awesome/olpc.fth-ubifs
@@ -11,7 +11,7 @@
   then
 then
 
-" ro ubi.mtd=root root=ubi:root rootfstype=ubifs video=lxfb fbcon=font:SUN12x22" to boot-file
+" ro redboot.directory=0 ubi.mtd=root root=ubi:root rootfstype=ubifs video=lxfb fbcon=font:SUN12x22" to boot-file
 game-key-mask h# 80 and if
        \ boot from backup kernel
        " ${DN}\vmlinuz.bak" expand$ to boot-device

diff --git a/configs/debxo-kde/fstab-ubifs b/configs/debxo-kde/fstab-ubifs
index dd3a20dfb16efd81466c9b57a6a9bdefa97b2096..667558075af45c96f6e08d3e10e22f6ef0141fc3 100644 (file)
--- a/configs/debxo-kde/fstab-ubifs
+++ b/configs/debxo-kde/fstab-ubifs
@@ -2,5 +2,5 @@
 #
 # <file system>        <mount point>   <type>  <options>       <dump>  <pass>
 proc           /proc           proc    defaults        0       0       # <partition size in MB>
-mtd:boot       /boot           jffs2   defaults,noatime 1      1       # 50
+mtd:boot       /boot           jffs2   defaults,noatime,compr=zlib 1   1       # 50
 ubi:root       /               ubifs   defaults,noatime 1      1

diff --git a/configs/debxo-kde/olpc.fth-ubifs b/configs/debxo-kde/olpc.fth-ubifs
index 206ed8f053b95ff5a34faf26883c236d4efb5013..21938b2592e93f94196fc70cf75b672bd0705b09 100644 (file)
--- a/configs/debxo-kde/olpc.fth-ubifs
+++ b/configs/debxo-kde/olpc.fth-ubifs
@@ -11,7 +11,7 @@
   then
 then
 
-" ro ubi.mtd=root root=ubi:root rootfstype=ubifs video=lxfb fbcon=font:SUN12x22" to boot-file
+" ro redboot.directory=0 ubi.mtd=root root=ubi:root rootfstype=ubifs video=lxfb fbcon=font:SUN12x22" to boot-file
 game-key-mask h# 80 and if
        \ boot from backup kernel
        " ${DN}\vmlinuz.bak" expand$ to boot-device

diff --git a/configs/debxo-lxde/fstab-ubifs b/configs/debxo-lxde/fstab-ubifs
index dd3a20dfb16efd81466c9b57a6a9bdefa97b2096..667558075af45c96f6e08d3e10e22f6ef0141fc3 100644 (file)
--- a/configs/debxo-lxde/fstab-ubifs
+++ b/configs/debxo-lxde/fstab-ubifs
@@ -2,5 +2,5 @@
 #
 # <file system>        <mount point>   <type>  <options>       <dump>  <pass>
 proc           /proc           proc    defaults        0       0       # <partition size in MB>
-mtd:boot       /boot           jffs2   defaults,noatime 1      1       # 50
+mtd:boot       /boot           jffs2   defaults,noatime,compr=zlib 1   1       # 50
 ubi:root       /               ubifs   defaults,noatime 1      1

diff --git a/configs/debxo-lxde/olpc.fth-ubifs b/configs/debxo-lxde/olpc.fth-ubifs
index 206ed8f053b95ff5a34faf26883c236d4efb5013..21938b2592e93f94196fc70cf75b672bd0705b09 100644 (file)
--- a/configs/debxo-lxde/olpc.fth-ubifs
+++ b/configs/debxo-lxde/olpc.fth-ubifs
@@ -11,7 +11,7 @@
   then
 then
 
-" ro ubi.mtd=root root=ubi:root rootfstype=ubifs video=lxfb fbcon=font:SUN12x22" to boot-file
+" ro redboot.directory=0 ubi.mtd=root root=ubi:root rootfstype=ubifs video=lxfb fbcon=font:SUN12x22" to boot-file
 game-key-mask h# 80 and if
        \ boot from backup kernel
        " ${DN}\vmlinuz.bak" expand$ to boot-device

diff --git a/configs/debxo-sugar/fstab-ubifs b/configs/debxo-sugar/fstab-ubifs
index dd3a20dfb16efd81466c9b57a6a9bdefa97b2096..667558075af45c96f6e08d3e10e22f6ef0141fc3 100644 (file)
--- a/configs/debxo-sugar/fstab-ubifs
+++ b/configs/debxo-sugar/fstab-ubifs
@@ -2,5 +2,5 @@
 #
 # <file system>        <mount point>   <type>  <options>       <dump>  <pass>
 proc           /proc           proc    defaults        0       0       # <partition size in MB>
-mtd:boot       /boot           jffs2   defaults,noatime 1      1       # 50
+mtd:boot       /boot           jffs2   defaults,noatime,compr=zlib 1   1       # 50
 ubi:root       /               ubifs   defaults,noatime 1      1

diff --git a/configs/debxo-sugar/olpc.fth-ubifs b/configs/debxo-sugar/olpc.fth-ubifs
index 206ed8f053b95ff5a34faf26883c236d4efb5013..21938b2592e93f94196fc70cf75b672bd0705b09 100644 (file)
--- a/configs/debxo-sugar/olpc.fth-ubifs
+++ b/configs/debxo-sugar/olpc.fth-ubifs
@@ -11,7 +11,7 @@
   then
 then
 
-" ro ubi.mtd=root root=ubi:root rootfstype=ubifs video=lxfb fbcon=font:SUN12x22" to boot-file
+" ro redboot.directory=0 ubi.mtd=root root=ubi:root rootfstype=ubifs video=lxfb fbcon=font:SUN12x22" to boot-file
 game-key-mask h# 80 and if
        \ boot from backup kernel
        " ${DN}\vmlinuz.bak" expand$ to boot-device

diff --git a/configs/debxo-xfce/fstab-ubifs b/configs/debxo-xfce/fstab-ubifs
index dd3a20dfb16efd81466c9b57a6a9bdefa97b2096..667558075af45c96f6e08d3e10e22f6ef0141fc3 100644 (file)
--- a/configs/debxo-xfce/fstab-ubifs
+++ b/configs/debxo-xfce/fstab-ubifs
@@ -2,5 +2,5 @@
 #
 # <file system>        <mount point>   <type>  <options>       <dump>  <pass>
 proc           /proc           proc    defaults        0       0       # <partition size in MB>
-mtd:boot       /boot           jffs2   defaults,noatime 1      1       # 50
+mtd:boot       /boot           jffs2   defaults,noatime,compr=zlib 1   1       # 50
 ubi:root       /               ubifs   defaults,noatime 1      1

diff --git a/configs/debxo-xfce/olpc.fth-ubifs b/configs/debxo-xfce/olpc.fth-ubifs
index 206ed8f053b95ff5a34faf26883c236d4efb5013..21938b2592e93f94196fc70cf75b672bd0705b09 100644 (file)
--- a/configs/debxo-xfce/olpc.fth-ubifs
+++ b/configs/debxo-xfce/olpc.fth-ubifs
@@ -11,7 +11,7 @@
   then
 then
 
-" ro ubi.mtd=root root=ubi:root rootfstype=ubifs video=lxfb fbcon=font:SUN12x22" to boot-file
+" ro redboot.directory=0 ubi.mtd=root root=ubi:root rootfstype=ubifs video=lxfb fbcon=font:SUN12x22" to boot-file
 game-key-mask h# 80 and if
        \ boot from backup kernel
        " ${DN}\vmlinuz.bak" expand$ to boot-device