merge of 621bf027644015319adb51145e07f9d6e3195b93

     and c7701984b00dc8815849c8332b5967f4c9a81ab2

54 files changed, 6731 insertions, 88 deletions

diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 288f3ebaa9..b8368f32c9 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -30,7 +30,7 @@ include conf/machine/include/tune-xscale.conf
 #include conf/machine/include/tune-iwmmxt.conf
 
 BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}"
-UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds firmware-class"
+UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_acx acx htcuniversal_bt htcuniversal_leds firmware-class"
 
 
 module_autoload_htcuniversal_power = "htcuniversal_power"
@@ -41,7 +41,6 @@ module_autoload_firmware-class = "firmware-class"
 module_autoload_acx = "acx"
 module_autoload_htcuniversal-acx = "htcuniversal_acx"
 module_autoload_htcuniversal-bt = "htcuniversal_bt"
-module_autoload_htcuniversal-power = "htcuniversal_power"
 
 #module_autoload_pxa27x_udc = "pxa27x_udc"
 
diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb
index be281d72bf..b669d2b665 100644
--- a/packages/angstrom/angstrom-bootmanager-image.bb
+++ b/packages/angstrom/angstrom-bootmanager-image.bb
@@ -1,9 +1,16 @@
-export IMAGE_BASENAME = "Ångström Bootmanager Image"
+#Angstrom bootmanager image
+LICENSE = MIT
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+PR = "r0"
+
+DEPENDS = "task-angstrom"
+RDEPENDS = "angstrom-base-depends angstrom-bootmanager"
+
+export IMAGE_BASENAME = "bootmanager-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-bootstrap angstrom-bootmanager"
+export IPKG_INSTALL = "angstrom-base-depends angstrom-bootmanager"
 
 inherit image_ipk
 
-DEPENDS += "task-bootstrap angstrom-bootmanager"
 
-LICENSE = "MIT"
+
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
new file mode 100644
index 0000000000..84a4845569
--- /dev/null
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -0,0 +1,14 @@
+#Angstrom bootstrap image
+LICENSE = MIT
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+PR = "r0"
+
+DEPENDS = "task-angstrom"
+RDEPENDS = "angstrom-base-depends"
+
+export IMAGE_BASENAME = "bootstrap-image"
+export IMAGE_LINGUAS = ""
+export IPKG_INSTALL = "angstrom-base-depends"
+
+inherit image_ipk
+
diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb
new file mode 100644
index 0000000000..0419ea1b9a
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -0,0 +1,21 @@
+#Angstrom GPE image
+LICENSE = MIT
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+PR = "r0"
+
+export IMAGE_BASENAME = "gpe-image"
+
+DEPENDS = "task-angstrom"
+RDEPENDS = "${IPKG_INSTALL}"
+
+export IPKG_INSTALL = "\
+    angstrom-base-depends \
+    angstrom-X-base-depends \
+    angsgrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    angstrom-gpe-task-pim \
+    ${ANGSTROM_EXTRA_INSTALL}"
+
+#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
+
+inherit image_ipk
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index c7323314db..d058457e98 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -3,6 +3,7 @@ PR = "r0"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "\
+    angstrom-base-depends \
     angstrom-X-base-depends \
     angsgrom-gpe-task-base \
     angstrom-gpe-task-settings \
@@ -13,6 +14,16 @@ PACKAGES = "\
     angstrom-task-printing \
     angstrom-task-sectest"
 
+RDEPENDS_angstrom-base-depends = "\
+    base-files \
+    base-passwd tinylogin \ 
+    busybox \
+    udev \
+    sysvinit initscripts sysvinit-pidof \
+    netbase \
+    angstrom-version \	
+    "
+
 RDEPENDS_angstrom-X-base-depends := "\
     diet-x11 \
     virtual/xserver"
diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe b/packages/fluxbox/fluxbox-gpe/apps.gpe
index 24d095f0fc..7aca442752 100644
--- a/packages/fluxbox/fluxbox-gpe/apps.gpe
+++ b/packages/fluxbox/fluxbox-gpe/apps.gpe
@@ -1,5 +1,6 @@
 [app] (title=Panel 0)
   [Deco]	{NONE}
+  [Sticky]	{yes}
 [end]
 [app] (title=Panel 1)
   [Deco]	{NONE}
@@ -8,6 +9,49 @@
   [Dimensions]	{635 440}
 [end]
 [app] (title=x-terminal-emulator)
