diff -Naurb u-boot-2004-10-20/cpu/nios2/Makefile u-boot-work/cpu/nios2/Makefile
--- u-boot-2004-10-20/cpu/nios2/Makefile	2004-10-10 17:27:33.000000000 -0400
+++ u-boot-work/cpu/nios2/Makefile	2004-10-11 21:38:41.000000000 -0400
@@ -27,7 +27,7 @@
 
 START	= start.o
 AOBJS	= exceptions.o
-OBJS	= cpu.o interrupts.o serial.o traps.o
+OBJS	= cpu.o interrupts.o serial.o sysid.o traps.o
 
 all:	.depend $(START) $(LIB)
 
diff -Naurb u-boot-2004-10-20/cpu/nios2/cpu.c u-boot-work/cpu/nios2/cpu.c
--- u-boot-2004-10-20/cpu/nios2/cpu.c	2004-10-10 17:27:33.000000000 -0400
+++ u-boot-work/cpu/nios2/cpu.c	2004-10-11 21:40:55.000000000 -0400
@@ -26,19 +26,7 @@
 #include <nios2-io.h>
 
 #if defined (CFG_NIOS_SYSID_BASE)
-#include <linux/time.h>
-static void check_sysid (void)
-{
-	struct nios_sysid_t *sysid =
-		(struct nios_sysid_t *)CACHE_BYPASS(CFG_NIOS_SYSID_BASE);
-	struct tm t;
-	char asc[32];
-
-	localtime_r ((time_t *)&sysid->timestamp, &t);
-	asctime_r (&t, asc);
-	printf ("SYSID : %08x, %s", sysid->id, asc);
-
-}
+extern void display_sysid (void);
 #endif /* CFG_NIOS_SYSID_BASE */
 
 int checkcpu (void)
@@ -47,7 +35,7 @@
 #if !defined(CFG_NIOS_SYSID_BASE)
 	printf ("SYSID : <unknown>\n");
 #else
-	check_sysid ();
+	display_sysid ();
 #endif
 	return (0);
 }
diff -Naurb u-boot-2004-10-20/cpu/nios2/start.S u-boot-work/cpu/nios2/start.S
--- u-boot-2004-10-20/cpu/nios2/start.S	2004-10-10 17:27:33.000000000 -0400
+++ u-boot-work/cpu/nios2/start.S	2004-10-20 10:50:47.000000000 -0400
@@ -39,14 +39,24 @@
 	 * just be invalidating the cache a second time. If cache
 	 * is not implemented initi behaves as nop.
 	 */
-	movhi	r4, %hi(CFG_ICACHELINE_SIZE)
-	ori	r4, r4, %lo(CFG_ICACHELINE_SIZE)
+	ori	r4, r0, %lo(CFG_ICACHELINE_SIZE)
 	movhi	r5, %hi(CFG_ICACHE_SIZE)
 	ori	r5, r5, %lo(CFG_ICACHE_SIZE)
 	mov	r6, r0
 0:	initi	r6
 	add	r6, r6, r4
 	bltu	r6, r5, 0b
+	br	_except_end	/* Skip the tramp */
+	
+	/* EXCEPTION TRAMPOLINE -- the following gets copied
+	 * to the exception address (below), but is otherwise at the
+	 * default exception vector offset (0x0020).
+	 */
+_except_start:
+	movhi	et, %hi(_exception)
+	ori	et, et, %lo(_exception)
+	jmp	et
+_except_end:
 
 	/* INTERRUPTS -- for now, all interrupts masked and globally
 	 * disabled.
@@ -117,7 +127,9 @@
 _reloc:
 
 	/* COPY EXCEPTION TRAMPOLINE -- copy the tramp to the
-	 * exception address.
+	 * exception address. Define CONFIG_ROM_STUBS to prevent
+	 * the copy (e.g. exception in flash or in other
+	 * softare/firmware component).
 	 */
 #if !defined(CONFIG_ROM_STUBS)
 	movhi	r4, %hi(_except_start)
@@ -126,12 +138,14 @@
 	ori	r5, r5, %lo(_except_end)
 	movhi	r6, %hi(CFG_EXCEPTION_ADDR)
 	ori	r6, r6, %lo(CFG_EXCEPTION_ADDR)
+	beq	r4, r6, 7f	/* Skip if at proper addr */
 
 6:	ldwio	r7, 0(r4)
 	stwio	r7, 0(r6)
 	addi	r4, r4, 4
 	addi	r6, r6, 4
 	bne	r4, r5, 6b
+7:
 #endif
 
 	/* STACK INIT -- zero top two words for call back chain.
@@ -155,15 +169,6 @@
 	 */
 	br	_start
 
