* Patch by Stephan Linz, 09 Mar 2004

  - Add support for the SSV ADNP/ESC1 (Nios Softcore)

* Patch by George G. Davis, 9 Mar 2004:
  fix recent build failure for SA1100 target

* Patch by Travis Sawyer, 09 Mar 2004:
  Support native interrupt mode for the IBM440GX.
  Previously it was running in 440GP compatibility mode.

4 files changed, 573 insertions, 0 deletions

diff --git a/board/ssv/common/cmd_sled.c b/board/ssv/common/cmd_sled.c
new file mode 100644
index 0000000000..6ca054c302
--- /dev/null
+++ b/board/ssv/common/cmd_sled.c
@@ -0,0 +1,162 @@
+/*
+ * (C) Copyright 2004, Li-Pro.Net <www.li-pro.net>
+ * Stephan Linz <linz@li-pro.net>
+ *
+ * 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 <status_led.h>
+
+#if	defined(CONFIG_STATUS_LED)
+
+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * !!!!!       Q u i c k   &   D i r t y   H a c k       !!!!!
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * !!!!!                                                 !!!!!
+ * !!!!! Next type definition was coming from original   !!!!!
+ * !!!!! status LED driver drivers/status_led.c and      !!!!!
+ * !!!!! should exported for using here.                 !!!!!
+ * !!!!!                                                 !!!!!
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
+
+typedef struct {
+        led_id_t mask;
+        int state;
+        int period;
+        int cnt;
+} led_dev_t;
+
+extern led_dev_t led_dev[];
+
+#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+int do_sled (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+{
+	int led_id = 0;
+
+	if (argc > 1) {
+#ifdef	STATUS_LED_BOOT
+		if (!strcmp (argv[1], "boot")) {
+			led_id = STATUS_LED_BOOT + 1;
+		}
+#endif
+#ifdef	STATUS_LED_RED
+		if (!strcmp (argv[1], "red")) {
+			led_id = STATUS_LED_RED + 1;
+		}
+#endif
+#ifdef	STATUS_LED_YELLOW
+		if (!strcmp (argv[1], "yellow")) {
+			led_id = STATUS_LED_YELLOW + 1;
+		}
+#endif
+#ifdef	STATUS_LED_GREEN
+		if (!strcmp (argv[1], "green")) {
+			led_id = STATUS_LED_GREEN + 1;
+		}
+#endif
+	}
+
+	switch (argc) {
+	case 1:
+#if	(STATUS_LED_BITS > 3)
+		for (; led_id < 4; led_id++)
+#elif	(STATUS_LED_BITS > 2)
+		for (; led_id < 3; led_id++)
+#elif	(STATUS_LED_BITS > 1)
+		for (; led_id < 2; led_id++)
+#elif	(STATUS_LED_BITS > 0)
+		for (; led_id < 1; led_id++)
+#else
+#error "*** STATUS_LED_BITS not correct defined ***"
+#endif
+		{
+			printf ("Status LED '%s' is %s\n",
+				led_id == STATUS_LED_BOOT ? "boot"
+				: led_id == STATUS_LED_RED ? "red"
+				: led_id == STATUS_LED_YELLOW ? "yellow"
+				: led_id ==
+				STATUS_LED_GREEN ? "green" : "unknown",
+				led_dev[led_id].state ==
+				STATUS_LED_ON ? "on" : led_dev[led_id].
+				state ==
+				STATUS_LED_OFF ? "off" : led_dev[led_id].
+				state ==
+				STATUS_LED_BLINKING ? "blinking" : "unknown");
+		}
+		return 0;
+	case 2:
+		if (led_id) {
+			printf ("Status LED '%s' is %s\n", argv[1],
+				led_dev[led_id - 1].state ==
+				STATUS_LED_ON ? "on" : led_dev[led_id -
+							       1].state ==
+				STATUS_LED_OFF ? "off" : led_dev[led_id -
+								 1].state ==
+				STATUS_LED_BLINKING ? "blinking" : "unknown");
+			return 0;
+		} else
+			break;
+	case 3:
+		if (led_id) {
+			if (!strcmp (argv[2], "on")) {
+				status_led_set (led_id - 1, STATUS_LED_ON);
+				return 0;
+			} else if (!strcmp (argv[2], "off")) {
+				status_led_set (led_id - 1, STATUS_LED_OFF);
+				return 0;
+			} else if (!strcmp (argv[2], "blink")) {
+				status_led_set (led_id - 1,
+						STATUS_LED_BLINKING);
+				return 0;
+			} else
+				break;
+		} else
+			break;
+	default:
+		break;
+	}
+	printf ("Usage:\n%s\n", cmdtp->usage);
+	return 1;
+}
+
+#ifdef	STATUS_LED_BOOT
+#ifdef	STATUS_LED_RED
+#ifdef	STATUS_LED_YELLOW
+#ifdef	STATUS_LED_GREEN
+#define	__NAME_STR		"    - name: boot|red|yellow|green\n"
+#else
+#define	__NAME_STR		"    - name: boot|red|yellow\n"
+#endif
+#else
+#define	__NAME_STR		"    - name: boot|red\n"
+#endif
+#else
+#define	__NAME_STR		"    - name: boot\n"
+#endif
+#else
+#define	__NAME_STR		"    - name: (no such defined)\n"
+#endif
+
+U_BOOT_CMD (sled, 3, 0, do_sled,
+	    "sled    - check and set status led\n",
+	    "sled [name [state]]\n" __NAME_STR "    - state: on|off|blink\n");
+#endif /* CFG_CMD_BSP */
+#endif	/* CONFIG_STATUS_LED */
diff --git a/board/ssv/common/flash.c b/board/ssv/common/flash.c
new file mode 100644
index 0000000000..70cab7fa20
--- /dev/null
+++ b/board/ssv/common/flash.c
@@ -0,0 +1,207 @@
+/*
+ * (C) Copyright 2000-2004
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * (C) Copyright 2004, Li-Pro.Net <www.li-pro.net>
+ * Stephan Linz <linz@li-pro.net>
+ *
+ * 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 <watchdog.h>
+#include <nios.h>
+
+flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
+
+/*--------------------------------------------------------------------*/
+void flash_print_info (flash_info_t * info)
+{
+	int i, k;
+	unsigned long size;
+	int erased;
+	volatile unsigned char *flash;
+
+	printf ("  Size: %ld KB in %d Sectors\n",
+		info->size >> 10, info->sector_count);
+	printf ("  Sector Start Addresses:");
+	for (i = 0; i < info->sector_count; ++i) {
+
+		/* Check if whole sector is erased */
+		if (i != (info->sector_count - 1))
+			size = info->start[i + 1] - info->start[i];
+		else
+			size = info->start[0] + info->size - info->start[i];
+		erased = 1;
+		flash = (volatile unsigned char *) info->start[i];
+		for (k = 0; k < size; k++) {
+			if (*flash++ != 0xff) {
+				erased = 0;
+				break;
+			}
+		}
+
+		/* Print the info */
+		if ((i % 5) == 0)
+			printf ("\n   ");
+		printf (" %08lX%s%s", info->start[i], erased ? " E" : "  ",
+			info->protect[i] ? "RO " : "   ");
+	}
+	printf ("\n");
+}
+
+/*-------------------------------------------------------------------*/
+
+
+int flash_erase (flash_info_t * info, int s_first, int s_last)
+{
+	volatile CFG_FLASH_WORD_SIZE *addr = (CFG_FLASH_WORD_SIZE *) (info->start[0]);
+	volatile CFG_FLASH_WORD_SIZE *addr2;
+	int prot, sect, wait;
+	unsigned oldpri;
+	ulong start;
+
+	/* Some sanity checking */
+	if ((s_first < 0) || (s_first > s_last)) {
+		printf ("- no sectors to erase\n");
+		return 1;
+	}
+
+	prot = 0;
+	for (sect = s_first; sect <= s_last; ++sect) {
+		if (info->protect[sect]) {
+			prot++;
+		}
+	}
+	if (prot) {
+		printf ("- Warning: %d protected sectors will not be erased!\n",
+			prot);
+	} else {
+		printf ("\n");
+	}
+
+#ifdef DEBUG
+	for (sect = s_first; sect <= s_last; sect++) {
+		printf("- Erase: Sect: %i @ 0x%08x\n", sect,  info->start[sect]);
+	}
+#endif
+
+	/* NOTE: disabling interrupts on Nios can be very bad since it
+	 * also disables the LO_LIMIT exception. It's better here to
+	 * set the interrupt priority to 3 & restore it when we're done.
+	 */
+	oldpri = ipri (3);
+
+	/* It's ok to erase multiple sectors provided we don't delay more
+	 * than 50 usec between cmds ... at which point the erase time-out
+	 * occurs. So don't go and put printf() calls in the loop ... it
+	 * won't be very helpful ;-)
+	 */
+	for (sect = s_first; sect <= s_last; sect++) {
+		if (info->protect[sect] == 0) {	/* not protected */
+			addr2 = (CFG_FLASH_WORD_SIZE *) (info->start[sect]);
+			*addr = 0xf0;
+			*(addr+0xAAA/2) = 0xaa;
+			*(addr+0x554/2) = 0x55;
+			*(addr+0xAAA/2) = 0x80;
+			*(addr+0xAAA/2) = 0xaa;
+			*(addr+0x554/2) = 0x55;
+			*addr2 = 0x30;
+			/* Now just wait for 0xffff & provide some user
+			 * feedback while we wait. Here we have to grant
+			 * timer interrupts. Otherwise get_timer() can't
+			 * work right. */
+			ipri(oldpri);
+			start = get_timer (0);
+			while (*addr2 != 0xffff) {
+				for (wait = 8; wait; wait--) {
+					udelay (125 * 1000);
+				}
+				putc ('.');
+				if (get_timer (start) > CFG_FLASH_ERASE_TOUT) {
+					printf ("timeout\n");
+					return 1;
+				}
+			}
+			oldpri = ipri (3); /* disallow non important irqs again */
+		}
+	}
+
+	printf ("\n");
+	*addr = 0xf0;
+
+	/* Restore interrupt priority */
+	ipri (oldpri);
+
+	return 0;
+}
+
+/*-----------------------------------------------------------------------
+ * Copy memory to flash, returns:
+ * 0 - OK
+ * 1 - write timeout
+ * 2 - Flash not erased
+ */
+
+int write_buff (flash_info_t * info, uchar * srcbuffer, ulong addr, ulong cnt)
+{
+
+	volatile CFG_FLASH_WORD_SIZE *cmd = (vu_short *) info->start[0];
+	volatile CFG_FLASH_WORD_SIZE *dst = (vu_short *) addr;
+	CFG_FLASH_WORD_SIZE *src = (void *) srcbuffer;
+	CFG_FLASH_WORD_SIZE b;
+	unsigned oldpri;
+	ulong start;
+
+	cnt /= sizeof(CFG_FLASH_WORD_SIZE);
+	while (cnt) {
+		/* Check for sufficient erase */
+		b = *src;
+		if ((*dst & b) != b) {
+			printf ("%02x : %02x\n", *dst, b);
+			return (2);
+		}
+
+		/* Disable interrupts other than window underflow
+		 * (interrupt priority 2)
+		 */
+		oldpri = ipri (3);
+		*(cmd+0xAAA/2) = 0xaa;
+		*(cmd+0x554/2) = 0x55;
+		*(cmd+0xAAA/2) = 0xa0;
+		ipri (oldpri);
+		*dst = b;
+
+		/* Verify write */
+		start = get_timer (0);
+		while (*dst != b) {
+			if (get_timer (start) > CFG_FLASH_WRITE_TOUT) {
+				*cmd = 0xf0;
+				return 1;
+			}
+		}
+		dst++;
+		src++;
+		cnt--;
+	}
+
+	*cmd = 0xf0;
+	return (0);
+}
diff --git a/board/ssv/common/post.c b/board/ssv/common/post.c
new file mode 100644
index 0000000000..a5f29c1a30
--- /dev/null
+++ b/board/ssv/common/post.c
@@ -0,0 +1,44 @@
+/*
+ * (C) Copyright 2004, Li-Pro.Net <www.li-pro.net>
+ * Stephan Linz <linz@li-pro.net>
+ *
+ * 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(CONFIG_POST) || defined(CONFIG_LOGBUFFER)
+
+#if !defined(CFG_NIOS_POST_WORD_ADDR)
+#error "*** CFG_NIOS_POST_WORD_ADDR not defined ***"
+#endif
+
+void post_word_store (ulong a)
+{
+	volatile void *save_addr = (void *)(CFG_NIOS_POST_WORD_ADDR);
+	*(volatile ulong *) save_addr = a;
+}
+
+ulong post_word_load (void)
+{
+	volatile void *save_addr = (void *)(CFG_NIOS_POST_WORD_ADDR);
+	return *(volatile ulong *) save_addr;
+}
+
+#endif	/* CONFIG_POST || CONFIG_LOGBUFFER*/
diff --git a/board/ssv/common/wd_pio.c b/board/ssv/common/wd_pio.c
new file mode 100644
index 0000000000..3215ac96aa
--- /dev/null
+++ b/board/ssv/common/wd_pio.c
@@ -0,0 +1,160 @@
+/*
+ * (C) Copyright 2004, Li-Pro.Net <www.li-pro.net>
+ * Stephan Linz <linz@li-pro.net>
+ *
+ * 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 <nios.h>
+#include <nios-io.h>
+
+#if	defined(CONFIG_HW_WATCHDOG)
+
+#if !defined(CONFIG_HW_WDENA_BASE)
+#error "*** CONFIG_HW_WDENA_BASE not defined ***"
+#if !defined(CONFIG_HW_WDENA_BIT)
+#error "*** CONFIG_HW_WDENA_BIT not defined ***"
+#endif
+#endif
+
+#if !defined(CONFIG_HW_WDTOG_BASE)
+#error "*** CONFIG_HW_WDTOG_BASE not defined ***"
+#if !defined(CONFIG_HW_WDTOG_BIT)
+#error "*** CONFIG_HW_WDTOG_BIT not defined ***"
+#endif
+#endif
+
+#ifdef	CONFIG_HW_WDPORT_WRONLY	/* emulate read access */
+static unsigned __wd_ena_pio_portval = 0;
+#endif
+
+#define	WD_PIO_INIT_DONE(V)	((V) & (1 << CONFIG_HW_WDENA_BIT))
+
+void ssv_wd_pio_init(void)
+{
+	nios_pio_t *ena_piop	 = (nios_pio_t*)CONFIG_HW_WDENA_BASE;
+	nios_pio_t *trg_piop	 = (nios_pio_t*)CONFIG_HW_WDTOG_BASE;
+
+	trg_piop->data		&= ~(1 << CONFIG_HW_WDTOG_BIT);
+
+#ifdef	CONFIG_HW_WDPORT_WRONLY	/* emulate read access */
+
+	__wd_ena_pio_portval	|= (1 << CONFIG_HW_WDENA_BIT);
+	ena_piop->data		 = __wd_ena_pio_portval;
+
+#else	/* !CONFIG_HW_WDPORT_WRONLY */
+
+	trg_piop->direction	|= (1 << CONFIG_HW_WDTOG_BIT);
+
+	ena_piop->data		|= (1 << CONFIG_HW_WDENA_BIT);
+	ena_piop->direction	|= (1 << CONFIG_HW_WDENA_BIT);
+
+#endif	/* CONFIG_HW_WDPORT_WRONLY */
+}
+
+void ssv_wd_pio_done(void)
+{
+	nios_pio_t *piop	 = (nios_pio_t*)CONFIG_HW_WDENA_BASE;
+
+#ifdef	CONFIG_HW_WDPORT_WRONLY	/* emulate read access */
+
+	__wd_ena_pio_portval	&= ~(1 << CONFIG_HW_WDENA_BIT);
+	piop->data		 = __wd_ena_pio_portval;
+
+#else	/* !CONFIG_HW_WDPORT_WRONLY */
+
+	piop->data		&= ~(1 << CONFIG_HW_WDENA_BIT);
+
+#endif	/* CONFIG_HW_WDPORT_WRONLY */
+}
+
+void ssv_wd_pio_reset(void)
+{
+	nios_pio_t *trg_piop	 = (nios_pio_t*)CONFIG_HW_WDTOG_BASE;
+
+#ifdef	CONFIG_HW_WDPORT_WRONLY
+	if (WD_PIO_INIT_DONE(__wd_ena_pio_portval))
+#else
+	nios_pio_t *ena_piop	 = (nios_pio_t*)CONFIG_HW_WDENA_BASE;
+
+	if (WD_PIO_INIT_DONE(ena_piop->data))
+#endif
+	{
+		trg_piop->data	|=  (1 << CONFIG_HW_WDTOG_BIT);
+		trg_piop->data	&= ~(1 << CONFIG_HW_WDTOG_BIT);
+	}
+}
+
+void hw_watchdog_reset(void)
+{
+	int re_enable = disable_interrupts ();
+
+	ssv_wd_pio_reset();
+	if (re_enable)
+		enable_interrupts ();
+}
+
+#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	nios_pio_t *ena_piop	 = (nios_pio_t*)CONFIG_HW_WDENA_BASE;
+
+	switch (argc)
+	{
+	case 1:
+		printf ("Watchdog timer status is %s\n",
+#ifdef	CONFIG_HW_WDPORT_WRONLY
+				WD_PIO_INIT_DONE(__wd_ena_pio_portval)
+#else
+				WD_PIO_INIT_DONE(ena_piop->data)
+#endif
+				? "on" : "off");
+		return 0;
+	case 2:
+		if (!strcmp(argv[1],"on"))
+		{
+			ssv_wd_pio_init();
+			printf("Watchdog timer now is on\n");
+			return 0;
+		}
+		else if (!strcmp(argv[1],"off"))
+		{
+			ssv_wd_pio_done();
+			printf("Watchdog timer now is off\n");
+			return 0;
+		}
+		break;
+	default:
+		break;
+	}
+	printf ("Usage:\n%s\n", cmdtp->usage);
+	return 1;
+}
+
+U_BOOT_CMD(
+	wd,	2,	1,	do_wd,
+	"wd      - check and set watchdog\n",
+	"on   - switch watchDog on\n"
+	"wd off  - switch watchdog off\n"
+	"wd      - print current status\n"
+);
+#endif	/* CFG_CMD_BSP */
+#endif	/* CONFIG_HW_WATCHDOG */