summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/u-boot/u-boot-git/akita/.mtn2git_empty0
-rw-r--r--packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch112
-rw-r--r--packages/u-boot/u-boot-git/c7x0/.mtn2git_empty0
-rw-r--r--packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch112
-rw-r--r--packages/u-boot/u-boot-git/pdaXrom-u-boot.patch4934
-rw-r--r--packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch94
-rw-r--r--packages/u-boot/u-boot_git.bb12
7 files changed, 1 insertions, 5263 deletions
diff --git a/packages/u-boot/u-boot-git/akita/.mtn2git_empty b/packages/u-boot/u-boot-git/akita/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/u-boot/u-boot-git/akita/.mtn2git_empty
+++ /dev/null
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
deleted file mode 100644
index 9d65de8daa..0000000000
--- a/packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- 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),59392k(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),59392k(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),59392k(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),59392k(root),-(home)"
-
- /*
- * SHARP SL NAND logical partition
---- 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),CUSTOM_ROOTFS_SIZE(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),CUSTOM_ROOTFS_SIZE(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),CUSTOM_ROOTFS_SIZE(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),CUSTOM_ROOTFS_SIZE(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
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/u-boot/u-boot-git/c7x0/.mtn2git_empty
+++ /dev/null
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
deleted file mode 100644
index 205f05b53e..0000000000
--- a/packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- 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),54272k(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),54272k(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),54272k(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),54272k(root),-(home)"
-
- /*
- * SHARP SL NAND logical partition
---- 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),CUSTOM_ROOTFS_SIZE(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),CUSTOM_ROOTFS_SIZE(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),CUSTOM_ROOTFS_SIZE(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),CUSTOM_ROOTFS_SIZE(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
deleted file mode 100644
index 9ceadde6dc..0000000000
--- a/packages/u-boot/u-boot-git/pdaXrom-u-boot.patch
+++ /dev/null
@@ -1,4934 +0,0 @@
-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 */
-+ .macro CPWAIT reg
-+ mrc p15,0,\reg,c2,c0,0
-+ mov \reg,\reg
-+ sub pc,pc,#4
-+ .endm
-+
-+/*********** Write out to HEX 7 segment leds *********/
-+
-+#undef DEBUG_HEXLOG
-+
-+#ifdef DEBUG_HEXLOG
-+#define LEDCTL 0x08000040
-+#define LEDDAT1 0x08000010
-+#define LEDDAT2 0x08000014
-+
-+.macro wait, count
-+ mov r10, \count
-+0:
-+ subs r10, r10, #1
-+ bne 0b
-+.endm
-+
-+.macro hexlog_init
-+ ldr r11, =LEDCTL
-+ mov r10, #0xff
-+ str r10, [r11]
-+ ldr r11, =LEDDAT2
-+ mov r10, #0xFFFFFFFF
-+ str r10, [r11]
-+ ldr r11, =LEDDAT1
-+ mov r10, #0x0
-+ str r10, [r11]
-+.endm
-+
-+.macro hexlog, val
-+ ldr r11, =LEDCTL
-+ mov r10, #0xff
-+ str r10, [r11]
-+ ldr r11, =LEDDAT2
-+ mov r10, #0xFFFFFFFF
-+ str r10, [r11]
-+
-+ ldr r11, =LEDDAT1
-+ mov r10, \val
-+ str r10, [r11]
-+
-+ wait #0x400000
-+.endm
-+
-+#else
-+
-+.macro hexlog_init
-+ nop
-+.endm
-+
-+.macro hexlog, val
-+ nop
-+.endm
-+
-+#endif
-+
-+/***********************************/
-+
-+/*
-+ * Memory setup
-+ */
-+
-+.globl lowlevel_init
-+lowlevel_init:
-+
-+ mov pc, lr
-+
-+.globl set_turbo_mode
-+
-+set_turbo_mode:
-+ /* Turn on turbo mode */
-+ mrc p14, 0, r2, c6, c0, 0
-+ orr r2, r2, #0xB /* Turbo, Fast-Bus, Freq change**/
-+ mcr p14, 0, r2, c6, c0, 0
-+
-+ /* Setup vectors */
-+ ldr r0, =TEXT_BASE
-+ ldr r1, =TEXT_BASE+0x40
-+ ldr r2, =0x0
-+1:
-+ ldr r3, [r0]
-+ str r3, [r2]
-+ add r0, r0, #4
-+ add r2, r2, #4
-+ cmp r0, r1
-+ bne 1b
-+
-+ ldr r0, =0x0
-+ ldr r1, [r0, #4]
-+ str r1, [r0]
-+
-+ mov pc, lr
-diff -Nur u-boot-2006-04-18-1106/board/akita/nand.c u-boot-2006-04-18-1106-new/board/akita/nand.c
---- u-boot-2006-04-18-1106/board/akita/nand.c 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2006-04-18-1106-new/board/akita/nand.c 2006-07-05 11:19:44.000000000 +0000
-@@ -0,0 +1,169 @@
-+/*
-+ * board/akita/nand.c
-+ *
-+ * NAND driver for the Sharp Zaurus SL-Cxx00.
-+ *
-+ * (C) Copyright 2006 Alexander Chukov <sash@pdaXrom.org>
-+ *
-+ * portions from mtd nand driver:
-+ *
-+ * drivers/mtd/nand/sharpsl.c
-+ *
-+ * Copyright (C) 2004 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>
-+
-+
-+#if (CONFIG_COMMANDS & CFG_CMD_NAND)
-+
-+#include <nand.h>
-+#include <linux/mtd/nand_ecc.h>
-+
-+static int sharpsl_io_base = CFG_NAND_BASE;
-+
-+/* register offset */
-+#define ECCLPLB sharpsl_io_base+0x00 /* line parity 7 - 0 bit */
-+#define ECCLPUB sharpsl_io_base+0x04 /* line parity 15 - 8 bit */
-+#define ECCCP sharpsl_io_base+0x08 /* column parity 5 - 0 bit */
-+#define ECCCNTR sharpsl_io_base+0x0C /* ECC byte counter */
-+#define ECCCLRR sharpsl_io_base+0x10 /* cleare ECC */
-+#define FLASHIO sharpsl_io_base+0x14 /* Flash I/O */
-+#define FLASHCTL sharpsl_io_base+0x18 /* Flash Control */
-+
-+/* Flash control bit */
-+#define FLRYBY (1 << 5)
-+#define FLCE1 (1 << 4)
-+#define FLWP (1 << 3)
-+#define FLALE (1 << 2)
-+#define FLCLE (1 << 1)
-+#define FLCE0 (1 << 0)
-+
-+#define readb(address) *((volatile unsigned char *)(address))
-+#define writeb(v, address) *((volatile unsigned char *)(address))=v
-+
-+/*
-+ * hardware specific access to control-lines
-+ */
-+static void
-+sharpsl_nand_hwcontrol(struct mtd_info* mtd, int cmd)
-+{
-+ switch (cmd) {
-+ case NAND_CTL_SETCLE:
-+ writeb(readb(FLASHCTL) | FLCLE, FLASHCTL);
-+ break;
-+ case NAND_CTL_CLRCLE:
-+ writeb(readb(FLASHCTL) & ~FLCLE, FLASHCTL);
-+ break;
-+
-+ case NAND_CTL_SETALE:
-+ writeb(readb(FLASHCTL) | FLALE, FLASHCTL);
-+ break;
-+ case NAND_CTL_CLRALE:
-+ writeb(readb(FLASHCTL) & ~FLALE, FLASHCTL);
-+ break;
-+
-+ case NAND_CTL_SETNCE:
-+ writeb(readb(FLASHCTL) & ~(FLCE0|FLCE1), FLASHCTL);
-+ break;
-+ case NAND_CTL_CLRNCE:
-+ writeb(readb(FLASHCTL) | (FLCE0|FLCE1), FLASHCTL);
-+ break;
-+ }
-+}
-+
-+static int