[Fwd: Re: RESEND:[RFC] Pico E12 (Xilinx V4) patches to 2.6.15]

diff --git a/README.pico b/README.pico
new file mode 120000
index 0000000..3daad5a
--- /dev/null
+++ b/README.pico

@@ -0,0 +1 @@
+pico/README.pico

\ No newline at end of file

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index cc3f64c..7c4318a 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig

@@ -53,7 +53,7 @@ menu "Processor"

 choice
 	prompt "Processor Type"
-	default 6xx
+	default 4xx

diff --git a/arch/ppc/boot/common/misc-common.c

b/arch/ppc/boot/common/misc-common.c
index e79e6b3..a50762a 100644

--- a/arch/ppc/boot/common/misc-common.c
+++ b/arch/ppc/boot/common/misc-common.c

@@ -271,6 +284,15 @@ void gunzip(void *dst, int dstlen, unsig
 	*lenp = s.next_out - (unsigned char *) dst;
 	zlib_inflateEnd(&s);
 }
+#if 0
+void
+puthexb(unsigned char val)
+{
+	char digits[] = "0123456789abcdef" ;
+	putc(digits[(val/16) & 0x0F]);
+	putc(digits[val & 0x0F]);
+}
+#endif

 void
 puthex(unsigned long val)

@@ -488,8 +510,13 @@ _dump_buf_with_offset(unsigned char *p,
 			{
 				_printk("  ");
 			}
+#if defined(CONFIG_PICO_DEBUG)
+// more readable dump
+			 _printk(" ");
+#else
 			if ((i % 2) == 1) _printk(" ");
 			if ((i % 8) == 7) _printk(" ");
+#endif

diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
index f3e9c53..3094f1c 100644
--- a/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile

@@ -188,6 +188,7 @@ OBJCOPY_ARGS			:= -O elf32-powerpc
 boot-y				:= head.o relocate.o $(extra.o-y) $(misc-y)
 boot-$(CONFIG_REDWOOD_5)	+= embed_config.o
 boot-$(CONFIG_REDWOOD_6)	+= embed_config.o
+boot-$(CONFIG_PICO_E12)		+= embed_config.o
 boot-$(CONFIG_8xx)		+= embed_config.o
 boot-$(CONFIG_8260)		+= embed_config.o
 boot-$(CONFIG_BSEIP)		+= iic.o

@@ -202,6 +203,16 @@ boot-$(CONFIG_8260)		+= m8260_tty.o
 endif
 boot-$(CONFIG_SERIAL_MPC52xx_CONSOLE)	+= mpc52xx_tty.o
 boot-$(CONFIG_SERIAL_MPSC_CONSOLE)	+= mv64x60_tty.o
+boot-$(CONFIG_SERIAL_UARTLITE_CONSOLE)	+= uartlite_tty.o
+boot-$(CONFIG_SERIAL_KEYHOLE_CONSOLE)	+= keyhole_tty.o
+#ifdef CONFIG_XILINX_UARTLITE_CONSOLE
+#LIBS				+= $(TOPDIR)/drivers/char/xilinx_uartlite/xuartlite_l.o
+#endif
+# ifeq ($(CONFIG_XILINX_ML300),y)
+# CFLAGS_xuartlite_tty.o		+= -I$(TOPDIR)/drivers/char/xilinx_uartlite
+# EXTRA_CFLAGS			+= -I$(TOPDIR)/arch/ppc/platforms/xilinx_ocp \
+# 					-I$(TOPDIR)/drivers/i2c/xilinx_iic
+# endif

diff --git a/arch/ppc/boot/simple/head.S b/arch/ppc/boot/simple/head.S
index 5e4adc2..e432b64 100644
--- a/arch/ppc/boot/simple/head.S
+++ b/arch/ppc/boot/simple/head.S

@@ -46,6 +46,46 @@ start:
 #endif

 start_:
+#if defined(CONFIG_XILINX_ML300) || defined(CONFIG_PICO_E12) /* PPC

errata 213: only for Virtex-4 */
+	mfccr0	0
+	oris	0,0,0x50000000@h
+	mtccr0	0
+#endif

diff --git a/arch/ppc/boot/simple/keyhole_tty.c

b/arch/ppc/boot/simple/keyhole_tty.c
new file mode 100644
index 0000000..ab07ca8

--- /dev/null
+++ b/arch/ppc/boot/simple/keyhole_tty.c

@@ -0,0 +1,93 @@
+/*
+ * arch/ppc/boot/simple/keyhole_tty.c
+ *
+ * Bootloader version of the embedded Xilinx/KEYHOLE driver.
+ *
+ * Author: David H. Lynch Jr. <dhlii@dlasys.net>
+ *
+ * 2005 (c) DLA Systems  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <linux/config.h>
+#include <linux/serial_keyhole.h>
+
+static int MillisecTimeout=1000;
+void usleep(int t) {
+   int ii, waitTime=100;
+    while(t) {
+    	for (ii=0; ii < MillisecTimeout*1000/waitTime; ii++){};
+	t--;
+    }
+}

@@ -180,11 +192,16 @@ load_kernel(unsigned long load_addr, int
 #ifdef CONFIG_CMDLINE_BOOL
 	memcpy (cmd_line, compiled_string, sizeof(compiled_string));
 #else
+// INITRAMFS and initrd should be handled the same.
+#ifdef CONFIG_INITRAMFS_SOURCE
+	memcpy (cmd_line, ramroot_string, sizeof(ramroot_string));
+#else
 	if ( initrd_size )
 		memcpy (cmd_line, ramroot_string, sizeof(ramroot_string));
 	else
 		memcpy (cmd_line, netroot_string, sizeof(netroot_string));
 #endif
+#endif

diff --git a/arch/ppc/boot/simple/uartlite_tty.c b/arch/ppc/boot/simple/uartlite_tty.c

diff --git a/arch/ppc/kernel/head_4xx.S b/arch/ppc/kernel/head_4xx.S
index 10c261c..c08aa7f 100644
--- a/arch/ppc/kernel/head_4xx.S
+++ b/arch/ppc/kernel/head_4xx.S

@@ -75,13 +75,25 @@ _GLOBAL(_start)
  * ready to work.
  */
 turn_on_mmu:
+#if 0						// debuging code used to find the spurious E12 machine check

problem
+	khdbg(0x57002)
+
+#if defined(CONFIG_PICO_DEBUG) && 0
+	bl	pico_dbg
+#endif
+#endif
 	lis	r0,MSR_KERNEL@h
 	ori	r0,r0,MSR_KERNEL@l
 	mtspr	SPRN_SRR1,r0
-	lis	r0,start_here@h
+	lis	r0,start_here@h			// SPRN_SRR0 is where the rfi resumes execution
 	ori	r0,r0,start_here@l
 	mtspr	SPRN_SRR0,r0
 	SYNC
+// 	PPC405_ERR77_SYNC
+/* We now have the lower 16 Meg mapped into TLB entries, and the caches
+ * ready to work.
+ */
+

 	rfi				/* enables MMU */
 	b	.			/* prevent prefetch past rfi */

@@ -364,6 +376,9 @@ label:
 	b	.		/* prevent prefetch past rfi */

 2:
+	// khdbg(0x55001)
+	// khdbgr(r16)
+	

 	/* The bailout.  Restore registers to pre-exception conditions
 	 * and call the heavyweights to help us out.
 	 */

@@ -478,8 +493,11 @@ label:
 	mtspr	SPRN_SPRG7, r11
 	mtspr	SPRN_SPRG6, r12
 #endif
-	mfspr	r10, SPRN_DEAR		/* Get faulting address */

+	// khdbg(0x55000)
+	// khdbgr(r16)
+	mfspr	r10, SPRN_DEAR		/* Get faulting address */
+	// khdbgr(r10)

 	/* If we are faulting a kernel address, we have to use the
 	 * kernel page tables.
 	 */

@@ -521,6 +539,8 @@ label:
 	b	finish_tlb_load

 2:	/* Check for possible large-page pmd entry */
+	// khdbg(0x55002)
+	// khdbgr(r16)

diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
diff --git a/arch/ppc/platforms/4xx/Makefile b/arch/ppc/platforms/4xx/Makefile

diff --git a/arch/ppc/platforms/4xx/pico_e12.c b/arch/ppc/platforms/4xx/pico_e12.c

diff --git a/arch/ppc/platforms/4xx/pico_e12.h b/arch/ppc/platforms/4xx/pico_e12.h

diff --git a/arch/ppc/platforms/4xx/virtex-iv.c b/arch/ppc/platforms/4xx/virtex-iv.c
diff --git a/arch/ppc/platforms/4xx/virtex-iv.h b/arch/ppc/platforms/4xx/virtex-iv.h

diff --git a/arch/ppc/platforms/4xx/xparameters/xparameters_pico_e12.h b/arch/ppc/platforms/4xx/xparameters/xparameters_pico_e12.h

diff --git a/arch/ppc/syslib/keyhole.h b/arch/ppc/syslib/keyhole.h
new file mode 100644
index 0000000..4b7a374
--- /dev/null
+++ b/arch/ppc/syslib/keyhole.h

@@ -0,0 +1,17 @@
+/*
+ * arch/ppc/syslib/keyhole.h
+ *
+ * keyhole prototypes
+ *
+ * Matt Porter <mporter@kernel.crashing.org>

+ *
+ * 2004 (c) MontaVista Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+extern void keyhole_progress(char *, unsigned short);
+extern void keyhole_puts(char *);
+extern void keyhole_init(int, struct uart_port *);
+extern void keyhole_kgdb_map_scc(void);

diff --git a/arch/ppc/syslib/keyhole_dbg.c b/arch/ppc/syslib/keyhole_dbg.c
new file mode 100644
index 0000000..73dd275
--- /dev/null
+++ b/arch/ppc/syslib/keyhole_dbg.c

diff --git a/arch/ppc/syslib/ppc4xx_setup.c b/arch/ppc/syslib/ppc4xx_setup.c
index e83a83f..c601390 100644
--- a/arch/ppc/syslib/ppc4xx_setup.c
+++ b/arch/ppc/syslib/ppc4xx_setup.c

@@ -41,7 +41,15 @@
 #include <asm/pci-bridge.h>
 #include <asm/bootinfo.h>

+#if defined(CONFIG_SERIAL_8250)
 #include <syslib/gen550.h>
+#endif
+#if defined(CONFIG_SERIAL_KEYHOLE)
+#include <syslib/keyhole.h>
+#endif
+#if defined(CONFIG_SERIAL_UARTLITE)
+#include <syslib/uartlite.h>
+#endif

 /* Function Prototypes */
 extern void abort(void);

@@ -72,11 +80,18 @@ ppc4xx_setup_arch(void)
  *   This routine pretty-prints the platform's internal CPU clock
  *   frequencies into the buffer for usage in /proc/cpuinfo.
  */
+#if defined(CONFIG_PICO_DEBUG)
+#define DEBUG_PRINTK(fmt...)	_printk(fmt)
+#else
+#define DEBUG_PRINTK(fmt...)	do { } while (0)
+#endif
+#define _printk printk

diff --git a/config.x86 b/config.x86

diff --git a/cross b/cross
new file mode 120000
index 0000000..d11f058
--- /dev/null
+++ b/cross

@@ -0,0 +1 @@
+pico/cross

\ No newline at end of file

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 4aeae68..800f4c8 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile

@@ -119,3 +119,20 @@ $(obj)/defkeymap.c $(obj)/qtronixmap.c:
 	rm $@.tmp

 endif
+# mod-subdirs     +=	xilinx_gpio xilinx_ts xilinx_uartlite xilinx_spi
+# subdir-$(CONFIG_XILINX_GPIO) += xilinx_gpio
+# subdir-$(CONFIG_XILINX_TS) += xilinx_ts
+# subdir-$(CONFIG_XILINX_UARTLITE) += xilinx_uartlite
+# subdir-$(CONFIG_XILINX_SPI) += xilinx_spi
+# obj-$(CONFIG_XILINX_GPIO) += xilinx_gpio/xilinx_gpio.o
+# obj-$(CONFIG_XILINX_TS) += xilinx_ts/xilinx_ts.o
+# obj-$(CONFIG_XILINX_UARTLITE) += xilinx_uartlite/xilinx_uartlite.o

generic_serial.o
+# obj-$(CONFIG_XILINX_SPI) += xilinx_spi/xilinx_spi.o
+# ifeq ($(CONFIG_VIRTEX_II_PRO),y)
+#   ifeq ($(CONFIG_VT),y)
+#     ifeq ($(CONFIG_PC_KEYBOARD),y)
+#       subdir-$(CONFIG_VT) += xilinx_keyb
+#       obj-$(CONFIG_VT) += xilinx_keyb/xilinx_keyb.o
+#     endif
+#   endif
+# endif

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4cffd34..d559224 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile

@@ -206,4 +206,6 @@ obj-$(CONFIG_ETRAX_ETHERNET) += cris/
 obj-$(CONFIG_NETCONSOLE) += netconsole.o

 obj-$(CONFIG_FS_ENET) += fs_enet/
-
+#mod-subdirs     +=	xilinx_enet
+#subdir-$(CONFIG_XILINX_ENET) += xilinx_enet
+#obj-$(CONFIG_XILINX_ENET) += xilinx_enet/xilinx_enet.o

diff --git a/drivers/serial/printk.c b/drivers/serial/printk.c
new file mode 100644
index 0000000..5e87489
--- /dev/null
+++ b/drivers/serial/printk.c

@@ -0,0 +1,267 @@
+/*
+ * arch/ppc/kernel/printf.c
+ *
+ * early printk code code (almost) all platforms can use
+ *
+ * Author: David H. Lynch Jr. <dhlii@dlasys.net>
+ *
+ * Derived heavily from arch/ppc/boot/common/misc-common1.c
+ *
+ * 20050 (c) DLA Systems This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */

diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
diff --git a/drivers/serial/uartlite_early.c b/drivers/serial/uartlite_early.c

diff --git a/include/asm-ppc/reg_booke.h b/include/asm-ppc/reg_booke.h
index 00ad9c7..5221970 100644
--- a/include/asm-ppc/reg_booke.h
+++ b/include/asm-ppc/reg_booke.h

@@ -120,6 +120,11 @@ do {						\
 #elif defined(CONFIG_BOOKE)
 #define MSR_KERNEL	(MSR_ME|MSR_RI|MSR_CE)
 #endif
+#if defined (CONFIG_PICO_E12)
+// The E12 seems to generate spurious Machine Checks - disable them.
+#undef MSR_KERNEL
+#define MSR_KERNEL	(MSR_RI|MSR_IR|MSR_DR|MSR_CE)
+#endif

diff --git a/include/linux/serial_keyhole.h b/include/linux/serial_keyhole.h
diff --git a/include/linux/serial_uartlite.h b/include/linux/serial_uartlite.h