-  [Dimensions]  {635 440}
-[end]                    
-
+  [Dimensions]	{635 440}
+[end]
+[app] (abiword)
+  [Dimensions]	{635 440}
+  [Sticky]	{no}
+[end]
+[app] (gpe-filemanager)
+  [Dimensions]	{635 440}
+  [Sticky]	{yes}
+[end]
+[app] (gpe-info)
+  [Dimensions]	{424 336}
+[end]
+[app] (gpe-edit)
+  [Dimensions]	{635 440}
+[end]
+[app] (gpe-calculator)
+  [Dimensions]	{266 321}
+[end]
+[app] (main)
+  [Dimensions]	{635 440}
+[end]
+[app] (Gnumeric)
+  [Dimensions]	{635 440}
+[end]
+[app] (gpdf)
+  [Dimensions]	{635 440}
+[end]
+[app] (main_window)
+  [Dimensions]	{635 440}
+[end]
+[app] (gaim)
+  [Dimensions]	{635 440}
+[end]
+[app] (gpe-calendar)
+  [Dimensions]	{380 343}
+[end]
+[app] (gpe-mini-browser)
+  [Dimensions]	{635 440}
+[end]
+[app] (figment)
+  [Dimensions]	{635 440}
+[end]
+[app] (gpe-sketchbook)
+  [Dimensions]	{471 314}
+[end]
diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.akita b/packages/fluxbox/fluxbox-gpe/apps.gpe.akita
new file mode 100644
index 0000000000..7aca442752
--- /dev/null
+++ b/packages/fluxbox/fluxbox-gpe/apps.gpe.akita
@@ -0,0 +1,57 @@
+[app] (title=Panel 0)
+  [Deco]	{NONE}
+  [Sticky]	{yes}
+[end]
+[app] (title=Panel 1)
+  [Deco]	{NONE}
+[end]
+[app] (title=rxvt)
+  [Dimensions]	{635 440}
+[end]
+[app] (title=x-terminal-emulator)
+  [Dimensions]	{635 440}
+[end]
+[app] (abiword)
+  [Dimensions]	{635 440}
+  [Sticky]	{no}
+[end]
+[app] (gpe-filemanager)
+  [Dimensions]	{635 440}
+  [Sticky]	{yes}
+[end]
+[app] (gpe-info)
+  [Dimensions]	{424 336}
+[end]
+[app] (gpe-edit)
+  [Dimensions]	{635 440}
+[end]
+[app] (gpe-calculator)
+  [Dimensions]	{266 321}
+[end]
+[app] (main)
+  [Dimensions]	{635 440}
+[end]
+[app] (Gnumeric)
+  [Dimensions]	{635 440}
+[end]
+[app] (gpdf)
+  [Dimensions]	{635 440}
+[end]
+[app] (main_window)
+  [Dimensions]	{635 440}
+[end]
+[app] (gaim)
+  [Dimensions]	{635 440}
+[end]
+[app] (gpe-calendar)
+  [Dimensions]	{380 343}
+[end]
+[app] (gpe-mini-browser)
+  [Dimensions]	{635 440}
+[end]
+[app] (figment)
+  [Dimensions]	{635 440}
+[end]
+[app] (gpe-sketchbook)
+  [Dimensions]	{471 314}
+[end]
diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.default b/packages/fluxbox/fluxbox-gpe/apps.gpe.default
new file mode 100644
index 0000000000..d7a0a83f22
--- /dev/null
+++ b/packages/fluxbox/fluxbox-gpe/apps.gpe.default
@@ -0,0 +1,7 @@
+[app] (title=Panel 0)
+  [Deco]	{NONE}
+  [Sticky]	{yes}
+[end]
+[app] (title=Panel 1)
+  [Deco]	{NONE}
+[end]
diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session
index ca0afea35d..f6e03ede7e 100644
--- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session
+++ b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session
@@ -4,10 +4,20 @@
 #
 
 # Install "apps" file with defaults for GPE usage
