merge of '30ae730925a12988661810facbdca0b1b0399934'

     and '704c652447ad25124b4af7103ee48137c5db36b2'

19 files changed, 2739 insertions, 9 deletions

diff --git a/packages/avahi/mango-lassi_git.bb b/packages/avahi/mango-lassi_git.bb
index 99fd617ec9..5d240c2c14 100644
--- a/packages/avahi/mango-lassi_git.bb
+++ b/packages/avahi/mango-lassi_git.bb
@@ -1,16 +1,14 @@
-DESCRIPTION = "Input sharing, the avahi way"
+ESCRIPTION = "Input sharing, the avahi way"
 DEPENDS = "avahi-ui libglade libnotify"
 
-PV = "0.0+git${SRCDATE}"
+SRCREV = "73638817126a68d62f1233f6e6859ce75a259e93"
+PV = "0.0+${PR}+gitr${SRCREV}"
 
 SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http"
 
+S = "${WORKDIR}/git"
 
-S = "${WORKDIR}/${PN}"
-
-do_compile_prepend() {
-        export CFLAGS="-Wall -Wextra -W -O0 -g -pipe -Wno-unused-parameter `pkg-config --cflags dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-ui avahi-glib avahi-client libnotify libglade-2.0` `pkg-config --libs dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-glib avahi-client avahi-ui libnotify libglade-2.0`"
-}
+inherit autotools
 
 do_install() {
         install -d ${D}${bindir}
diff --git a/packages/freetype/freetype-2.3.6/libtool-tag.patch b/packages/freetype/freetype-2.3.6/libtool-tag.patch
new file mode 100644
index 0000000000..2f096cdd46
--- /dev/null
+++ b/packages/freetype/freetype-2.3.6/libtool-tag.patch
@@ -0,0 +1,20 @@
+--- freetype-2.3.6/builds/unix/unix-cc.in	
++++ freetype-2.3.6/builds/unix/unix-cc.in	
+@@ -88,7 +88,7 @@ 
+ #
+ #
+ CCraw := $(CC)
+-CC    := $(LIBTOOL) --mode=compile $(CCraw)
++CC    := $(LIBTOOL) --tag=CC --mode=compile $(CCraw)
+ 
+ # Linker flags.
+ #
+@@ -105,7 +105,7 @@ 
+ 
+ # Library linking
+ #
+-LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
++LINK_LIBRARY = $(LIBTOOL) --tag=CC --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
+                           -rpath $(libdir) -version-info $(version_info) \
+                           $(LDFLAGS) -no-undefined \
+                           # -export-symbols $(EXPORTS_LIST)
diff --git a/packages/freetype/freetype_2.3.6.bb b/packages/freetype/freetype_2.3.6.bb
index 516354ad23..eca74c0ce2 100644
--- a/packages/freetype/freetype_2.3.6.bb
+++ b/packages/freetype/freetype_2.3.6.bb
@@ -7,6 +7,7 @@ SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
   file://no-hardcode.patch;patch=1 \
   file://fix-configure.patch;patch=1 \
+  file://libtool-tag.patch;patch=1 \
 "
 S = "${WORKDIR}/freetype-${PV}"
 
diff --git a/packages/gtk+/gtk+-native-1.2_1.2.10.bb b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
index 232bfa4768..f5ad1a58ab 100644
--- a/packages/gtk+/gtk+-native-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
@@ -4,8 +4,10 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "glib-1.2 jpeg libpng libxext"
-PR = "r0"
 
+PR = "r1"
+
+FILESPATH =+ "${FILE_DIRNAME}/gtk+-1.2-1.2.10:"
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \
            file://gtk+1.2-reconf-fix;patch=1 \
            file://no-xwc;patch=1"
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index a857c5b331..261caa3476 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -2,6 +2,7 @@
 # freesmartphone.org Image Recipe
 #------------------------------------------------------
 
+COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"
 IMAGE_LINGUAS = ""
 
 # getting the base system up
diff --git a/packages/nonworking/libexif/.mtn2git_empty b/packages/libexif/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/libexif/.mtn2git_empty
+++ b/packages/libexif/.mtn2git_empty
diff --git a/packages/nonworking/libexif/libexif_0.5.12.bb b/packages/libexif/libexif_0.5.12.bb
index 94f3bee856..94f3bee856 100644
--- a/packages/nonworking/libexif/libexif_0.5.12.bb
+++ b/packages/libexif/libexif_0.5.12.bb
diff --git a/packages/nonworking/libexif/libexif_0.6.13.bb b/packages/libexif/libexif_0.6.13.bb
index 8382de84f5..8382de84f5 100644
--- a/packages/nonworking/libexif/libexif_0.6.13.bb
+++ b/packages/libexif/libexif_0.6.13.bb
diff --git a/packages/nonworking/libexif/libexif_0.6.16.bb b/packages/libexif/libexif_0.6.16.bb
index 2f896352db..2f896352db 100644
--- a/packages/nonworking/libexif/libexif_0.6.16.bb
+++ b/packages/libexif/libexif_0.6.16.bb
diff --git a/packages/nonworking/libexif/libexif_0.6.9.bb b/packages/libexif/libexif_0.6.9.bb
index d255f5d862..d255f5d862 100644
--- a/packages/nonworking/libexif/libexif_0.6.9.bb
+++ b/packages/libexif/libexif_0.6.9.bb
diff --git a/packages/u-boot/u-boot-git/akita/.mtn2git_empty b/packages/u-boot/u-boot-git/akita/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/u-boot/u-boot-git/akita/.mtn2git_empty
diff --git a/packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch b/packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch
new file mode 100644
index 0000000000..ad62e13d2e
--- /dev/null
+++ b/packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch
@@ -0,0 +1,56 @@
+--- git/include/configs/akita.h	2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/akita.h	2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ 	"if testkey 101 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x00060000 0x00540000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " \
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 2 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait fbcon=rotate:1; " 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 18 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; "	 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait fbcon=rotate:1; "	 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 3 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; "	 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait fbcon=rotate:1; "	 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"nand read.logical 0xa1000000 0x005a0000 0x00160000; "								\
+-	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " 	\
++	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " \
+ 	"bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND	"" // "run boot_flash"
+ #endif
+ 
+-#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192"
++#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)"
+ #define CONFIG_SETUP_MEMORY_TAGS 1
+ #define CONFIG_CMDLINE_TAG	 1	/* enable passing of ATAGs	*/
+ #define CONFIG_INITRD_TAG	 1
+@@ -302,9 +302,9 @@
+ /* Note: fake mtd_id used, no linux mtd map file */
+ 
+ #define CONFIG_JFFS2_CMDLINE
+-#define MTDIDS_DEFAULT		"nand0=laze-0"
++#define MTDIDS_DEFAULT		"nand0=sharpsl-nand"
+ //#define MTDPARTS_DEFAULT	"mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)"
+-#define MTDPARTS_DEFAULT	"mtdparts=laze-0:7168k(Logical),-(JFFS2)"
++#define MTDPARTS_DEFAULT	"mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)"
+ 
+ /*
+  * SHARP SL NAND logical partition
diff --git a/packages/u-boot/u-boot-git/c7x0/.mtn2git_empty b/packages/u-boot/u-boot-git/c7x0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/u-boot/u-boot-git/c7x0/.mtn2git_empty
diff --git a/packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch b/packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch
new file mode 100644
index 0000000000..7d25c0877c
--- /dev/null
+++ b/packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch
@@ -0,0 +1,56 @@
+--- git/include/configs/corgi.h 2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/corgi.h	2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ 	"if testkey 101 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x00060000 0x00540000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192; " 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " 		\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 2 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1; " 				\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait; " 			\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 18 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1; "			 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait; "			 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 3 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1; "			 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait; "			 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"nand read.logical 0xa0800000 0x005a0000 0x00160000; "								\
+-	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2; " 			\
++	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 mtdparts=sharpsl-nand:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " 	\
+	"bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND	"" // "run boot_flash"
+ #endif
+ 
+-#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192"
++#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)"
+ #define CONFIG_SETUP_MEMORY_TAGS 1
+ #define CONFIG_CMDLINE_TAG	 1	/* enable passing of ATAGs	*/
+ #define CONFIG_INITRD_TAG	 1
+@@ -304,9 +304,9 @@
+ /* Note: fake mtd_id used, no linux mtd map file */
+ 
+ #define CONFIG_JFFS2_CMDLINE
+-#define MTDIDS_DEFAULT		"nand0=laze-0"
++#define MTDIDS_DEFAULT		"nand0=sharpsl-nand"
+ //#define MTDPARTS_DEFAULT	"mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)"
+-#define MTDPARTS_DEFAULT	"mtdparts=laze-0:7168k(Logical),-(JFFS2)"
++#define MTDPARTS_DEFAULT	"mtdparts=sharpsl-nand:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)"
+ 
+ /*
+  * SHARP SL NAND logical partition
diff --git a/packages/u-boot/u-boot-git/pdaXrom-u-boot.patch b/packages/u-boot/u-boot-git/pdaXrom-u-boot.patch
new file mode 100644
index 0000000000..0bf071399d
--- /dev/null
+++ b/packages/u-boot/u-boot-git/pdaXrom-u-boot.patch
@@ -0,0 +1,2467 @@
+diff -Nur u-boot-2006-04-18-1106/CREDITS u-boot-2006-04-18-1106-new/CREDITS
+--- u-boot-2006-04-18-1106/CREDITS	2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/CREDITS	2006-07-05 11:19:44.000000000 +0000
+@@ -93,6 +93,12 @@
+ E: jonathan.debruyne@siemens.atea.be
+ D: Port to Siemens IAD210 board
+ 
++N: Alexander Chukov
++E: sash@pdaXrom.org
++D: initial support for Sharp Zaurus SL-C1000/3100
++D: initial support for Sharp Zaurus SL-C7x0/C860
++W: http://www.pdaXrom.org
++
+ N: Ken Chou
+ E: kchou@ieee.org
+ D: Support for A3000 SBC board
+diff -Nur u-boot-2006-04-18-1106/MAINTAINERS u-boot-2006-04-18-1106-new/MAINTAINERS
+--- u-boot-2006-04-18-1106/MAINTAINERS	2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/MAINTAINERS	2006-07-05 11:19:44.000000000 +0000
+@@ -379,6 +379,11 @@
+ 
+ 	AT91RM9200DK		at91rm9200
+ 
++Alexander Chukov <sash@pdaXrom.org>
++
++	akita			xscale
++	corgi			xscale
++
+ George G. Davis <gdavis@mvista.com>
+ 
+ 	assabet			SA1100
+diff -Nur u-boot-2006-04-18-1106/MAKEALL u-boot-2006-04-18-1106-new/MAKEALL
+--- u-boot-2006-04-18-1106/MAKEALL	2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/MAKEALL	2006-07-05 11:19:44.000000000 +0000
+@@ -206,7 +206,7 @@
+ 	adsvix		cerf250		cradle		csb226		\
+ 	delta		innokom		lubbock		pxa255_idp	\
+ 	wepep250	xaeniax		xm250		xsengine	\
+-	zylonite							\
++	zylonite	akita	corgi					\
+ "
+ 
+ LIST_ixp="ixdp425"
+diff -Nur u-boot-2006-04-18-1106/Makefile u-boot-2006-04-18-1106-new/Makefile
+--- u-boot-2006-04-18-1106/Makefile	2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/Makefile	2006-07-05 11:19:44.000000000 +0000
+@@ -61,7 +61,7 @@
+ CROSS_COMPILE = powerpc-linux-
+ endif
+ ifeq ($(ARCH),arm)
+-CROSS_COMPILE = arm-linux-
++CROSS_COMPILE = armv5tel-linux-
+ endif
+ ifeq ($(ARCH),i386)
+ ifeq ($(HOSTARCH),i386)
+@@ -1709,6 +1709,12 @@
+ zylonite_config :
+ 	@./mkconfig $(@:_config=) arm pxa zylonite
+ 
++akita_config 	:	unconfig
++	@./mkconfig $(@:_config=) arm pxa akita
++
++corgi_config 	:	unconfig
++	@./mkconfig $(@:_config=) arm pxa corgi
++
+ #########################################################################
+ ## ARM1136 Systems
+ #########################################################################
+diff -Nur u-boot-2006-04-18-1106/README u-boot-2006-04-18-1106-new/README
+--- u-boot-2006-04-18-1106/README	2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/README	2006-07-05 11:19:44.000000000 +0000
+@@ -311,7 +311,8 @@
+ 		CONFIG_KB9202,		CONFIG_LART,		CONFIG_LPD7A400,
+ 		CONFIG_LUBBOCK,		CONFIG_OSK_OMAP5912,	CONFIG_OMAP2420H4,
+ 		CONFIG_SHANNON,		CONFIG_P2_OMAP730,	CONFIG_SMDK2400,
+-		CONFIG_SMDK2410,	CONFIG_TRAB,		CONFIG_VCMA9
++		CONFIG_SMDK2410,	CONFIG_TRAB,		CONFIG_VCMA9,
++		CONFIG_AKITA,		CONFIG_CORGI
+ 
+ 		MicroBlaze based boards:
+ 		------------------------
+diff -Nur u-boot-2006-04-18-1106/board/akita/Makefile u-boot-2006-04-18-1106-new/board/akita/Makefile
+--- u-boot-2006-04-18-1106/board/akita/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2006-04-18-1106-new/board/akita/Makefile	2006-07-05 11:19:44.000000000 +0000
+@@ -0,0 +1,51 @@
++#
++# board/akita/Makefile
++#
++# (C) Copyright 2006 Alexander Chukov <sash@pdaXrom.org>
++#
++# (C) Copyright 2000
++# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
++#
++# See file CREDITS for list of people who contributed to this
++# project.
++#
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of
++# the License, or (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
++
++include $(TOPDIR)/config.mk
++
++LIB	= lib$(BOARD).a
++
++OBJS	:= akita.o nand.o kbd.o
++SOBJS	:= lowlevel_init.o
++
++$(LIB):	$(OBJS) $(SOBJS)
++	$(AR) crv $@ $(OBJS) $(SOBJS)
++
++clean:
++	rm -f $(SOBJS) $(OBJS)
++
++distclean:	clean
++	rm -f $(LIB) core *.bak .depend
++
++#########################################################################
++
++.depend:	Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
++		$(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
++
++-include .depend
++
++#########################################################################
+diff -Nur u-boot-2006-04-18-1106/board/akita/akita.c u-boot-2006-04-18-1106-new/board/akita/akita.c
+--- u-boot-2006-04-18-1106/board/akita/akita.c	1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2006-04-18-1106-new/board/akita/akita.c	2006-07-05 11:19:44.000000000 +0000
+@@ -0,0 +1,89 @@
++/*
++ * board/akita/akita.c
++ *
++ * Configuration settings for the Sharp Zaurus SL-Cxx00.
++ *
++ * (C) Copyright 2006 Alexander Chukov <sash@pdaXrom.org>
++ *
++ * portions from adsvix board configuration:
++ * (C) Copyright 2004
++ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net
++ * (C) Copyright 2002
++ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net
++ * (C) Copyright 2002
++ * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
++ * Marius Groeger <mgroeger@sysgo.de>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#include <common.h>
++
++void set_turbo_mode(void);
++
++/* ------------------------------------------------------------------------- */
++
++/*
++ * Miscellaneous platform dependent initialisations
++ */
++
++int board_init (void)
++{
++	DECLARE_GLOBAL_DATA_PTR;
++
++	/* memory and cpu-speed are setup before relocation */
++	/* so we do _nothing_ here */
++
++	/* arch number of Sharp Zaurus Akita : MACH_TYPE_AKITA */
++	gd->bd->bi_arch_number = 744;
++
++	/* adress of boot parameters */
++	gd->bd->bi_boot_params = 0xa0000100;
++
++	/* set cpu turbo mode */
++	set_turbo_mode();
++
++	spitzkbd_init();
++
++	return 0;
++}
++
++int board_late_init(void)
++{
++	setenv("stdout", "serial");
++	setenv("stderr", "serial");
++	return 0;
++}
++
++
++int dram_init (void)
++{
++	DECLARE_GLOBAL_DATA_PTR;
++
++	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
++	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
++	gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
++	gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
++	gd->bd->bi_dram[2].start = PHYS_SDRAM_3;
++	gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE;
++	gd->bd->bi_dram[3].start = PHYS_SDRAM_4;
++	gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE;
++
++	return 0;
++}
+diff -Nur u-boot-2006-04-18-1106/board/akita/config.mk u-boot-2006-04-18-1106-new/board/akita/config.mk
+--- u-boot-2006-04-18-1106/board/akita/config.mk	1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2006-04-18-1106-new/board/akita/config.mk	2006-07-05 11:19:44.000000000 +0000
+@@ -0,0 +1 @@
++TEXT_BASE = 0xa3000000
+diff -Nur u-boot-2006-04-18-1106/board/akita/kbd.c u-boot-2006-04-18-1106-new/board/akita/kbd.c
+--- u-boot-2006-04-18-1106/board/akita/kbd.c	1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2006-04-18-1106-new/board/akita/kbd.c	2006-07-05 11:19:44.000000000 +0000
+@@ -0,0 +1,261 @@
++/*
++ * board/akita/kbd.c
++ *
++ * Keyboard driver for the Sharp Zaurus SL-Cxx00.
++ *
++ * (C) Copyright 2006 Alexander Chukov <sash@pdaXrom.org>
++ *
++ * portions from:
++ *
++ * linux/drivers/input/keyboard/spitzkbd.c
++ *
++ * Keyboard driver for Sharp Spitz, Borzoi and Akita (SL-Cxx00 series)
++ *
++ * Copyright (C) 2005 Richard Purdie
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#include <common.h>
++#include <command.h>
++#include <config.h>
++#include <version.h>
++#include <asm/arch/pxa-regs.h>
++
++#define GPIO_DFLT_LOW		0x400
++#define GPIO_DFLT_HIGH		0x800
++
++void pxa_gpio_mode(int gpio_mode)
++{
++	int gpio = gpio_mode & GPIO_MD_MASK_NR;
++	int fn = (gpio_mode & GPIO_MD_MASK_FN) >> 8;
++	int gafr;
++
++	if (gpio_mode & GPIO_DFLT_LOW)
++		GPCR(gpio) = GPIO_bit(gpio);
++	else if (gpio_mode & GPIO_DFLT_HIGH)
++		GPSR(gpio) = GPIO_bit(gpio);
++	if (gpio_mode & GPIO_MD_MASK_DIR)
++		GPDR(gpio) |= GPIO_bit(gpio);
++	else
++		GPDR(gpio) &= ~GPIO_bit(gpio);
++	gafr = GAFR(gpio) & ~(0x3 << (((gpio) & 0xf)*2));
++	GAFR(gpio) = gafr |  (fn  << (((gpio) & 0xf)*2));
++}
++
++#define SPITZ_KEY_STROBE_NUM         (11)
++#define SPITZ_KEY_SENSE_NUM          (7)
++
++#define SPITZ_GPIO_G0_STROBE_BIT     0x0f800000
++#define SPITZ_GPIO_G1_STROBE_BIT     0x00100000
++#define SPITZ_GPIO_G2_STROBE_BIT     0x01000000
++#define SPITZ_GPIO_G3_STROBE_BIT     0x00041880
++#define SPITZ_GPIO_G0_SENSE_BIT      0x00021000
++#define SPITZ_GPIO_G1_SENSE_BIT      0x000000d4
++#define SPITZ_GPIO_G2_SENSE_BIT      0x08000000
++#define SPITZ_GPIO_G3_SENSE_BIT      0x00000000
++
++#define SPITZ_GPIO_KEY_STROBE0       88
++#define SPITZ_GPIO_KEY_STROBE1       23
++#define SPITZ_GPIO_KEY_STROBE2       24
++#define SPITZ_GPIO_KEY_STROBE3       25
++#define SPITZ_GPIO_KEY_STROBE4       26
++#define SPITZ_GPIO_KEY_STROBE5       27
++#define SPITZ_GPIO_KEY_STROBE6       52
++#define SPITZ_GPIO_KEY_STROBE7       103
++#define SPITZ_GPIO_KEY_STROBE8       107
++#define SPITZ_GPIO_KEY_STROBE9       108
++#define SPITZ_GPIO_KEY_STROBE10      114
++
++#define SPITZ_GPIO_KEY_SENSE0        12
++#define SPITZ_GPIO_KEY_SENSE1        17
++#define SPITZ_GPIO_KEY_SENSE2        91
++#define SPITZ_GPIO_KEY_SENSE3        34
++#define SPITZ_GPIO_KEY_SENSE4        36
++#define SPITZ_GPIO_KEY_SENSE5        38
++#define SPITZ_GPIO_KEY_SENSE6        39
++
++#define SPITZ_GPIO_ON_KEY          (95)
++
++#define KB_ROWS			7
++#define KB_COLS			11
++#define KB_ROWMASK(r)		(1 << (r))
++#define SCANCODE(r,c)		(((r)<<4) + (c) + 1)
++#define	NR_SCANCODES		((KB_ROWS<<4) + 1)
++
++#define SCAN_INTERVAL		(50) /* ms */
++#define HINGE_SCAN_INTERVAL	(150) /* ms */
++
++#define KB_DISCHARGE_DELAY	10
++#define KB_ACTIVATE_DELAY	10
++
++static int spitz_strobes[] = {
++	SPITZ_GPIO_KEY_STROBE0,
++	SPITZ_GPIO_KEY_STROBE1,
++	SPITZ_GPIO_KEY_STROBE2,
++	SPITZ_GPIO_KEY_STROBE3,
++	SPITZ_GPIO_KEY_STROBE4,
++	SPITZ_GPIO_KEY_STROBE5,
++	SPITZ_GPIO_KEY_STROBE6,
++	SPITZ_GPIO_KEY_STROBE7,
++	SPITZ_GPIO_KEY_STROBE8,
++	SPITZ_GPIO_KEY_STROBE9,
++	SPITZ_GPIO_KEY_STROBE10,
++};
++
++static int spitz_senses[] = {
++	SPITZ_GPIO_KEY_SENSE0,
++	SPITZ_GPIO_KEY_SENSE1,
++	SPITZ_GPIO_KEY_SENSE2,
++	SPITZ_GPIO_KEY_SENSE3,
++	SPITZ_GPIO_KEY_SENSE4,
++	SPITZ_GPIO_KEY_SENSE5,
++	SPITZ_GPIO_KEY_SENSE6,
++};
++
++static inline void spitzkbd_discharge_all(void)
++{
++	/* STROBE All HiZ */
++	GPCR0  =  SPITZ_GPIO_G0_STROBE_BIT;
++	GPDR0 &= ~SPITZ_GPIO_G0_STROBE_BIT;
++	GPCR1  =  SPITZ_GPIO_G1_STROBE_BIT;
++	GPDR1 &= ~SPITZ_GPIO_G1_STROBE_BIT;
++	GPCR2  =  SPITZ_GPIO_G2_STROBE_BIT;
++	GPDR2 &= ~SPITZ_GPIO_G2_STROBE_BIT;
++	GPCR3  =  SPITZ_GPIO_G3_STROBE_BIT;
++	GPDR3 &= ~SPITZ_GPIO_G3_STROBE_BIT;
++}
++
++static inline void spitzkbd_activate_all(void)
++{
++	/* STROBE ALL -> High */
++	GPSR0  =  SPITZ_GPIO_G0_STROBE_BIT;
++	GPDR0 |=  SPITZ_GPIO_G0_STROBE_BIT;
++	GPSR1  =  SPITZ_GPIO_G1_STROBE_BIT;
++	GPDR1 |=  SPITZ_GPIO_G1_STROBE_BIT;
++	GPSR2  =  SPITZ_GPIO_G2_STROBE_BIT;
++	GPDR2 |=  SPITZ_GPIO_G2_STROBE_BIT;
++	GPSR3  =  SPITZ_GPIO_G3_STROBE_BIT;
++	GPDR3 |=  SPITZ_GPIO_G3_STROBE_BIT;
++
++	udelay(KB_DISCHARGE_DELAY);
++}
++
++static inline void spitzkbd_activate_col(int col)
++{
++	int gpio = spitz_strobes[col];
++	GPDR0 &= ~SPITZ_GPIO_G0_STROBE_BIT;
++	GPDR1 &= ~SPITZ_GPIO_G1_STROBE_BIT;
++	GPDR2 &= ~SPITZ_GPIO_G2_STROBE_BIT;
++	GPDR3 &= ~SPITZ_GPIO_G3_STROBE_BIT;
++	GPSR(gpio) = GPIO_bit(gpio);
++	GPDR(gpio) |= GPIO_bit(gpio);
++}
++
++static inline void spitzkbd_reset_col(int col)
++{
++	int gpio = spitz_strobes[col];
++	GPDR0 &= ~SPITZ_GPIO_G0_STROBE_BIT;
++	GPDR1 &= ~SPITZ_GPIO_G1_STROBE_BIT;
++	GPDR2 &= ~SPITZ_GPIO_G2_STROBE_BIT;
++	GPDR3 &= ~SPITZ_GPIO_G3_STROBE_BIT;
++	GPCR(gpio) = GPIO_bit(gpio);
++	GPDR(gpio) |= GPIO_bit(gpio);
++}
++
++static inline int spitzkbd_get_row_status(int col)
++{
++	return ((GPLR0 >> 12) & 0x01) | ((GPLR0 >> 16) & 0x02)
++		| ((GPLR2 >> 25) & 0x04) | ((GPLR1 << 1) & 0x08)
++		| ((GPLR1 >> 0) & 0x10) | ((GPLR1 >> 1) & 0x60);
++}
++
++static int spitzkbd_scankeyboard(void)
++{
++	unsigned int row, col, rowd;
++	unsigned int num_pressed, pwrkey = ((GPLR(SPITZ_GPIO_ON_KEY) & GPIO_bit(SPITZ_GPIO_ON_KEY)) != 0);
++	int ret = -1;
++
++	num_pressed = 0;
++	for (col = 0; col < KB_COLS; col++) {
++		spitzkbd_discharge_all();
++		udelay(KB_DISCHARGE_DELAY);
++
++		spitzkbd_activate_col(col);
++		udelay(KB_ACTIVATE_DELAY);
++
++		rowd = spitzkbd_get_row_status(col);
++		for (row = 0; row < KB_ROWS; row++) {
++			unsigned int scancode, pressed;
++
++			scancode = SCANCODE(row, col);
++			pressed = rowd & KB_ROWMASK(row);
++
++			if (pressed)
++				ret = scancode;
++		}
++		spitzkbd_reset_col(col);
++	}
++
++	spitzkbd_activate_all();
++
++	if (pwrkey)
++		return -2;
++	
++	return ret;
++}
++
++void spitzkbd_init(void)
++{
++	int i;
++
++	/* Setup sense interrupts - RisingEdge Detect, sense lines as inputs */
++	for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++)
++		pxa_gpio_mode(spitz_senses[i] | GPIO_IN);
++
++	/* Set Strobe lines as outputs - set high */
++	for (i = 0; i < SPITZ_KEY_STROBE_NUM; i++)
++		pxa_gpio_mode(spitz_strobes[i] | GPIO_OUT | GPIO_DFLT_HIGH);
++
++	pxa_gpio_mode(SPITZ_GPIO_ON_KEY | GPIO_IN);
++}
++
++int do_testkey(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
++{
++	int scan;
++	
++	if (argc < 2)
++		return 1;
++
++	scan = spitzkbd_scankeyboard();
++
++
++//	if (scan >= 0)
++//		printf("Scan = %d\n", scan);
++//	else
++//		printf("Nothing!\n");
++
++	return !(simple_strtol(argv[1], NULL, 10) == scan);
++}
++
++U_BOOT_CMD(
++	testkey,   2,      1,      do_testkey,
++	"testkey - compare pressed key with arg\n",
++	"<key scancode>"
++);
+diff -Nur u-boot-2006-04-18-1106/board/akita/lowlevel_init.S u-boot-2006-04-18-1106-new/board/akita/lowlevel_init.S
+--- u-boot-2006-04-18-1106/board/akita/lowlevel_init.S	1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2006-04-18-1106-new/board/akita/lowlevel_init.S	2006-07-05 11:19:44.000000000 +0000
+@@ -0,0 +1,135 @@
++/*
++ * board/akita/lowlevel_init.S
++ *
++ * Configuration settings for the Sharp Zaurus SL-Cxx00.
++ *
++ * (C) Copyright 2006 Alexander Chukov <sash@pdaXrom.org>
++ *
++ * This was originally from the Lubbock u-boot port and from BLOB with cleanup
++ *
++ * NOTE: I haven't clean this up considerably, just enough to get it
++ * running. See hal_platform_setup.h for the source. See
++ * board/cradle/lowlevel_init.S for another PXA250 setup that is
++ * much cleaner.
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#include <config.h>
++#include <version.h>
++#include <asm/arch/pxa-regs.h>
++
++/* wait for coprocessor write complete */