-	/* EXCEPTION TRAMPOLINE -- the following gets copied
-	 * to the exception address.
-	 */
-_except_start:
-	movhi	et, %hi(_exception)
-	ori	et, et, %lo(_exception)
-	jmp	et
-_except_end:
-
 
 /*
  * dly_clks -- Nios2 (like Nios1) doesn't have a timebase in
diff -Naurb u-boot-2004-10-20/cpu/nios2/sysid.c u-boot-work/cpu/nios2/sysid.c
--- u-boot-2004-10-20/cpu/nios2/sysid.c	1969-12-31 19:00:00.000000000 -0500
+++ u-boot-work/cpu/nios2/sysid.c	2004-10-11 21:45:42.000000000 -0400
@@ -0,0 +1,57 @@
+/*
+ * (C) Copyright 2004, Psyent Corporation <www.psyent.com>
+ * Scott McNutt <smcnutt@psyent.com>
+ *
+ * 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 defined (CFG_NIOS_SYSID_BASE)
+
+#include <command.h>
+#include <nios2.h>
+#include <nios2-io.h>
+#include <linux/time.h>
+
+void display_sysid (void)
+{
+	struct nios_sysid_t *sysid =
+		(struct nios_sysid_t *)CACHE_BYPASS(CFG_NIOS_SYSID_BASE);
+	struct tm t;
+	char asc[32];
+
+	localtime_r ((time_t *)&sysid->timestamp, &t);
+	asctime_r (&t, asc);
+	printf ("SYSID : %08x, %s", sysid->id, asc);
+
+}
+
+int do_sysid (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	display_sysid ();
+	return (0);
+}
+
+U_BOOT_CMD(
+	sysid,	1,	1,	do_sysid,
+	"sysid   - display Nios-II system id\n\n",
+	"\n    - display Nios-II system id\n"
+);
+#endif /* CFG_NIOS_SYSID_BASE */
diff -Naurb u-boot-2004-10-20/include/asm-nios2/io.h u-boot-work/include/asm-nios2/io.h
--- u-boot-2004-10-20/include/asm-nios2/io.h	2004-10-10 17:27:34.000000000 -0400
+++ u-boot-work/include/asm-nios2/io.h	2004-10-18 23:57:39.000000000 -0400
@@ -29,8 +29,61 @@
 extern unsigned char inb (unsigned char *port);
 extern unsigned short inw (unsigned short *port);
 extern unsigned inl (unsigned port);
-extern void outb (unsigned char val, unsigned char *port);
-extern void outw (unsigned short val, unsigned short *port);
-extern void outl (unsigned val, unsigned port);
+
+#define readb(addr)\
+	({unsigned char val;\
+	 asm volatile( "ldbio %0, 0(%1)" :"=r"(val) : "r" (addr)); val;})
+#define readw(addr)\
+	({unsigned short val;\
+	 asm volatile( "ldhio %0, 0(%1)" :"=r"(val) : "r" (addr)); val;})
+#define readl(addr)\
+	({unsigned long val;\
+	 asm volatile( "ldwio %0, 0(%1)" :"=r"(val) : "r" (addr)); val;})
+#define writeb(addr,val)\
+	asm volatile ("stbio %0, 0(%1)" : : "r" (addr), "r" (val))
+#define writew(addr,val)\
+	asm volatile ("sthio %0, 0(%1)" : : "r" (addr), "r" (val))
+#define writel(addr,val)\
+	asm volatile ("stwio %0, 0(%1)" : : "r" (addr), "r" (val))
+
+#define inb(addr)	readb(addr)
+#define inw(addr)	readw(addr)
+#define inl(addr)	readl(addr)
+#define outb(addr,val)	writeb(addr,val)
+#define outw(addr,val)	writew(addr,val)
+#define outl(addr,val)	writel(addr,val)
+	
+static inline void insb (unsigned long port, void *dst, unsigned long count)
+{
+	unsigned char *p = dst;
+	while (count--) *p++ = inb (port);
+}
+static inline void insw (unsigned long port, void *dst, unsigned long count)
+{
+	unsigned short *p = dst;
+	while (count--) *p++ = inw (port);
+}
+static inline void insl (unsigned long port, void *dst, unsigned long count)
+{
+	unsigned long *p = dst;
+	while (count--) *p++ = inl (port);
+}
+
+static inline void outsb (unsigned long port, const void *src, unsigned long count)
+{
+	const unsigned char *p = src;
+	while (count--) outb (*p++, port);
+}
+
+static inline void outsw (unsigned long port, const void *src, unsigned long count)
+{
+	const unsigned short *p = src;
+	while (count--) outw (*p++, port);
+}
+static inline void outsl (unsigned long port, const void *src, unsigned long count)
+{
+	const unsigned long *p = src;
+	while (count--) outl (*p++, port);
+}
 
 #endif /* __ASM_NIOS2_IO_H_ */
diff -Naurb u-boot-2004-10-20/lib_nios2/nios_linux.c u-boot-work/lib_nios2/nios_linux.c
--- u-boot-2004-10-20/lib_nios2/nios_linux.c	2004-10-10 17:27:35.000000000 -0400
+++ u-boot-work/lib_nios2/nios_linux.c	2004-10-20 10:29:35.000000000 -0400
@@ -23,10 +23,18 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/byteorder.h>
+
+extern image_header_t header;	/* common/cmd_bootm.c */
 
-/* TODO
- */
 void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 		ulong addr, ulong *len_ptr, int   verify)
 {
+	image_header_t *hdr = &header;
+	void (*kernel)(void) = (void (*)(void))ntohl (hdr->ih_ep);
+	
+	/* For now we assume the Microtronix linux ... which only
+	 * needs to be called ;-)
+	 */
+	kernel ();
 }