-if test -e /usr/share/fluxbox/apps.gpe
+
+MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`"
+
+case $MACHINE in
+*Akita | *Spitz | *Borzoi | *Terrier)	
+	APPS="apps.gpe.akita";;
+*)	
+	APPS="apps.gpe.default";;
+esac
+
+if test -e /usr/share/fluxbox/$APPS
 then
 	mkdir -p $HOME/.fluxbox
-	test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/apps.gpe $HOME/.fluxbox/apps
+	test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/$APPS $HOME/.fluxbox/apps
 fi
 
 
diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox-gpe_1.0rc.bb
index 6becbe365d..9cf8da0217 100644
--- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb
+++ b/packages/fluxbox/fluxbox-gpe_1.0rc.bb
@@ -13,21 +13,21 @@ RCONFLICTS = "fluxbox"
 
 ######################################################################################
 
-PR = "r0"
+PR = "r3"
 S = "${WORKDIR}/fluxbox-${PV}"
 
 ######################################################################################
 
 SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-${PV}.tar.gz \
 	   file://gpe-init.patch;patch=1\
-	   file://apps.gpe \
+	   file://apps.gpe.* \
 	   file://style.gpe-default \
 	   file://fluxbox-gpe-session \
 	   file://fluxbox-gpe.session" 
 
 ######################################################################################
 
-PACKAGES = "${PN} ${PN}-styles"
+PACKAGES += "${PN}-styles"
 
 DESCRIPTION_${PN}-styles = "The default styles for fluxbox"
 
@@ -37,7 +37,7 @@ FILES_${PN} = "/usr/bin \
 	       /usr/share/fluxbox/init \
 	       /usr/share/fluxbox/keys \
 	       /usr/share/fluxbox/menu \
-	       /usr/share/fluxbox/apps.gpe \
+	       /usr/share/fluxbox/apps.gpe* \
 	       /usr/share/fluxbox/session \
 	       /usr/share/fluxbox/styles/gpe-default"
 
@@ -59,7 +59,7 @@ do_install_append() {
 	install -d ${D}/usr/share/fluxbox
 	install -d ${D}/usr/share/fluxbox/styles
 	
-	install -m 0644 ${WORKDIR}/apps.gpe ${D}/usr/share/fluxbox
+	install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox
 	install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session
 	install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default
 	install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin
diff --git a/packages/initscripts/initscripts-1.0/halt b/packages/initscripts/initscripts-1.0/halt
index aa1769606a..d8cab222ca 100755
--- a/packages/initscripts/initscripts-1.0/halt
+++ b/packages/initscripts/initscripts-1.0/halt
@@ -7,12 +7,6 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
-# Update the timestamp, if there is already one
-if test -e /etc/timestamp
-then
-        date +%2m%2d%2H%2M%Y > /etc/timestamp
-fi
-
 # See if we need to cut the power.
 if test -x /etc/init.d/ups-monitor
 then
diff --git a/packages/initscripts/initscripts-1.0/reboot b/packages/initscripts/initscripts-1.0/reboot
index 7f95255bd9..56278199be 100755
--- a/packages/initscripts/initscripts-1.0/reboot
+++ b/packages/initscripts/initscripts-1.0/reboot
@@ -7,11 +7,5 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
-# Update the timestamp, if there is one
-if test -e /etc/timestamp
-then
-        date +%2m%2d%2H%2M%Y > /etc/timestamp
-fi
-
 echo -n "Rebooting... "
 reboot -d -f -i
diff --git a/packages/initscripts/initscripts-1.0/save-rtc.sh b/packages/initscripts/initscripts-1.0/save-rtc.sh
new file mode 100644
index 0000000000..d06aa6d569
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/save-rtc.sh
@@ -0,0 +1,16 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: save-rtc.sh
+# Date: 03-Jul-06
+
+
+# Update the timestamp, if there is already one
+if test -e /etc/timestamp
+then
+	echo "Will restore RCT from /etc/timestamp on next boot"
+	echo "Delete that file to disable this feature."
+        date +%2m%2d%2H%2M%Y > /etc/timestamp
+fi
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index eebfbca7bf..0d14403a36 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r73"
+PR = "r74"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -31,7 +31,8 @@ SRC_URI = "file://halt \
            file://sysfs.sh \
            file://device_table.txt \
            file://populate-volatile.sh \
-           file://volatiles "
+           file://volatiles \
+	   file://save-rtc.sh"
 
 SRC_URI_append_arm          = " file://alignment.sh"
 SRC_URI_append_openzaurus   = " file://checkversion"
@@ -82,6 +83,7 @@ do_install () {
 	install -m 0755    ${WORKDIR}/devpts		${D}${sysconfdir}/default
 	install -m 0755    ${WORKDIR}/sysfs.sh		${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/save-rtc.sh	${D}${sysconfdir}/init.d	
 	install -m 0644    ${WORKDIR}/volatiles		${D}${sysconfdir}/default/volatiles/00_core
 	if [ "${TARGET_ARCH}" = "arm" ]; then
 		install -m 0755 ${WORKDIR}/alignment.sh	${D}${sysconfdir}/init.d
@@ -119,6 +121,8 @@ do_install () {
 	ln -sf		../init.d/umountfs	${D}${sysconfdir}/rc0.d/S40umountfs
 	# udev will run at S55 if installed
 	ln -sf		../init.d/halt		${D}${sysconfdir}/rc0.d/S90halt
+	ln -sf		../init.d/save-rtc.sh	${D}${sysconfdir}/rc0.d/S25save-rtc.sh
+	ln -sf		../init.d/save-rtc.sh	${D}${sysconfdir}/rc6.d/S25save-rtc.sh		
 	ln -sf		../init.d/banner	${D}${sysconfdir}/rcS.d/S02banner
 	ln -sf		../init.d/checkroot.sh	${D}${sysconfdir}/rcS.d/S10checkroot.sh
 #	ln -sf		../init.d/checkfs.sh	${D}${sysconfdir}/rcS.d/S30checkfs.sh
diff --git a/packages/lilo-sh/.mtn2git_empty b/packages/lilo-sh/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lilo-sh/.mtn2git_empty
diff --git a/packages/lilo-sh/files/.mtn2git_empty b/packages/lilo-sh/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lilo-sh/files/.mtn2git_empty
diff --git a/packages/lilo-sh/files/lilo-0.21-1.1.patch b/packages/lilo-sh/files/lilo-0.21-1.1.patch
new file mode 100644
index 0000000000..dfbab2a82c
--- /dev/null
+++ b/packages/lilo-sh/files/lilo-0.21-1.1.patch
@@ -0,0 +1,35 @@
+--- lilo/Makefile-	Fri Dec  4 15:35:07 1998
++++ lilo/Makefile	Wed Mar 17 01:04:07 1999
+@@ -24,7 +24,7 @@
+ #   VARSETUP	  Enables use of variable-size setup segments.
+ #   XL_SECS=n	  Support for extra large (non-standard) floppies.
+ 
+-CONFIG=-DIGNORECASE -DVARSETUP -DREWRITE_TABLE
++CONFIG=-DIGNORECASE -DVARSETUP -DREWRITE_TABLE -DLARGE_EBDA -DONE_SHOT
+ 
+ # End of configuration variables
+ 
+--- lilo/second.S-	Fri Dec  4 15:20:07 1998
++++ lilo/second.S	Wed Mar 17 01:03:53 1999
+@@ -830,9 +830,20 @@
+ 	call	load1
+ 	seg	es
+ 	mov	CL_MAGIC_ADDR,#CL_MAGIC ! set magic number
++#ifndef LCF_LARGE_EBDA
+ 	seg	es
+ 	mov	word ptr CL_OFFSET,#PARMLINE+SECOND_SS
+ 				! set parameter line offset
++#else
++	mov	di,#0x8000
++	mov	si,#PARMLINE
++	mov	cx,#CL_LENGTH
++	rep
++	movsb
++	seg	es
++	mov	word ptr CL_OFFSET,#0x8000
++				! set parameter line offset
++#endif
+ 	pop	si		! restore SI
+ 	lodsw			! get flags bit map
+ 	mov	bx,ax
+
diff --git a/packages/lilo-sh/files/lilo-0.21-include.patch b/packages/lilo-sh/files/lilo-0.21-include.patch
new file mode 100644
index 0000000000..61e298013c
--- /dev/null
+++ b/packages/lilo-sh/files/lilo-0.21-include.patch
@@ -0,0 +1,10 @@
+--- lilo.orig/common.h	Wed Oct 14 17:44:28 1998
++++ lilo/common.h	Mon Dec  7 18:05:17 1998
+@@ -7,6 +7,7 @@
+ #define COMMON_H
+ 
+ #include <sys/stat.h>
++#include <asm/types.h>
+ #include <linux/genhd.h>
+ 
+ #include "lilo.h"
diff --git a/packages/lilo-sh/files/lilo-0.21-loopdev.patch b/packages/lilo-sh/files/lilo-0.21-loopdev.patch
new file mode 100644
index 0000000000..e739c5b104
--- /dev/null
+++ b/packages/lilo-sh/files/lilo-0.21-loopdev.patch
@@ -0,0 +1,11 @@
+--- lilo/device.c.oot	Mon Jan 10 09:37:00 2000
++++ lilo/device.c	Mon Jan 10 09:37:37 2000
+@@ -192,4 +192,8 @@
+ 	sprintf(tmp,"/dev/sdb%d",i);
+ 	cache_add(tmp,0x810+i);
+     }
++    for (i = 0; i <= 7; i++) {
++	sprintf(tmp,"/dev/loop%d",i);
++	cache_add(tmp,0x700+i);
++    }
+ }
diff --git a/packages/lilo-sh/files/lilo-0.21-second.patch b/packages/lilo-sh/files/lilo-0.21-second.patch
new file mode 100644
index 0000000000..12a9af04c7
--- /dev/null
+++ b/packages/lilo-sh/files/lilo-0.21-second.patch
@@ -0,0 +1,36 @@
+I have a problem to report with lilo, and the fix for it. I am not sure
+whether this is the right place for it though, I am also CCing the lilo
+maintainer Werner Almesberger.
+
+When lilo gets control from the bios (whether lilo is on disk, or on the
+floppy), it is checking the wrong location when it tries to parse the
+parameter line construction area to determine whether it needs to clean
+up extra blank spaces. This is causing lilo to eat up the last character(s)
+of the command line that it passes to the kernel.
+
+Specifically, the code
+
+cpcodn:	cmp	byte ptr (di-1),#32 ! last was space ?
+
+is using the memory contents of ds:di-1 for the compare. It should
+really be using es:di-1. I checked, ds=0x0b00 around here, so the
+code ended up checking 0x0b00:(di-1) instead of 0x9000:(di-1). It
+is quite possible that the memory that lilo checks has garbage, 
+causing it to make wrong decision. A "seg es" just before the cmp 
+fixes the problem. I am attaching the patch below.
+
+Kanoj
+
+--- second.0	Mon Sep 20 13:52:01 1999
++++ second.S	Tue Sep 28 10:20:54 1999
+@@ -816,7 +816,8 @@
+ 	je	cpcodsp		! yes -> discard next
+ 	lodsb			! get next byte
+ 	jmp	cpcolp
+-cpcodn:	cmp	byte ptr (di-1),#32 ! last was space ?
++cpcodn:	seg	es
++	cmp	byte ptr (di-1),#32 ! last was space ?
+ 	jne	nocopt		! no -> go on
+ 	dec	di		! discard it
+ nocopt:	mov	si,options	! append variable options
+
diff --git a/packages/lilo-sh/files/lilo-linkgear.patch b/packages/lilo-sh/files/lilo-linkgear.patch
new file mode 100644
index 0000000000..598a92a7af
--- /dev/null
+++ b/packages/lilo-sh/files/lilo-linkgear.patch
@@ -0,0 +1,1039 @@
+diff -Naur --exclude=CVS --exclude='*.orig' lilo/Makefile lilosh/Makefile
+--- lilo/Makefile	2006-02-01 21:16:29.000000000 +0000
++++ lilosh/Makefile	2006-02-01 21:23:37.000000000 +0000
+@@ -40,7 +40,6 @@
+ 
+ SHELL=/bin/sh
+ 
+-CROSS_COMPILE = sh3-linux-
+ CC	=$(CROSS_COMPILE)gcc
+ LD	=$(CROSS_COMPILE)ld
+ OBJCOPY =$(CROSS_COMPILE)objcopy
+@@ -72,10 +71,10 @@
+ 		$(OBJCOPY) -R .comment -S second.exe -O binary second.bin
+ 
+ first.exe:	first.o
+-		$(LD) -EL -e start first.o -o first.exe -Ttext 0x8c200000
++		$(LD) -EL -e start first.o -o first.exe -Ttext 0x88a00000
+ 
+ second.exe:	second.o string.o
+-		$(LD) -T second.lds -EL second.o string.o -o second.exe -Ttext 0x8c201000
++		$(LD) -T second.lds -EL second.o string.o -o second.exe -Ttext 0x88a01000
+ 
+ first.o:	first.S
+ 		$(CC) $(CFLAGS) -c first.S
+diff -Naur --exclude=CVS --exclude='*.orig' lilo/boot.c lilosh/boot.c
+--- lilo/boot.c	1997-06-20 12:48:28.000000000 +0000
++++ lilosh/boot.c	2006-01-31 19:46:21.000000000 +0000
+@@ -11,6 +11,7 @@
+ #include <errno.h>
+ #include <a.out.h>
+ #include <sys/stat.h>
++#include <asm/page.h>
+ 
+ #include "config.h"