public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board
@ 2011-11-25 18:53 Marek Vasut
  2011-11-25 18:53 ` [U-Boot] [PATCH 2/4] PXA: Drop CRADLE board Marek Vasut
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Marek Vasut @ 2011-11-25 18:53 UTC (permalink / raw)
  To: u-boot

The board is unmaintained and maintainer doesn't respond.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Anatolij Gustschin <agust@denx.de>
---
 MAINTAINERS               |    4 -
 board/cerf250/Makefile    |   43 -----
 board/cerf250/cerf250.c   |   85 ---------
 board/cerf250/flash.c     |  429 ---------------------------------------------
 boards.cfg                |    1 -
 doc/README.scrapyard      |    1 +
 include/configs/cerf250.h |  229 ------------------------
 7 files changed, 1 insertions(+), 791 deletions(-)
 delete mode 100644 board/cerf250/Makefile
 delete mode 100644 board/cerf250/cerf250.c
 delete mode 100644 board/cerf250/flash.c
 delete mode 100644 include/configs/cerf250.h

diff --git a/MAINTAINERS b/MAINTAINERS
index 37bbb34..3835154 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -711,10 +711,6 @@ Sergey Kubushyn <ksi@koi8.net>
 	SONATA		ARM926EJS
 	SCHMOOGIE	ARM926EJS
 
-Prakash Kumar <prakash@embedx.com>
-
-	cerf250		xscale/pxa
-
 Vipin Kumar <vipin.kumar@st.com>
 
 	spear300	ARM926EJS (spear300 Soc)
diff --git a/board/cerf250/Makefile b/board/cerf250/Makefile
deleted file mode 100644
index cf4742e..0000000
--- a/board/cerf250/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd at 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	= $(obj)lib$(BOARD).o
-
-COBJS	:= cerf250.o flash.o
-
-SRCS	:= $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/cerf250/cerf250.c b/board/cerf250/cerf250.c
deleted file mode 100644
index 043afea..0000000
--- a/board/cerf250/cerf250.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * (C) Copyright 2002
- * Kyle Harris, Nexus Technologies, Inc. kharris at 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>
-#include <netdev.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* ------------------------------------------------------------------------- */
-
-
-/*
- * Miscelaneous platform dependent initialisations
- */
-
-int board_init (void)
-{
-	/* We have RAM, disable cache */
-	dcache_disable();
-	icache_disable();
-
-	/* arch number of cerf PXA Board */
-	gd->bd->bi_arch_number = MACH_TYPE_PXA_CERF;
-
-	/* adress of boot parameters */
-	gd->bd->bi_boot_params = 0xa0000100;
-
-	return 0;
-}
-
-int board_late_init(void)
-{
-	setenv("stdout", "serial");
-	setenv("stderr", "serial");
-	return 0;
-}
-
-extern void pxa_dram_init(void);
-int dram_init(void)
-{
-	pxa_dram_init();
-	gd->ram_size = PHYS_SDRAM_1_SIZE;
-	return 0;
-}
-
-void dram_init_banksize(void)
-{
-	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-}
-
-#ifdef CONFIG_CMD_NET
-int board_eth_init(bd_t *bis)
-{
-	int rc = 0;
-#ifdef CONFIG_SMC91111
-	rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
-#endif
-	return rc;
-}
-#endif
diff --git a/board/cerf250/flash.c b/board/cerf250/flash.c
deleted file mode 100644
index e1e7807..0000000
--- a/board/cerf250/flash.c
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * (C) Copyright 2001
- * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
- *
- * (C) Copyright 2001
- * Wolfgang Denk, DENX Software Engineering, wd at 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 <common.h>
-#include <linux/byteorder/swab.h>
-
-
-flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* info for FLASH chips    */
-
-/* Board support for 1 or 2 flash devices */
-#define FLASH_PORT_WIDTH32
-#undef FLASH_PORT_WIDTH16
-
-#ifdef FLASH_PORT_WIDTH16
-#define FLASH_PORT_WIDTH		ushort
-#define FLASH_PORT_WIDTHV		vu_short
-#define SWAP(x)               __swab16(x)
-#else
-#define FLASH_PORT_WIDTH		ulong
-#define FLASH_PORT_WIDTHV		vu_long
-#define SWAP(x)               __swab32(x)
-#endif
-
-#define FPW	   FLASH_PORT_WIDTH
-#define FPWV   FLASH_PORT_WIDTHV
-
-#define mb() __asm__ __volatile__ ("" : : : "memory")
-
-/*-----------------------------------------------------------------------
- * Functions
- */
-static ulong flash_get_size (FPW *addr, flash_info_t *info);
-static int write_data (flash_info_t *info, ulong dest, FPW data);
-static void flash_get_offsets (ulong base, flash_info_t *info);
-void inline spin_wheel (void);
-
-/*-----------------------------------------------------------------------
- */
-
-unsigned long flash_init (void)
-{
-	int i;
-	ulong size = 0;
-
-	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
-		switch (i) {
-		case 0:
-			flash_get_size ((FPW *) PHYS_FLASH_1, &flash_info[i]);
-			flash_get_offsets (PHYS_FLASH_1, &flash_info[i]);
-			break;
-		case 1:
-			flash_get_size ((FPW *) PHYS_FLASH_2, &flash_info[i]);
-			flash_get_offsets (PHYS_FLASH_2, &flash_info[i]);
-			break;
-		default:
-			panic ("configured too many flash banks!\n");
-			break;
-		}
-		size += flash_info[i].size;
-	}
-
-	/* Protect monitor and environment sectors
-	 */
-	flash_protect ( FLAG_PROTECT_SET,
-			CONFIG_SYS_FLASH_BASE,
-			CONFIG_SYS_FLASH_BASE + monitor_flash_len - 1,
-			&flash_info[0] );
-
-	flash_protect ( FLAG_PROTECT_SET,
-			CONFIG_ENV_ADDR,
-			CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );
-
-	return size;
-}
-
-/*-----------------------------------------------------------------------
- */
-static void flash_get_offsets (ulong base, flash_info_t *info)
-{
-	int i;
-
-	if (info->flash_id == FLASH_UNKNOWN) {
-		return;
-	}
-
-	if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
-		for (i = 0; i < info->sector_count; i++) {
-			info->start[i] = base + (i * PHYS_FLASH_SECT_SIZE);
-			info->protect[i] = 0;
-		}
-	}
-}
-
-/*-----------------------------------------------------------------------
- */
-void flash_print_info (flash_info_t *info)
-{
-	int i;
-
-	if (info->flash_id == FLASH_UNKNOWN) {
-		printf ("missing or unknown FLASH type\n");
-		return;
-	}
-
-	switch (info->flash_id & FLASH_VENDMASK) {
-	case FLASH_MAN_INTEL:
-		printf ("INTEL ");
-		break;
-	default:
-		printf ("Unknown Vendor ");
-		break;
-	}
-
-	switch (info->flash_id & FLASH_TYPEMASK) {
-	case FLASH_28F128J3A:
-		printf ("28F128J3A\n");
-		break;
-	default:
-		printf ("Unknown Chip Type\n");
-		break;
-	}
-
-	printf ("  Size: %ld MB in %d Sectors\n",
-			info->size >> 20, info->sector_count);
-
-	printf ("  Sector Start Addresses:");
-	for (i = 0; i < info->sector_count; ++i) {
-		if ((i % 5) == 0)
-			printf ("\n   ");
-		printf (" %08lX%s",
-			info->start[i],
-			info->protect[i] ? " (RO)" : "     ");
-	}
-	printf ("\n");
-	return;
-}
-
-/*
- * The following code cannot be run from FLASH!
- */
-static ulong flash_get_size (FPW *addr, flash_info_t *info)
-{
-	volatile FPW value;
-
-	/* Write auto select command: read Manufacturer ID */
-	addr[0x5555] = (FPW) 0x00AA00AA;
-	addr[0x2AAA] = (FPW) 0x00550055;
-	addr[0x5555] = (FPW) 0x00900090;
-
-	mb ();
-	value = addr[0];
-
-	switch (value) {
-
-	case (FPW) INTEL_MANUFACT:
-		info->flash_id = FLASH_MAN_INTEL;
-		break;
-
-	default:
-		info->flash_id = FLASH_UNKNOWN;
-		info->sector_count = 0;
-		info->size = 0;
-		addr[0] = (FPW) 0x00FF00FF;	/* restore read mode */
-		return (0);			/* no or unknown flash  */
-	}
-
-	mb ();
-	value = addr[1];			/* device ID        */
-
-	switch (value) {
-
-	case (FPW) INTEL_ID_28F128J3A:
-		info->flash_id += FLASH_28F128J3A;
-		info->sector_count = 128;
-		info->size = 0x02000000;
-		break;				/* => 16 MB     */
-
-	default:
-		info->flash_id = FLASH_UNKNOWN;
-		break;
-	}
-
-	if (info->sector_count > CONFIG_SYS_MAX_FLASH_SECT) {
-		printf ("** ERROR: sector count %d > max (%d) **\n",
-			info->sector_count, CONFIG_SYS_MAX_FLASH_SECT);
-		info->sector_count = CONFIG_SYS_MAX_FLASH_SECT;
-	}
-
-	addr[0] = (FPW) 0x00FF00FF;		/* restore read mode */
-
-	return (info->size);
-}
-
-
-/*-----------------------------------------------------------------------
- */
-
-int flash_erase (flash_info_t *info, int s_first, int s_last)
-{
-	int flag, prot, sect;
-	ulong type, start;
-	int rcode = 0;
-
-	if ((s_first < 0) || (s_first > s_last)) {
-		if (info->flash_id == FLASH_UNKNOWN) {
-			printf ("- missing\n");
-		} else {
-			printf ("- no sectors to erase\n");
-		}
-		return 1;
-	}
-
-	type = (info->flash_id & FLASH_VENDMASK);
-	if ((type != FLASH_MAN_INTEL)) {
-		printf ("Can't erase unknown flash type %08lx - aborted\n",
-			info->flash_id);
-		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");
-	}
-
-	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
-
-	/* Start erase on unprotected sectors */
-	for (sect = s_first; sect <= s_last; sect++) {
-		if (info->protect[sect] == 0) {	/* not protected */
-			FPWV *addr = (FPWV *) (info->start[sect]);
-			FPW status;
-
-			printf ("Erasing sector %2d ... ", sect);
-
-			/* arm simple, non interrupt dependent timer */
-			start = get_timer(0);
-
-			*addr = (FPW) 0x00500050;	/* clear status register */
-			*addr = (FPW) 0x00200020;	/* erase setup */
-			*addr = (FPW) 0x00D000D0;	/* erase confirm */
-
-			while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
-				if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
-					printf ("Timeout\n");
-					*addr = (FPW) 0x00B000B0;	/* suspend erase     */
-					*addr = (FPW) 0x00FF00FF;	/* reset to read mode */
-					rcode = 1;
-					break;
-				}
-			}
-
-			*addr = 0x00500050;	/* clear status register cmd.   */
-			*addr = 0x00FF00FF;	/* resest to read mode          */
-
-			printf (" done\n");
-		}
-	}
-	return rcode;
-}
-
-/*-----------------------------------------------------------------------
- * Copy memory to flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- * 4 - Flash not identified
- */
-
-int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
-{
-	ulong cp, wp;
-	FPW data;
-	int count, i, l, rc, port_width;
-
-	if (info->flash_id == FLASH_UNKNOWN) {
-		return 4;
-	}
-/* get lower word aligned address */
-#ifdef FLASH_PORT_WIDTH16
-	wp = (addr & ~1);
-	port_width = 2;
-#else
-	wp = (addr & ~3);
-	port_width = 4;
-#endif
-
-	/*
-	 * handle unaligned start bytes
-	 */
-	if ((l = addr - wp) != 0) {
-		data = 0;
-		for (i = 0, cp = wp; i < l; ++i, ++cp) {
-			data = (data << 8) | (*(uchar *) cp);
-		}
-		for (; i < port_width && cnt > 0; ++i) {
-			data = (data << 8) | *src++;
-			--cnt;
-			++cp;
-		}
-		for (; cnt == 0 && i < port_width; ++i, ++cp) {
-			data = (data << 8) | (*(uchar *) cp);
-		}
-
-		if ((rc = write_data (info, wp, SWAP (data))) != 0) {
-			return (rc);
-		}
-		wp += port_width;
-	}
-
-	/*
-	 * handle word aligned part
-	 */
-	count = 0;
-	while (cnt >= port_width) {
-		data = 0;
-		for (i = 0; i < port_width; ++i) {
-			data = (data << 8) | *src++;
-		}
-		if ((rc = write_data (info, wp, SWAP (data))) != 0) {
-			return (rc);
-		}
-		wp += port_width;
-		cnt -= port_width;
-		if (count++ > 0x800) {
-			spin_wheel ();
-			count = 0;
-		}
-	}
-
-	if (cnt == 0) {
-		return (0);
-	}
-
-	/*
-	 * handle unaligned tail bytes
-	 */
-	data = 0;
-	for (i = 0, cp = wp; i < port_width && cnt > 0; ++i, ++cp) {
-		data = (data << 8) | *src++;
-		--cnt;
-	}
-	for (; i < port_width; ++i, ++cp) {
-		data = (data << 8) | (*(uchar *) cp);
-	}
-
-	return (write_data (info, wp, SWAP (data)));
-}
-
-/*-----------------------------------------------------------------------
- * Write a word or halfword to Flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-static int write_data (flash_info_t *info, ulong dest, FPW data)
-{
-	FPWV *addr = (FPWV *) dest;
-	ulong status;
-	int flag;
-	ulong start;
-
-	/* Check if Flash is (sufficiently) erased */
-	if ((*addr & data) != data) {
-		printf ("not erased@%08lx (%lx)\n", (ulong) addr, *addr);
-		return (2);
-	}
-	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
-
-	*addr = (FPW) 0x00400040;	/* write setup */
-	*addr = data;
-
-	/* arm simple, non interrupt dependent timer */
-	start = get_timer(0);
-
-	/* wait while polling the status register */
-	while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
-		if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
-			*addr = (FPW) 0x00FF00FF;	/* restore read mode */
-			return (1);
-		}
-	}
-
-	*addr = (FPW) 0x00FF00FF;	/* restore read mode */
-
-	return (0);
-}
-
-void inline spin_wheel (void)
-{
-	static int p = 0;
-	static char w[] = "\\/-";
-
-	printf ("\010%c", w[p]);
-	(++p == 3) ? (p = 0) : 0;
-}
diff --git a/boards.cfg b/boards.cfg
index 7c63449..d65ca12 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -216,7 +216,6 @@ actux3                       arm         ixp
 actux4                       arm         ixp
 dvlhost                      arm         ixp
 balloon3                     arm         pxa
-cerf250                      arm         pxa
 colibri_pxa270               arm         pxa
 cradle                       arm         pxa
 lubbock                      arm         pxa
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index cb5e4bc..232cd68 100644
--- a/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@ -11,6 +11,7 @@ easily if here is something they might want to dig for...
 
 Board	Arch	CPU	removed	    Commit	last known maintainer/contact
 =============================================================================
+cerf250 arm     pxa     a3f1241   2011-25-11    Prakash Kumar <prakash@embedx.com>
 mpq101	powerpc	mpc85xx	-	  2011-10-23	Alex Dubov <oakad@yahoo.com>
 ixdpg425 arm	ixp	0ca8eb7	  2011-09-22	Stefan Roese <sr@denx.de>
 ixdp425 arm	ixp	0ca8eb7	  2011-09-22	Kyle Harris <kharris@nexus-tech.net>
diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h
deleted file mode 100644
index 70427da..0000000
--- a/include/configs/cerf250.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * (C) Copyright 2002
- * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * Configuation settings for the CERF250 board.
- *
- * 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
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-#define CONFIG_PXA250		1	/* This is an PXA250 CPU    */
-#define CONFIG_CERF250		1	/* on Cerf PXA Board	    */
-#define CONFIG_BOARD_LATE_INIT
-#define CONFIG_BAUDRATE		38400
-#define	CONFIG_SYS_TEXT_BASE	0x0
-
-#undef	CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff */
-
-/* we will never enable dcache, because we have to setup MMU first */
-#define CONFIG_SYS_DCACHE_OFF
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN	    (CONFIG_ENV_SIZE + 128*1024)
-
-/*
- * Hardware drivers
- */
-#define CONFIG_SMC91111
-#define CONFIG_SMC91111_BASE 0x04000300
-#define CONFIG_SMC_USE_32_BIT
-
-/*
- * select serial console configuration
- */
-#define CONFIG_PXA_SERIAL
-#define CONFIG_FFUART	     1	/* we use FFUART on CERF PXA */
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-
-/*
- * Command line configuration.
- */
-#include <config_cmd_default.h>
-
-
-#define CONFIG_BOOTDELAY	3
-#define CONFIG_ETHADDR		00:D0:CA:F1:3C:D2
-#define CONFIG_NETMASK		255.255.255.0
-#define CONFIG_IPADDR		192.168.0.5
-#define CONFIG_SERVERIP		192.168.0.2
-#define CONFIG_BOOTCOMMAND	"bootm 0xC0000"
-#define CONFIG_BOOTARGS		"root=/dev/mtdblock3 rootfstype=jffs2 console=ttyS0,38400"
-#define CONFIG_CMDLINE_TAG
-
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_KGDB_BAUDRATE	230400	/* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	2		/* which serial port to use */
-#endif
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_HUSH_PARSER		1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-
-#define CONFIG_SYS_LONGHELP					/* undef to save memory		*/
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT			"uboot$ "	/* Monitor Command Prompt */
-#else
-#define CONFIG_SYS_PROMPT			"=> "		/* Monitor Command Prompt */
-#endif
-#define CONFIG_SYS_CBSIZE			256			/* Console I/O Buffer Size	*/
-#define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-										/* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS			16			/* max number of command args	*/
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
-#define CONFIG_SYS_DEVICE_NULLDEV	1
-
-#define CONFIG_SYS_MEMTEST_START	0xa0400000	/* memtest works on	*/
-#define CONFIG_SYS_MEMTEST_END		0xa0800000	/* 4 ... 8 MB in DRAM	*/
-
-#define CONFIG_SYS_LOAD_ADDR		0xa2000000	/* default load address */
-
-#define CONFIG_SYS_HZ			1000
-#define CONFIG_SYS_CPUSPEED		0x141		/* set core clock to 400/200/100 MHz */
-
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
-
-/*
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE		(128*1024)	/* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
-#endif
-
-/*
- * Physical Memory Map
- */
-#define CONFIG_NR_DRAM_BANKS		1		/* we have 1 bank of DRAM */
-#define PHYS_SDRAM_1			0xa0000000	/* SDRAM Bank #1 */
-#define PHYS_SDRAM_1_SIZE		0x04000000	/* 64 MB */
-
-#define PHYS_FLASH_1			0x00000000	/* Flash Bank #1 */
-#define PHYS_FLASH_2			0x04000000	/* Flash Bank #2 */
-#define PHYS_FLASH_SIZE			0x02000000	/* 32 MB */
-#define PHYS_FLASH_BANK_SIZE		0x02000000	/* 32 MB Banks */
-#define PHYS_FLASH_SECT_SIZE		0x00040000	/* 256 KB sectors (x2) */
-
-#define CONFIG_SYS_DRAM_BASE			0xa0000000
-#define CONFIG_SYS_DRAM_SIZE			0x04000000
-
-#define CONFIG_SYS_FLASH_BASE			PHYS_FLASH_1
-
-#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define	CONFIG_SYS_INIT_SP_ADDR		(GENERATED_GBL_DATA_SIZE + PHYS_SDRAM_1)
-
-/*
- * GPIO settings
- */
-
-
-#define CONFIG_SYS_GPSR0_VAL		0x00408030
-#define CONFIG_SYS_GPSR1_VAL		0x00BFA882
-#define CONFIG_SYS_GPSR2_VAL		0x0001C000
-#define CONFIG_SYS_GPCR0_VAL		0xC0031100
-#define CONFIG_SYS_GPCR1_VAL		0xFC400300
-#define CONFIG_SYS_GPCR2_VAL		0x00003FFF
-#define CONFIG_SYS_GPDR0_VAL		0xC0439330
-#define CONFIG_SYS_GPDR1_VAL		0xFCFFAB82
-#define CONFIG_SYS_GPDR2_VAL		0x0001FFFF
-#define CONFIG_SYS_GAFR0_L_VAL		0x80000000
-#define CONFIG_SYS_GAFR0_U_VAL		0xA5000010
-#define CONFIG_SYS_GAFR1_L_VAL		0x60008018
-#define CONFIG_SYS_GAFR1_U_VAL		0xAAA5AAAA
-#define CONFIG_SYS_GAFR2_L_VAL		0xAAA0000A
-#define CONFIG_SYS_GAFR2_U_VAL		0x00000002
-
-#define CONFIG_SYS_PSSR_VAL		0x20
-
-#define	CONFIG_SYS_CCCR			CCCR_L27|CCCR_M2|CCCR_N10
-#define	CONFIG_SYS_CKEN			0x0
-
-/*
- * Memory settings
- */
-#define CONFIG_SYS_MSC0_VAL		0x12447FF0
-#define CONFIG_SYS_MSC1_VAL		0x12BC5554
-#define CONFIG_SYS_MSC2_VAL		0x7FF97FF1
-#define CONFIG_SYS_MDCNFG_VAL		0x00001AC9
-#define CONFIG_SYS_MDREFR_VAL		0x03CDC017
-#define CONFIG_SYS_MDMRS_VAL		0x00000000
-#define	CONFIG_SYS_FLYCNFG_VAL		0x00000000
-#define	CONFIG_SYS_SXCNFG_VAL		0x00000000
-
-/*
- * PCMCIA and CF Interfaces
- */
-#define CONFIG_SYS_MECR_VAL		0x00000000
-#define CONFIG_SYS_MCMEM0_VAL		0x00010504
-#define CONFIG_SYS_MCMEM1_VAL		0x00010504
-#define CONFIG_SYS_MCATT0_VAL		0x00010504
-#define CONFIG_SYS_MCATT1_VAL		0x00010504
-#define CONFIG_SYS_MCIO0_VAL		0x00004715
-#define CONFIG_SYS_MCIO1_VAL		0x00004715
-
-#define _LED			0x08000010	/*check this */
-#define LED_BLANK		0x08000040
-#define LED_GPIO		0x10
-
-/*
- * FLASH and environment organization
- */
-#define CONFIG_SYS_MAX_FLASH_BANKS	1	/* max number of memory banks		*/
-#define CONFIG_SYS_MAX_FLASH_SECT	128	/* max number of sectors on one chip    */
-
-/* timeout values are in ticks */
-#define CONFIG_SYS_FLASH_ERASE_TOUT	(25*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
-#define CONFIG_SYS_FLASH_WRITE_TOUT	(25*CONFIG_SYS_HZ) /* Timeout for Flash Write */
-
-#define CONFIG_SYS_MONITOR_LEN		0x40000		/* 256 KiB */
-#define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_ADDR		(PHYS_FLASH_1 + CONFIG_SYS_MONITOR_LEN)
-#define CONFIG_ENV_SIZE		0x40000	/* Total Size of Environment Sector	*/
-
-
-#endif	/* __CONFIG_H */
-- 
1.7.7.1

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH 2/4] PXA: Drop CRADLE board
  2011-11-25 18:53 [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board Marek Vasut
@ 2011-11-25 18:53 ` Marek Vasut
  2011-11-25 18:53 ` [U-Boot] [PATCH 3/4] PXA: Drop PLEB2 board Marek Vasut
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 10+ messages in thread
From: Marek Vasut @ 2011-11-25 18:53 UTC (permalink / raw)
  To: u-boot

The board is unmaintained and maintainer doesn't respond.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Anatolij Gustschin <agust@denx.de>
---
 MAINTAINERS              |    1 -
 board/cradle/Makefile    |   43 ------
 board/cradle/cradle.c    |  236 ------------------------------
 board/cradle/flash.c     |  361 ----------------------------------------------
 boards.cfg               |    1 -
 doc/README.scrapyard     |    1 +
 include/configs/cradle.h |  358 ---------------------------------------------
 7 files changed, 1 insertions(+), 1000 deletions(-)
 delete mode 100644 board/cradle/Makefile
 delete mode 100644 board/cradle/cradle.c
 delete mode 100644 board/cradle/flash.c
 delete mode 100644 include/configs/cradle.h

diff --git a/MAINTAINERS b/MAINTAINERS
index 3835154..a77f23c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -900,7 +900,6 @@ Sughosh Ganu <urwithsughosh@gmail.com>
 Unknown / orphaned boards:
  	Board		CPU	Last known maintainer / Comment
 .........................................................................
-	cradle		xscale/pxa	Kyle Harris <kharris@nexus-tech.net> / dead address
 	lubbock		xscale/pxa	Kyle Harris <kharris@nexus-tech.net> / dead address
 
 	imx31_phycore_eet i.MX31  Guennadi Liakhovetski <g.liakhovetski@gmx.de> / resigned
diff --git a/board/cradle/Makefile b/board/cradle/Makefile
deleted file mode 100644
index bdc91d8..0000000
--- a/board/cradle/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd at 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	= $(obj)lib$(BOARD).o
-
-COBJS	:= cradle.o flash.o
-
-SRCS	:= $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/cradle/cradle.c b/board/cradle/cradle.c
deleted file mode 100644
index 2bbf2d5..0000000
--- a/board/cradle/cradle.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * (C) Copyright 2002
- * Kyle Harris, Nexus Technologies, Inc. kharris at 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 <asm/arch/pxa-regs.h>
-#include <common.h>
-#include <netdev.h>
-#include <asm/io.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* ------------------------------------------------------------------------- */
-
-
-/* local prototypes */
-void set_led (int led, int color);
-void error_code_halt (int code);
-int init_sio (int led, unsigned long base);
-inline void cradle_outb (unsigned short val, unsigned long base,
-			 unsigned long reg);
-inline unsigned char cradle_inb (unsigned long base, unsigned long reg);
-inline void sleep (int i);
-
-inline void
-/**********************************************************/
-sleep (int i)
-/**********************************************************/
-{
-	while (i--) {
-		udelay (1000000);
-	}
-}
-
-void
-/**********************************************************/
-error_code_halt (int code)
-/**********************************************************/
-{
-	while (1) {
-		led_code (code, RED);
-		sleep (1);
-		led_code (0, OFF);
-		sleep (1);
-	}
-}
-
-void
-/**********************************************************/
-led_code (int code, int color)
-/**********************************************************/
-{
-	int i;
-
-	code &= 0xf;		/* only 4 leds */
-
-	for (i = 0; i < 4; i++) {
-		if (code & (1 << i)) {
-			set_led (i, color);
-		} else {
-			set_led (i, OFF);
-		}
-	}
-}
-
-void
-/**********************************************************/
-set_led (int led, int color)
-/**********************************************************/
-{
-	int shift = led * 2;
-	unsigned long mask = 0x3 << shift;
-
-	writel(mask, GPCR2);	/* clear bits */
-	writel((color << shift), GPSR2);	/* set bits */
-	udelay (5000);
-}
-
-inline void
-/**********************************************************/
-cradle_outb (unsigned short val, unsigned long base, unsigned long reg)
-/**********************************************************/
-{
-	*(volatile unsigned short *) (base + (reg * 2)) = val;
-}
-
-inline unsigned char
-/**********************************************************/
-cradle_inb (unsigned long base, unsigned long reg)
-/**********************************************************/
-{
-	unsigned short val;
-
-	val = *(volatile unsigned short *) (base + (reg * 2));
-	return (val & 0xff);
-}
-
-int
-/**********************************************************/
-init_sio (int led, unsigned long base)
-/**********************************************************/
-{
-	unsigned char val;
-
-	set_led (led, YELLOW);
-	val = cradle_inb (base, CRADLE_SIO_INDEX);
-	val = cradle_inb (base, CRADLE_SIO_INDEX);
-	if (val != 0) {
-		set_led (led, RED);
-		return -1;
-	}
-
-	/* map SCC2 to COM1 */
-	cradle_outb (0x01, base, CRADLE_SIO_INDEX);
-	cradle_outb (0x00, base, CRADLE_SIO_DATA);
-
-	/* enable SCC2 extended regs */
-	cradle_outb (0x40, base, CRADLE_SIO_INDEX);
-	cradle_outb (0xa0, base, CRADLE_SIO_DATA);
-
-	/* enable SCC2 clock multiplier */
-	cradle_outb (0x51, base, CRADLE_SIO_INDEX);
-	cradle_outb (0x04, base, CRADLE_SIO_DATA);
-
-	/* enable SCC2 */
-	cradle_outb (0x00, base, CRADLE_SIO_INDEX);
-	cradle_outb (0x04, base, CRADLE_SIO_DATA);
-
-	/* map SCC2 DMA to channel 0 */
-	cradle_outb (0x4f, base, CRADLE_SIO_INDEX);
-	cradle_outb (0x09, base, CRADLE_SIO_DATA);
-
-	/* read ID from SIO to check operation */
-	cradle_outb (0xe4, base, 0x3f8 + 0x3);
-	val = cradle_inb (base, 0x3f8 + 0x0);
-	if ((val & 0xf0) != 0x20) {
-		set_led (led, RED);
-		/* disable SCC2 */
-		cradle_outb (0, base, CRADLE_SIO_INDEX);
-		cradle_outb (0, base, CRADLE_SIO_DATA);
-		return -1;
-	}
-	/* set back to bank 0 */
-	cradle_outb (0, base, 0x3f8 + 0x3);
-	set_led (led, GREEN);
-	return 0;
-}
-
-/*
- * Miscelaneous platform dependent initialisations
- */
-
-int
-/**********************************************************/
-board_late_init (void)
-/**********************************************************/
-{
-	return (0);
-}
-
-int
-/**********************************************************/
-board_init (void)
-/**********************************************************/
-{
-	/* We have RAM, disable cache */
-	dcache_disable();
-	icache_disable();
-
-	led_code (0xf, YELLOW);
-
-	/* arch number of HHP Cradle */
-	gd->bd->bi_arch_number = MACH_TYPE_HHP_CRADLE;
-
-	/* adress of boot parameters */
-	gd->bd->bi_boot_params = 0xa0000100;
-
-	/* Init SIOs to enable SCC2 */
-	udelay (100000);		/* delay makes it look neat */
-	init_sio (0, CRADLE_SIO1_PHYS);
-	udelay (100000);
-	init_sio (1, CRADLE_SIO2_PHYS);
-	udelay (100000);
-	init_sio (2, CRADLE_SIO3_PHYS);
-	udelay (100000);
-	set_led (3, GREEN);
-
-	return 1;
-}
-
-extern void pxa_dram_init(void);
-int dram_init(void)
-{
-	pxa_dram_init();
-	gd->ram_size = PHYS_SDRAM_1_SIZE;
-	return 0;
-}
-
-void dram_init_banksize(void)
-{
-	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-}
-
-#ifdef CONFIG_CMD_NET
-int board_eth_init(bd_t *bis)
-{
-	int rc = 0;
-#ifdef CONFIG_SMC91111
-	rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
-#endif
-	return rc;
-}
-#endif
diff --git a/board/cradle/flash.c b/board/cradle/flash.c
deleted file mode 100644
index 1601782..0000000
--- a/board/cradle/flash.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * (C) Copyright 2002
- * Kyle Harris, Nexus Technologies, Inc. kharris at 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>
-
-#define FLASH_BANK_SIZE 0x400000
-#define MAIN_SECT_SIZE  0x20000
-
-flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
-
-
-/*-----------------------------------------------------------------------
- */
-
-ulong flash_init (void)
-{
-	int i, j;
-	ulong size = 0;
-
-	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
-		ulong flashbase = 0;
-
-		flash_info[i].flash_id =
-			(INTEL_MANUFACT & FLASH_VENDMASK) |
-			(INTEL_ID_28F128J3 & FLASH_TYPEMASK);
-		flash_info[i].size = FLASH_BANK_SIZE;
-		flash_info[i].sector_count = CONFIG_SYS_MAX_FLASH_SECT;
-		memset (flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT);
-		switch (i) {
-		case 0:
-			flashbase = PHYS_FLASH_1;
-			break;
-		case 1:
-			flashbase = PHYS_FLASH_2;
-			break;
-		default:
-			panic ("configured too many flash banks!\n");
-			break;
-		}
-		for (j = 0; j < flash_info[i].sector_count; j++) {
-			flash_info[i].start[j] =
-				flashbase + j * MAIN_SECT_SIZE;
-		}
-		size += flash_info[i].size;
-	}
-
-	/* Protect monitor and environment sectors
-	 */
-	flash_protect (FLAG_PROTECT_SET,
-		       CONFIG_SYS_FLASH_BASE,
-		       CONFIG_SYS_FLASH_BASE + monitor_flash_len - 1,
-		       &flash_info[0]);
-
-	flash_protect (FLAG_PROTECT_SET,
-		       CONFIG_ENV_ADDR,
-		       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
-
-	return size;
-}
-
-/*-----------------------------------------------------------------------
- */
-void flash_print_info (flash_info_t * info)
-{
-	int i, j;
-
-	for (j = 0; j < CONFIG_SYS_MAX_FLASH_BANKS; j++) {
-		switch (info->flash_id & FLASH_VENDMASK) {
-		case (INTEL_MANUFACT & FLASH_VENDMASK):
-			printf ("Intel: ");
-			break;
-		default:
-			printf ("Unknown Vendor ");
-			break;
-		}
-
-		switch (info->flash_id & FLASH_TYPEMASK) {
-		case (INTEL_ID_28F320J3A & FLASH_TYPEMASK):
-			printf ("28F320J3A (32Mbit)\n");
-			break;
-		case (INTEL_ID_28F128J3 & FLASH_TYPEMASK):
-			printf ("28F128J3 (128Mbit)\n");
-			break;
-		default:
-			printf ("Unknown Chip Type\n");
-			goto Done;
-			break;
-		}
-
-		printf ("  Size: %ld MB in %d Sectors\n",
-			info->size >> 20, info->sector_count);
-
-		printf ("  Sector Start Addresses:");
-		for (i = 0; i < info->sector_count; i++) {
-			if ((i % 5) == 0) {
-				printf ("\n   ");
-			}
-			printf (" %08lX%s", info->start[i],
-				info->protect[i] ? " (RO)" : "     ");
-		}
-		printf ("\n");
-		info++;
-	}
-
-Done:	;
-}
-
-/*-----------------------------------------------------------------------
- */
-
-int flash_erase (flash_info_t * info, int s_first, int s_last)
-{
-	int flag, prot, sect;
-	int rc = ERR_OK;
-	ulong start;
-
-	if (info->flash_id == FLASH_UNKNOWN)
-		return ERR_UNKNOWN_FLASH_TYPE;
-
-	if ((s_first < 0) || (s_first > s_last)) {
-		return ERR_INVAL;
-	}
-
-	if ((info->flash_id & FLASH_VENDMASK) !=
-	    (INTEL_MANUFACT & FLASH_VENDMASK)) {
-		return ERR_UNKNOWN_FLASH_VENDOR;
-	}
-
-	prot = 0;
-	for (sect = s_first; sect <= s_last; ++sect) {
-		if (info->protect[sect]) {
-			prot++;
-		}
-	}
-	if (prot)
-		return ERR_PROTECTED;
-
-	/*
-	 * Disable interrupts which might cause a timeout
-	 * here. Remember that our exception vectors are
-	 * at address 0 in the flash, and we don't want a
-	 * (ticker) exception to happen while the flash
-	 * chip is in programming mode.
-	 */
-	flag = disable_interrupts ();
-
-	/* Start erase on unprotected sectors */
-	for (sect = s_first; sect <= s_last && !ctrlc (); sect++) {
-
-		printf ("Erasing sector %2d ... ", sect);
-
-		/* arm simple, non interrupt dependent timer */
-		start = get_timer(0);
-
-		if (info->protect[sect] == 0) {	/* not protected */
-			vu_short *addr = (vu_short *) (info->start[sect]);
-
-			*addr = 0x20;	/* erase setup */
-			*addr = 0xD0;	/* erase confirm */
-
-			while ((*addr & 0x80) != 0x80) {
-				if (get_timer(start) >
-				    CONFIG_SYS_FLASH_ERASE_TOUT) {
-					*addr = 0xB0;	/* suspend erase */
-					*addr = 0xFF;	/* reset to read mode */
-					rc = ERR_TIMOUT;
-					goto outahere;
-				}
-			}
-
-			/* clear status register command */
-			*addr = 0x50;
-			/* reset to read mode */
-			*addr = 0xFF;
-		}
-		printf ("ok.\n");
-	}
-	if (ctrlc ())
-		printf ("User Interrupt!\n");
-
-outahere:
-
-	/* allow flash to settle - wait 10 ms */
-	udelay_masked (10000);
-
-	if (flag)
-		enable_interrupts ();
-
-	return rc;
-}
-
-/*-----------------------------------------------------------------------
- * Copy memory to flash
- */
-
-static int write_word (flash_info_t * info, ulong dest, ushort data)
-{
-	vu_short *addr = (vu_short *) dest, val;
-	int rc = ERR_OK;
-	int flag;
-	ulong start;
-
-	/* Check if Flash is (sufficiently) erased
-	 */
-	if ((*addr & data) != data)
-		return ERR_NOT_ERASED;
-
-	/*
-	 * Disable interrupts which might cause a timeout
-	 * here. Remember that our exception vectors are
-	 * at address 0 in the flash, and we don't want a
-	 * (ticker) exception to happen while the flash
-	 * chip is in programming mode.
-	 */
-	flag = disable_interrupts ();
-
-	/* clear status register command */
-	*addr = 0x50;
-
-	/* program set-up command */
-	*addr = 0x40;
-
-	/* latch address/data */
-	*addr = data;
-
-	/* arm simple, non interrupt dependent timer */
-	start = get_timer(0);
-
-	/* wait while polling the status register */
-	while (((val = *addr) & 0x80) != 0x80) {
-		if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
-			rc = ERR_TIMOUT;
-			/* suspend program command */
-			*addr = 0xB0;
-			goto outahere;
-		}
-	}
-
-	if (val & 0x1A) {	/* check for error */
-		printf ("\nFlash write error %02x at address %08lx\n",
-			(int) val, (unsigned long) dest);
-		if (val & (1 << 3)) {
-			printf ("Voltage range error.\n");
-			rc = ERR_PROG_ERROR;
-			goto outahere;
-		}
-		if (val & (1 << 1)) {
-			printf ("Device protect error.\n");
-			rc = ERR_PROTECTED;
-			goto outahere;
-		}
-		if (val & (1 << 4)) {
-			printf ("Programming error.\n");
-			rc = ERR_PROG_ERROR;
-			goto outahere;
-		}
-		rc = ERR_PROG_ERROR;
-		goto outahere;
-	}
-
-outahere:
-	/* read array command */
-	*addr = 0xFF;
-
-	if (flag)
-		enable_interrupts ();
-
-	return rc;
-}
-
-/*-----------------------------------------------------------------------
- * Copy memory to flash.
- */
-
-int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
-{
-	ulong cp, wp;
-	ushort data;
-	int l;
-	int i, rc;
-
-	wp = (addr & ~1);	/* get lower word aligned address */
-
-	/*
-	 * handle unaligned start bytes
-	 */
-	if ((l = addr - wp) != 0) {
-		data = 0;
-		for (i = 0, cp = wp; i < l; ++i, ++cp) {
-			data = (data >> 8) | (*(uchar *) cp << 8);
-		}
-		for (; i < 2 && cnt > 0; ++i) {
-			data = (data >> 8) | (*src++ << 8);
-			--cnt;
-			++cp;
-		}
-		for (; cnt == 0 && i < 2; ++i, ++cp) {
-			data = (data >> 8) | (*(uchar *) cp << 8);
-		}
-
-		if ((rc = write_word (info, wp, data)) != 0) {
-			return (rc);
-		}
-		wp += 2;
-	}
-
-	/*
-	 * handle word aligned part
-	 */
-	while (cnt >= 2) {
-		data = *((vu_short *) src);
-		if ((rc = write_word (info, wp, data)) != 0) {
-			return (rc);
-		}
-		src += 2;
-		wp += 2;
-		cnt -= 2;
-	}
-
-	if (cnt == 0) {
-		return ERR_OK;
-	}
-
-	/*
-	 * handle unaligned tail bytes
-	 */
-	data = 0;
-	for (i = 0, cp = wp; i < 2 && cnt > 0; ++i, ++cp) {
-		data = (data >> 8) | (*src++ << 8);
-		--cnt;
-	}
-	for (; i < 2; ++i, ++cp) {
-		data = (data >> 8) | (*(uchar *) cp << 8);
-	}
-
-	return write_word (info, wp, data);
-}
diff --git a/boards.cfg b/boards.cfg
index d65ca12..fe90db2 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -217,7 +217,6 @@ actux4                       arm         ixp
 dvlhost                      arm         ixp
 balloon3                     arm         pxa
 colibri_pxa270               arm         pxa
-cradle                       arm         pxa
 lubbock                      arm         pxa
 palmld                       arm         pxa
 palmtc                       arm         pxa
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index 232cd68..3ebb01b 100644
--- a/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@ -11,6 +11,7 @@ easily if here is something they might want to dig for...
 
 Board	Arch	CPU	removed	    Commit	last known maintainer/contact
 =============================================================================
+cradle  arm     pxa     4e24f8a   2011-25-11    Kyle Harris <kharris@nexus-tech.net>
 cerf250 arm     pxa     a3f1241   2011-25-11    Prakash Kumar <prakash@embedx.com>
 mpq101	powerpc	mpc85xx	-	  2011-10-23	Alex Dubov <oakad@yahoo.com>
 ixdpg425 arm	ixp	0ca8eb7	  2011-09-22	Stefan Roese <sr@denx.de>
diff --git a/include/configs/cradle.h b/include/configs/cradle.h
deleted file mode 100644
index 25be616..0000000
--- a/include/configs/cradle.h
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * (C) Copyright 2002
- * Kyle Harris, Nexus Technologies, Inc. kharris at 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
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-#define CONFIG_PXA250           1       /* This is an PXA250 CPU    */
-#define CONFIG_HHP_CRADLE       1       /* on an Cradle Board       */
-
-#undef CONFIG_USE_IRQ                   /* we don't need IRQ/FIQ stuff */
-
-/* we will never enable dcache, because we have to setup MMU first */
-#define CONFIG_SYS_DCACHE_OFF
-#define	CONFIG_SYS_TEXT_BASE		0x0
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128*1024)
-
-/*
- * Hardware drivers
- */
-#define CONFIG_SMC91111
-#define CONFIG_SMC91111_BASE 0x10000300
-#define CONFIG_SMC91111_EXT_PHY
-#define CONFIG_SMC_USE_32_BIT
-
-/*
- * select serial console configuration
- */
-#define CONFIG_PXA_SERIAL
-#define CONFIG_FFUART          1       /* we use FFUART on LUBBOCK */
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
-#define CONFIG_BAUDRATE         115200
-
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-
-/*
- * Command line configuration.
- */
-#include <config_cmd_default.h>
-
-
-#define CONFIG_BOOTDELAY        3
-#define CONFIG_BOOTARGS         "root=/dev/mtdblock2 console=ttyS0,115200"
-#define CONFIG_ETHADDR          08:00:3e:26:0a:5b
-#define CONFIG_NETMASK          255.255.0.0
-#define CONFIG_IPADDR           192.168.0.21
-#define CONFIG_SERVERIP         192.168.0.250
-#define CONFIG_BOOTCOMMAND      "bootm 40000"
-#define CONFIG_CMDLINE_TAG
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_LONGHELP                            /* undef to save memory         */
-#define CONFIG_SYS_PROMPT              "=> "   /* Monitor Command Prompt       */
-#define CONFIG_SYS_CBSIZE              256             /* Console I/O Buffer Size      */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS             16              /* max number of command args   */
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE      /* Boot Argument Buffer Size    */
-
-#define CONFIG_SYS_MEMTEST_START       0xa0400000      /* memtest works on     */
-#define CONFIG_SYS_MEMTEST_END         0xa0800000      /* 4 ... 8 MB in DRAM   */
-
-#define CONFIG_SYS_LOAD_ADDR           0xa2000000      /* default load address */
-
-#define CONFIG_SYS_HZ			1000
-#define CONFIG_SYS_CPUSPEED            0x141           /* set core clock to 200/200/100 MHz */
-
-						/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
-/*
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE        (128*1024)      /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ    (4*1024)        /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ    (4*1024)        /* FIQ stack */
-#endif
-
-/*
- * Physical Memory Map
- */
-#define CONFIG_NR_DRAM_BANKS    1          /* we have 1 bank of DRAM */
-#define PHYS_SDRAM_1            0xa0000000 /* SDRAM Bank #1 */
-#define PHYS_SDRAM_1_SIZE       0x01000000 /* 64 MB */
-
-#define PHYS_FLASH_1            0x00000000 /* Flash Bank #1 */
-#define PHYS_FLASH_2            0x04000000 /* Flash Bank #1 */
-#define PHYS_FLASH_SIZE         0x02000000 /* 32 MB */
-
-#define CONFIG_SYS_DRAM_BASE           0xa0000000
-#define CONFIG_SYS_DRAM_SIZE           0x04000000
-
-#define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1
-
-#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define	CONFIG_SYS_INIT_SP_ADDR		(GENERATED_GBL_DATA_SIZE + PHYS_SDRAM_1)
-
-/*
- * FLASH and environment organization
- */
-#define CONFIG_SYS_MAX_FLASH_BANKS     1     /* max number of memory banks           */
-#define CONFIG_SYS_MAX_FLASH_SECT      32    /* max number of sectors on one chip    */
-
-/* timeout values are in ticks */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    (2*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    (2*CONFIG_SYS_HZ) /* Timeout for Flash Write */
-
-#define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_ADDR				0x00020000	/* absolute address for now   */
-#define CONFIG_ENV_SIZE				0x20000	   /* 8K ouch, this may later be */
-
-/******************************************************************************
- *
- * CPU specific defines
- *
- ******************************************************************************/
-
-/*
- * GPIO settings
- *
- * GPIO pin assignments
- * GPIO     Name        Dir Out AF
- * 0        NC
- * 1        NC
- * 2        SIRQ1       I
- * 3        SIRQ2       I
- * 4        SIRQ3       I
- * 5        DMAACK1     O   0
- * 6        DMAACK2     O   0
- * 7        DMAACK3     O   0
- * 8        TC1         O   0
- * 9        TC2         O   0
- * 10       TC3         O   0
- * 11       nDMAEN      O   1
- * 12       AENCTRL     O   0
- * 13       PLDTC       O   0
- * 14       ETHIRQ      I
- * 15       NC
- * 16       NC
- * 17       NC
- * 18       RDY         I
- * 19       DMASIO      I
- * 20       ETHIRQ      NC
- * 21       NC
- * 22       PGMEN       O   1    FIXME for debug only enable flash
- * 23       NC
- * 24       NC
- * 25       NC
- * 26       NC
- * 27       NC
- * 28       NC
- * 29       NC
- * 30       NC
- * 31       NC
- * 32       NC
- * 33       NC
- * 34       FFRXD       I       01
- * 35       FFCTS       I       01
- * 36       FFDCD       I       01
- * 37       FFDSR       I       01
- * 38       FFRI        I       01
- * 39       FFTXD       O   1   10
- * 40       FFDTR       O   0   10
- * 41       FFRTS       O   0   10
- * 42       RS232FOFF   O   0   00
- * 43       NC
- * 44       NC
- * 45       IRSL0       O   0
- * 46       IRRX0       I       01
- * 47       IRTX0       O   0   10
- * 48       NC
- * 49       nIOWE       O   0
- * 50       NC
- * 51       NC
- * 52       NC
- * 53       NC
- * 54       NC
- * 55       NC
- * 56       NC
- * 57       NC
- * 58       DKDIRQ      I
- * 59       NC
- * 60       NC
- * 61       NC
- * 62       NC
- * 63       NC
- * 64       COMLED      O   0
- * 65       COMLED      O   0
- * 66       COMLED      O   0
- * 67       COMLED      O   0
- * 68       COMLED      O   0
- * 69       COMLED      O   0
- * 70       COMLED      O   0
- * 71       COMLED      O   0
- * 72       NC
- * 73       NC
- * 74       NC
- * 75       NC
- * 76       NC
- * 77       NC
- * 78       CSIO        O   1
- * 79       NC
- * 80       CSETH       O   1
- *
- * NOTE: All NC's are defined to be outputs
- *
- */
-/* Pin direction control */
-/* NOTE GPIO 0, 61, 62 are set for inputs due to CPLD SPAREs */
-#define CONFIG_SYS_GPDR0_VAL       0xfff3bf02
-#define CONFIG_SYS_GPDR1_VAL       0xfbffbf83
-#define CONFIG_SYS_GPDR2_VAL       0x0001ffff
-/* Set and Clear registers */
-#define CONFIG_SYS_GPSR0_VAL       0x00400800
-#define CONFIG_SYS_GPSR1_VAL       0x00000480
-#define CONFIG_SYS_GPSR2_VAL       0x00014000
-#define CONFIG_SYS_GPCR0_VAL       0x00000000
-#define CONFIG_SYS_GPCR1_VAL       0x00000000
-#define CONFIG_SYS_GPCR2_VAL       0x00000000
-/* Edge detect registers (these are set by the kernel) */
-#define CONFIG_SYS_GRER0_VAL       0x00000000
-#define CONFIG_SYS_GRER1_VAL       0x00000000
-#define CONFIG_SYS_GRER2_VAL       0x00000000
-#define CONFIG_SYS_GFER0_VAL       0x00000000
-#define CONFIG_SYS_GFER1_VAL       0x00000000
-#define CONFIG_SYS_GFER2_VAL       0x00000000
-/* Alternate function registers */
-#define CONFIG_SYS_GAFR0_L_VAL     0x00000000
-#define CONFIG_SYS_GAFR0_U_VAL     0x00000010
-#define CONFIG_SYS_GAFR1_L_VAL     0x900a9550
-#define CONFIG_SYS_GAFR1_U_VAL     0x00000008
-#define CONFIG_SYS_GAFR2_L_VAL     0x20000000
-#define CONFIG_SYS_GAFR2_U_VAL     0x00000002
-
-/*
- * Clocks, power control and interrupts
- */
-#define CONFIG_SYS_PSSR_VAL        0x00000020
-#define CONFIG_SYS_CCCR        0x00000141  /* 100 MHz memory, 200 MHz CPU  */
-#define CONFIG_SYS_CKEN        0x00000060  /* FFUART and STUART enabled    */
-#define CONFIG_SYS_ICMR        0x00000000  /* No interrupts enabled        */
-
-/* FIXME
- *
- * RTC settings
- * Watchdog
- *
- */
-
-/*
- * Memory settings
- *
- * FIXME Can ethernet be burst read and/or write?? This is set for lubbock
- *       Verify timings on all
- */
-#define CONFIG_SYS_MSC0_VAL        0x000023FA  /* flash bank    (cs0)   */
-/*#define CONFIG_SYS_MSC1_VAL        0x00003549  / * SuperIO bank  (cs2)   */
-#define CONFIG_SYS_MSC1_VAL        0x0000354c  /* SuperIO bank  (cs2)   */
-#define CONFIG_SYS_MSC2_VAL        0x00001224  /* Ethernet bank (cs4)   */
-#ifdef REDBOOT_WAY
-#define CONFIG_SYS_MDCNFG_VAL      0x00001aa1  /* FIXME can DTC be 01?     */
-#define CONFIG_SYS_MDMRS_VAL       0x00000000
-#define CONFIG_SYS_MDREFR_VAL      0x00018018
-#else
-#define CONFIG_SYS_MDCNFG_VAL      0x00001aa1  /* FIXME can DTC be 01?     */
-#define CONFIG_SYS_MDMRS_VAL       0x00000000
-#define CONFIG_SYS_MDREFR_VAL      0x00403018  /* Initial setting, individual bits set in lowlevel_init.S */
-#endif
-#define	CONFIG_SYS_FLYCNFG_VAL		0x00000000
-#define	CONFIG_SYS_SXCNFG_VAL		0x00000000
-
-/*
- * PCMCIA and CF Interfaces (NOT USED, these values from lubbock init)
- */
-#define CONFIG_SYS_MECR_VAL          0x00000000
-#define CONFIG_SYS_MCMEM0_VAL        0x00010504
-#define CONFIG_SYS_MCMEM1_VAL        0x00010504
-#define CONFIG_SYS_MCATT0_VAL        0x00010504
-#define CONFIG_SYS_MCATT1_VAL        0x00010504
-#define CONFIG_SYS_MCIO0_VAL         0x00004715
-#define CONFIG_SYS_MCIO1_VAL         0x00004715
-
-/* Board specific defines */
-
-/* LED defines */
-#define YELLOW    0x03
-#define RED       0x02
-#define GREEN     0x01
-#define OFF       0x00
-#define LED_IRDA0 0
-#define LED_IRDA1 2
-#define LED_IRDA2 4
-#define LED_IRDA3 6
-
-/* SuperIO defines */
-#define CRADLE_SIO_INDEX      0x2e
-#define CRADLE_SIO_DATA       0x2f
-
-/* IO defines */
-#define CRADLE_CPLD_PHYS      0x08000000
-#define CRADLE_SIO1_PHYS      0x08100000
-#define CRADLE_SIO2_PHYS      0x08200000
-#define CRADLE_SIO3_PHYS      0x08300000
-#define CRADLE_ETH_PHYS       0x10000000
-
-#ifndef __ASSEMBLY__
-
-/* global prototypes */
-void led_code(int code, int color);
-
-#endif
-
-#endif  /* __CONFIG_H */
-- 
1.7.7.1

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH 3/4] PXA: Drop PLEB2 board
  2011-11-25 18:53 [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board Marek Vasut
  2011-11-25 18:53 ` [U-Boot] [PATCH 2/4] PXA: Drop CRADLE board Marek Vasut
@ 2011-11-25 18:53 ` Marek Vasut
  2011-11-25 18:53 ` [U-Boot] [PATCH 4/4] PXA: Drop XM250 board Marek Vasut
  2011-11-28 17:12 ` [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board Simon Glass
  3 siblings, 0 replies; 10+ messages in thread
From: Marek Vasut @ 2011-11-25 18:53 UTC (permalink / raw)
  To: u-boot

The board is unmaintained and maintainer doesn't respond.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Anatolij Gustschin <agust@denx.de>
---
 board/pleb2/Makefile    |   44 ---
 board/pleb2/flash.c     |  814 -----------------------------------------------
 board/pleb2/pleb2.c     |   71 ----
 boards.cfg              |    1 -
 doc/README.scrapyard    |    1 +
 include/configs/pleb2.h |  266 ---------------
 6 files changed, 1 insertions(+), 1196 deletions(-)
 delete mode 100644 board/pleb2/Makefile
 delete mode 100644 board/pleb2/flash.c
 delete mode 100644 board/pleb2/pleb2.c
 delete mode 100644 include/configs/pleb2.h

diff --git a/board/pleb2/Makefile b/board/pleb2/Makefile
deleted file mode 100644
index bc29610..0000000
--- a/board/pleb2/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd at 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	= $(obj)lib$(BOARD).o
-
-COBJS	:= pleb2.o flash.o
-
-SRCS	:= $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/pleb2/flash.c b/board/pleb2/flash.c
deleted file mode 100644
index 2406c5f..0000000
--- a/board/pleb2/flash.c
+++ /dev/null
@@ -1,814 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at 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 <common.h>
-#include <mpc8xx.h>
-/* environment.h defines the various CONFIG_ENV_... values in terms
- * of whichever ones are given in the configuration file.
- */
-#include <environment.h>
-
-flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* info for FLASH chips        */
-
-/* NOTE - CONFIG_FLASH_16BIT means the CPU interface is 16-bit, it
- *        has nothing to do with the flash chip being 8-bit or 16-bit.
- */
-#ifdef CONFIG_FLASH_16BIT
-typedef unsigned short FLASH_PORT_WIDTH;
-typedef volatile unsigned short FLASH_PORT_WIDTHV;
-
-#define	FLASH_ID_MASK	0xFFFF
-#else
-typedef unsigned long FLASH_PORT_WIDTH;
-typedef volatile unsigned long FLASH_PORT_WIDTHV;
-
-#define	FLASH_ID_MASK	0xFFFFFFFF
-#endif
-
-#define FPW	FLASH_PORT_WIDTH
-#define FPWV	FLASH_PORT_WIDTHV
-
-#define ORMASK(size) ((-size) & OR_AM_MSK)
-
-/*-----------------------------------------------------------------------
- * Functions
- */
-static ulong flash_get_size (FPWV * addr, flash_info_t * info);
-static void flash_reset (flash_info_t * info);
-static int write_word_intel (flash_info_t * info, FPWV * dest, FPW data);
-static int write_word_amd (flash_info_t * info, FPWV * dest, FPW data);
-static void flash_get_offsets (ulong base, flash_info_t * info);
-
-#ifdef CONFIG_SYS_FLASH_PROTECTION
-static void flash_sync_real_protect (flash_info_t * info);
-#endif
-
-/*-----------------------------------------------------------------------
- * flash_init()
- *
- * sets up flash_info and returns size of FLASH (bytes)
- */
-unsigned long flash_init (void)
-{
-	unsigned long size_b;
-	int i;
-
-	/* Init: no FLASHes known */
-	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
-		flash_info[i].flash_id = FLASH_UNKNOWN;
-	}
-
-	size_b = flash_get_size ((FPW *) CONFIG_SYS_FLASH_BASE, &flash_info[0]);
-
-	flash_info[0].size = size_b;
-
-	if (flash_info[0].flash_id == FLASH_UNKNOWN) {
-		printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx\n",
-			size_b);
-	}
-
-	/* Do this again (was done already in flast_get_size), just
-	 * in case we move it when remap the FLASH.
-	 */
-	flash_get_offsets (CONFIG_SYS_FLASH_BASE, &flash_info[0]);
-
-#ifdef CONFIG_SYS_FLASH_PROTECTION
-	/* read the hardware protection status (if any) into the
-	 * protection array in flash_info.
-	 */
-	flash_sync_real_protect (&flash_info[0]);
-#endif
-
-#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE
-	/* monitor protection ON by default */
-	flash_protect (FLAG_PROTECT_SET,
-		       CONFIG_SYS_MONITOR_BASE,
-		       CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1,
-		       &flash_info[0]);
-#endif
-
-#ifdef CONFIG_ENV_ADDR
-	flash_protect (FLAG_PROTECT_SET,
-		       CONFIG_ENV_ADDR,
-		       CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]);
-#endif
-
-#ifdef CONFIG_ENV_ADDR_REDUND
-	flash_protect (FLAG_PROTECT_SET,
-		       CONFIG_ENV_ADDR_REDUND,
-		       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
-		       &flash_info[0]);
-#endif
-
-	return (size_b);
-}
-
-/*-----------------------------------------------------------------------
- */
-static void flash_reset (flash_info_t * info)
-{
-	FPWV *base = (FPWV *) (info->start[0]);
-
-	/* Put FLASH back in read mode */
-	if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL)
-		*base = (FPW) 0x00FF00FF;	/* Intel Read Mode */
-	else if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_AMD)
-		*base = (FPW) 0x00F000F0;	/* AMD Read Mode */
-}
-
-/*-----------------------------------------------------------------------
- */
-static void flash_get_offsets (ulong base, flash_info_t * info)
-{
-	int i;
-
-	/* set up sector start address table */
-	if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL
-	    && (info->flash_id & FLASH_BTYPE)) {
-		int bootsect_size;	/* number of bytes/boot sector  */
-		int sect_size;	/* number of bytes/regular sector */
-
-		bootsect_size = 0x00002000 * (sizeof (FPW) / 2);
-		sect_size = 0x00010000 * (sizeof (FPW) / 2);
-
-		/* set sector offsets for bottom boot block type        */
-		for (i = 0; i < 8; ++i) {
-			info->start[i] = base + (i * bootsect_size);
-		}
-		for (i = 8; i < info->sector_count; i++) {
-			info->start[i] = base + ((i - 7) * sect_size);
-		}
-	} else if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_AMD
-		   && (info->flash_id & FLASH_TYPEMASK) == FLASH_AM640U) {
-
-		int sect_size;	/* number of bytes/sector */
-
-		sect_size = 0x00010000 * (sizeof (FPW) / 2);
-
-		/* set up sector start address table (uniform sector type) */
-		for (i = 0; i < info->sector_count; i++)
-			info->start[i] = base + (i * sect_size);
-	} else if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_AMD
-		   && (info->flash_id & FLASH_TYPEMASK) == FLASH_AM800T) {
-
-		int sect_size;	/* number of bytes/sector */
-
-		sect_size = 0x00010000 * (sizeof (FPW) / 2);
-
-		/* set up sector start address table (top boot sector type) */
-		for (i = 0; i < info->sector_count - 3; i++)
-			info->start[i] = base + (i * sect_size);
-		i = info->sector_count - 1;
-		info->start[i--] =
-			base + (info->size - 0x00004000) * (sizeof (FPW) / 2);
-		info->start[i--] =
-			base + (info->size - 0x00006000) * (sizeof (FPW) / 2);
-		info->start[i--] =
-			base + (info->size - 0x00008000) * (sizeof (FPW) / 2);
-	}
-}
-
-/*-----------------------------------------------------------------------
- */
-
-void flash_print_info (flash_info_t * info)
-{
-	int i;
-	uchar *boottype;
-	uchar *bootletter;
-	char *fmt;
-	uchar botbootletter[] = "B";
-	uchar topbootletter[] = "T";
-	uchar botboottype[] = "bottom boot sector";
-	uchar topboottype[] = "top boot sector";
-
-	if (info->flash_id == FLASH_UNKNOWN) {
-		printf ("missing or unknown FLASH type\n");
-		return;
-	}
-
-	switch (info->flash_id & FLASH_VENDMASK) {
-	case FLASH_MAN_AMD:
-		printf ("AMD ");
-		break;
-	case FLASH_MAN_BM:
-		printf ("BRIGHT MICRO ");
-		break;
-	case FLASH_MAN_FUJ:
-		printf ("FUJITSU ");
-		break;
-	case FLASH_MAN_SST:
-		printf ("SST ");
-		break;
-	case FLASH_MAN_STM:
-		printf ("STM ");
-		break;
-	case FLASH_MAN_INTEL:
-		printf ("INTEL ");
-		break;
-	default:
-		printf ("Unknown Vendor ");
-		break;
-	}
-
-	/* check for top or bottom boot, if it applies */
-	if (info->flash_id & FLASH_BTYPE) {
-		boottype = botboottype;
-		bootletter = botbootletter;
-	} else {
-		boottype = topboottype;
-		bootletter = topbootletter;
-	}
-
-	switch (info->flash_id & FLASH_TYPEMASK) {
-	case FLASH_AM800T:
-		fmt = "29LV800B%s (8 Mbit, %s)\n";
-		break;
-	case FLASH_AM640U:
-		fmt = "29LV641D (64 Mbit, uniform sectors)\n";
-		break;
-	case FLASH_28F800C3B:
-	case FLASH_28F800C3T:
-		fmt = "28F800C3%s (8 Mbit, %s)\n";
-		break;
-	case FLASH_INTEL800B:
-	case FLASH_INTEL800T:
-		fmt = "28F800B3%s (8 Mbit, %s)\n";
-		break;
-	case FLASH_28F160C3B:
-	case FLASH_28F160C3T:
-		fmt = "28F160C3%s (16 Mbit, %s)\n";
-		break;
-	case FLASH_INTEL160B:
-	case FLASH_INTEL160T:
-		fmt = "28F160B3%s (16 Mbit, %s)\n";
-		break;
-	case FLASH_28F320C3B:
-	case FLASH_28F320C3T:
-		fmt = "28F320C3%s (32 Mbit, %s)\n";
-		break;
-	case FLASH_INTEL320B:
-	case FLASH_INTEL320T:
-		fmt = "28F320B3%s (32 Mbit, %s)\n";
-		break;
-	case FLASH_28F640C3B:
-	case FLASH_28F640C3T:
-		fmt = "28F640C3%s (64 Mbit, %s)\n";
-		break;
-	case FLASH_INTEL640B:
-	case FLASH_INTEL640T:
-		fmt = "28F640B3%s (64 Mbit, %s)\n";
-		break;
-	default:
-		fmt = "Unknown Chip Type\n";
-		break;
-	}
-
-	printf (fmt, bootletter, boottype);
-
-	printf ("  Size: %ld MB in %d Sectors\n",
-		info->size >> 20, info->sector_count);
-
-	printf ("  Sector Start Addresses:");
-
-	for (i = 0; i < info->sector_count; ++i) {
-		if ((i % 5) == 0) {
-			printf ("\n   ");
-		}
-
-		printf (" %08lX%s", info->start[i],
-			info->protect[i] ? " (RO)" : "     ");
-	}
-
-	printf ("\n");
-}
-
-/*-----------------------------------------------------------------------
- */
-
-/*
- * The following code cannot be run from FLASH!
- */
-
-ulong flash_get_size (FPWV * addr, flash_info_t * info)
-{
-	/* Write auto select command: read Manufacturer ID */
-
-	/* Write auto select command sequence and test FLASH answer */
-	addr[0x0555] = (FPW) 0x00AA00AA;	/* for AMD, Intel ignores this */
-	addr[0x02AA] = (FPW) 0x00550055;	/* for AMD, Intel ignores this */
-	addr[0x0555] = (FPW) 0x00900090;	/* selects Intel or AMD */
-
-	/* The manufacturer codes are only 1 byte, so just use 1 byte.
-	 * This works for any bus width and any FLASH device width.
-	 */
-	switch (addr[0] & 0xff) {
-
-	case (uchar) AMD_MANUFACT:
-		info->flash_id = FLASH_MAN_AMD;
-		break;
-
-	case (uchar) INTEL_MANUFACT:
-		info->flash_id = FLASH_MAN_INTEL;
-		break;
-
-	default:
-		info->flash_id = FLASH_UNKNOWN;
-		info->sector_count = 0;
-		info->size = 0;
-		break;
-	}
-
-	/* Check 16 bits or 32 bits of ID so work on 32 or 16 bit bus. */
-	if (info->flash_id != FLASH_UNKNOWN)
-		switch (addr[1]) {
-
-		case (FPW) AMD_ID_LV800T:
-			info->flash_id += FLASH_AM800T;
-			info->sector_count = 19;
-			info->size = 0x00100000 * (sizeof (FPW) / 2);
-			break;	/* => 1 or 2 MiB        */
-
-		case (FPW) AMD_ID_LV640U:	/* 29LV640 and 29LV641 have same ID */
-			info->flash_id += FLASH_AM640U;
-			info->sector_count = 128;
-			info->size = 0x00800000 * (sizeof (FPW) / 2);
-			break;	/* => 8 or 16 MB        */
-
-		case (FPW) INTEL_ID_28F800C3B:
-			info->flash_id += FLASH_28F800C3B;
-			info->sector_count = 23;
-			info->size = 0x00100000 * (sizeof (FPW) / 2);
-			break;	/* => 1 or 2 MB         */
-
-		case (FPW) INTEL_ID_28F800B3B:
-			info->flash_id += FLASH_INTEL800B;
-			info->sector_count = 23;
-			info->size = 0x00100000 * (sizeof (FPW) / 2);
-			break;	/* => 1 or 2 MB         */
-
-		case (FPW) INTEL_ID_28F160C3B:
-			info->flash_id += FLASH_28F160C3B;
-			info->sector_count = 39;
-			info->size = 0x00200000 * (sizeof (FPW) / 2);
-			break;	/* => 2 or 4 MB         */
-
-		case (FPW) INTEL_ID_28F160B3B:
-			info->flash_id += FLASH_INTEL160B;
-			info->sector_count = 39;
-			info->size = 0x00200000 * (sizeof (FPW) / 2);
-			break;	/* => 2 or 4 MB         */
-
-		case (FPW) INTEL_ID_28F320C3B:
-			info->flash_id += FLASH_28F320C3B;
-			info->sector_count = 71;
-			info->size = 0x00400000 * (sizeof (FPW) / 2);
-			break;	/* => 4 or 8 MB         */
-
-		case (FPW) INTEL_ID_28F320B3B:
-			info->flash_id += FLASH_INTEL320B;
-			info->sector_count = 71;
-			info->size = 0x00400000 * (sizeof (FPW) / 2);
-			break;	/* => 4 or 8 MB         */
-
-		case (FPW) INTEL_ID_28F640C3B:
-			info->flash_id += FLASH_28F640C3B;
-			info->sector_count = 135;
-			info->size = 0x00800000 * (sizeof (FPW) / 2);
-			break;	/* => 8 or 16 MB        */
-
-		case (FPW) INTEL_ID_28F640B3B:
-			info->flash_id += FLASH_INTEL640B;
-			info->sector_count = 135;
-			info->size = 0x00800000 * (sizeof (FPW) / 2);
-			break;	/* => 8 or 16 MB        */
-
-		default:
-			info->flash_id = FLASH_UNKNOWN;
-			info->sector_count = 0;
-			info->size = 0;
-			return (0);	/* => no or unknown flash */
-		}
-
-	flash_get_offsets ((ulong) addr, info);
-
-	/* Put FLASH back in read mode */
-	flash_reset (info);
-
-	return (info->size);
-}
-
-#ifdef CONFIG_SYS_FLASH_PROTECTION
-/*-----------------------------------------------------------------------
- */
-
-static void flash_sync_real_protect (flash_info_t * info)
-{
-	FPWV *addr = (FPWV *) (info->start[0]);
-	FPWV *sect;
-	int i;
-
-	switch (info->flash_id & FLASH_TYPEMASK) {
-	case FLASH_28F800C3B:
-	case FLASH_28F800C3T:
-	case FLASH_28F160C3B:
-	case FLASH_28F160C3T:
-	case FLASH_28F320C3B:
-	case FLASH_28F320C3T:
-	case FLASH_28F640C3B:
-	case FLASH_28F640C3T:
-		/* check for protected sectors */
-		*addr = (FPW) 0x00900090;
-		for (i = 0; i < info->sector_count; i++) {
-			/* read sector protection at sector address, (A7 .. A0) = 0x02.
-			 * D0 = 1 for each device if protected.
-			 * If at least one device is protected the sector is marked
-			 * protected, but mixed protected and  unprotected devices
-			 * within a sector should never happen.
-			 */
-			sect = (FPWV *) (info->start[i]);
-			info->protect[i] =
-				(sect[2] & (FPW) (0x00010001)) ? 1 : 0;
-		}
-
-		/* Put FLASH back in read mode */
-		flash_reset (info);
-		break;
-
-	case FLASH_AM640U:
-	case FLASH_AM800T:
-	default:
-		/* no hardware protect that we support */
-		break;
-	}
-}
-#endif
-
-/*-----------------------------------------------------------------------
- */
-
-int flash_erase (flash_info_t * info, int s_first, int s_last)
-{
-	FPWV *addr;
-	int flag, prot, sect;
-	int intel = (info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL;
-	ulong start, now, last;
-	int rcode = 0;
-
-	if ((s_first < 0) || (s_first > s_last)) {
-		if (info->flash_id == FLASH_UNKNOWN) {
-			printf ("- missing\n");
-		} else {
-			printf ("- no sectors to erase\n");
-		}
-		return 1;
-	}
-
-	switch (info->flash_id & FLASH_TYPEMASK) {
-	case FLASH_INTEL800B:
-	case FLASH_INTEL160B:
-	case FLASH_INTEL320B:
-	case FLASH_INTEL640B:
-	case FLASH_28F800C3B:
-	case FLASH_28F160C3B:
-	case FLASH_28F320C3B:
-	case FLASH_28F640C3B:
-	case FLASH_AM640U:
-	case FLASH_AM800T:
-		break;
-	case FLASH_UNKNOWN:
-	default:
-		printf ("Can't erase unknown flash type %08lx - aborted\n",
-			info->flash_id);
-		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");
-	}
-
-	/* Start erase on unprotected sectors */
-	for (sect = s_first; sect <= s_last && rcode == 0; sect++) {
-
-		if (info->protect[sect] != 0)	/* protected, skip it */
-			continue;
-
-		/* Disable interrupts which might cause a timeout here */
-		flag = disable_interrupts ();
-
-		start = get_timer(0);
-		last = 0;
-
-		addr = (FPWV *) (info->start[sect]);
-		if (intel) {
-			*addr = (FPW) 0x00500050;	/* clear status register */
-			*addr = (FPW) 0x00200020;	/* erase setup */
-			*addr = (FPW) 0x00D000D0;	/* erase confirm */
-		} else {
-			/* must be AMD style if not Intel */
-			FPWV *base;	/* first address in bank */
-
-			base = (FPWV *) (info->start[0]);
-			base[0x0555] = (FPW) 0x00AA00AA;	/* unlock */
-			base[0x02AA] = (FPW) 0x00550055;	/* unlock */
-			base[0x0555] = (FPW) 0x00800080;	/* erase mode */
-			base[0x0555] = (FPW) 0x00AA00AA;	/* unlock */
-			base[0x02AA] = (FPW) 0x00550055;	/* unlock */
-			*addr = (FPW) 0x00300030;	/* erase sector */
-		}
-
-		/* re-enable interrupts if necessary */
-		if (flag)
-			enable_interrupts ();
-
-		/* wait at least 50us for AMD, 80us for Intel.
-		 * Let's wait 1 ms.
-		 */
-		udelay (1000);
-
-		while ((*addr & (FPW) 0x00800080) != (FPW) 0x00800080) {
-			if ((now =
-			     get_timer(start)) > CONFIG_SYS_FLASH_ERASE_TOUT) {
-				printf ("Timeout\n");
-
-				if (intel) {
-					/* suspend erase        */
-					*addr = (FPW) 0x00B000B0;
-				}
-
-				flash_reset (info);	/* reset to read mode */
-				rcode = 1;	/* failed */
-				break;
-			}
-
-			/* show that we're waiting */
-			if ((now - last) > 1 * CONFIG_SYS_HZ) {	/* every second */
-				putc ('.');
-				last = now;
-			}
-		}
-
-		flash_reset (info);	/* reset to read mode   */
-	}
-
-	printf (" done\n");
-	return rcode;
-}
-
-/*-----------------------------------------------------------------------
- * Copy memory to flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
-{
-	FPW data = 0;		/* 16 or 32 bit word, matches flash bus width on MPC8XX */
-	int bytes;		/* number of bytes to program in current word         */
-	int left;		/* number of bytes left to program                    */
-	int i, res;
-
-	for (left = cnt, res = 0;
-	     left > 0 && res == 0;
-	     addr += sizeof (data), left -= sizeof (data) - bytes) {
-
-		bytes = addr & (sizeof (data) - 1);
-		addr &= ~(sizeof (data) - 1);
-
-		/* combine source and destination data so can program
-		 * an entire word of 16 or 32 bits
-		 */
-#ifdef CONFIG_SYS_LITTLE_ENDIAN
-		for (i = 0; i < sizeof (data); i++) {
-			data >>= 8;
-			if (i < bytes || i - bytes >= left)
-				data += (*((uchar *) addr + i)) << 24;
-			else
-				data += (*src++) << 24;
-		}
-#else
-		for (i = 0; i < sizeof (data); i++) {
-			data <<= 8;
-			if (i < bytes || i - bytes >= left)
-				data += *((uchar *) addr + i);
-			else
-				data += *src++;
-		}
-#endif
-
-		/* write one word to the flash */
-		switch (info->flash_id & FLASH_VENDMASK) {
-		case FLASH_MAN_AMD:
-			res = write_word_amd (info, (FPWV *) addr, data);
-			break;
-		case FLASH_MAN_INTEL:
-			res = write_word_intel (info, (FPWV *) addr, data);
-			break;
-		default:
-			/* unknown flash type, error! */
-			printf ("missing or unknown FLASH type\n");
-			res = 1;	/* not really a timeout, but gives error */
-			break;
-		}
-	}
-
-	return (res);
-}
-
-/*-----------------------------------------------------------------------
- * Write a word to Flash for AMD FLASH
- * A word is 16 or 32 bits, whichever the bus width of the flash bank
- * (not an individual chip) is.
- *
- * returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-static int write_word_amd (flash_info_t * info, FPWV * dest, FPW data)
-{
-	int flag;
-	int res = 0;		/* result, assume success       */
-	FPWV *base;		/* first address in flash bank  */
-	ulong start;
-
-	/* Check if Flash is (sufficiently) erased */
-	if ((*dest & data) != data) {
-		return (2);
-	}
-
-
-	base = (FPWV *) (info->start[0]);
-
-	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
-
-	base[0x0555] = (FPW) 0x00AA00AA;	/* unlock */
-	base[0x02AA] = (FPW) 0x00550055;	/* unlock */
-	base[0x0555] = (FPW) 0x00A000A0;	/* selects program mode */
-
-	*dest = data;		/* start programming the data   */
-
-	/* re-enable interrupts if necessary */
-	if (flag)
-		enable_interrupts ();
-
-	start = get_timer(0);
-
-	/* data polling for D7 */
-	while (res == 0
-	       && (*dest & (FPW) 0x00800080) != (data & (FPW) 0x00800080)) {
-		if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
-			*dest = (FPW) 0x00F000F0;	/* reset bank */
-			res = 1;
-		}
-	}
-
-	return (res);
-}
-
-/*-----------------------------------------------------------------------
- * Write a word to Flash for Intel FLASH
- * A word is 16 or 32 bits, whichever the bus width of the flash bank
- * (not an individual chip) is.
- *
- * returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-static int write_word_intel (flash_info_t * info, FPWV * dest, FPW data)
-{
-	int flag;
-	int res = 0;		/* result, assume success       */
-	ulong start;
-
-	/* Check if Flash is (sufficiently) erased */
-	if ((*dest & data) != data) {
-		return (2);
-	}
-
-	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
-
-	*dest = (FPW) 0x00500050;	/* clear status register        */
-	*dest = (FPW) 0x00FF00FF;	/* make sure in read mode       */
-	*dest = (FPW) 0x00400040;	/* program setup                */
-
-	*dest = data;		/* start programming the data   */
-
-	/* re-enable interrupts if necessary */
-	if (flag)
-		enable_interrupts ();
-
-	start = get_timer(0);
-
-	while (res == 0 && (*dest & (FPW) 0x00800080) != (FPW) 0x00800080) {
-		if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
-			*dest = (FPW) 0x00B000B0;	/* Suspend program      */
-			res = 1;
-		}
-	}
-
-	if (res == 0 && (*dest & (FPW) 0x00100010))
-		res = 1;	/* write failed, time out error is close enough */
-
-	*dest = (FPW) 0x00500050;	/* clear status register        */
-	*dest = (FPW) 0x00FF00FF;	/* make sure in read mode       */
-
-	return (res);
-}
-
-#ifdef CONFIG_SYS_FLASH_PROTECTION
-/*-----------------------------------------------------------------------
- */
-int flash_real_protect (flash_info_t * info, long sector, int prot)
-{
-	int rcode = 0;		/* assume success */
-	FPWV *addr;		/* address of sector */
-	FPW value;
-
-	addr = (FPWV *) (info->start[sector]);
-
-	switch (info->flash_id & FLASH_TYPEMASK) {
-	case FLASH_28F800C3B:
-	case FLASH_28F800C3T:
-	case FLASH_28F160C3B:
-	case FLASH_28F160C3T:
-	case FLASH_28F320C3B:
-	case FLASH_28F320C3T:
-	case FLASH_28F640C3B:
-	case FLASH_28F640C3T:
-		flash_reset (info);	/* make sure in read mode */
-		*addr = (FPW) 0x00600060L;	/* lock command setup */
-		if (prot)
-			*addr = (FPW) 0x00010001L;	/* lock sector */
-		else
-			*addr = (FPW) 0x00D000D0L;	/* unlock sector */
-		flash_reset (info);	/* reset to read mode */
-
-		/* now see if it really is locked/unlocked as requested */
-		*addr = (FPW) 0x00900090;
-		/* read sector protection at sector address, (A7 .. A0) = 0x02.
-		 * D0 = 1 for each device if protected.
-		 * If at least one device is protected the sector is marked
-		 * protected, but return failure. Mixed protected and
-		 * unprotected devices within a sector should never happen.
-		 */
-		value = addr[2] & (FPW) 0x00010001;
-		if (value == 0)
-			info->protect[sector] = 0;
-		else if (value == (FPW) 0x00010001)
-			info->protect[sector] = 1;
-		else {
-			/* error, mixed protected and unprotected */
-			rcode = 1;
-			info->protect[sector] = 1;
-		}
-		if (info->protect[sector] != prot)
-			rcode = 1;	/* failed to protect/unprotect as requested */
-
-		/* reload all protection bits from hardware for now */
-		flash_sync_real_protect (info);
-		break;
-
-	case FLASH_AM640U:
-	case FLASH_AM800T:
-	default:
-		/* no hardware protect that we support */
-		info->protect[sector] = prot;
-		break;
-	}
-
-	return rcode;
-}
-#endif
diff --git a/board/pleb2/pleb2.c b/board/pleb2/pleb2.c
deleted file mode 100644
index 5a16cc7..0000000
--- a/board/pleb2/pleb2.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * (C) Copyright 2002
- * Kyle Harris, Nexus Technologies, Inc. kharris at 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>
-#include <asm/mach-types.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Miscelaneous platform dependent initialisations
- */
-
-int board_init (void)
-{
-	/* We have RAM, disable cache */
-	dcache_disable();
-	icache_disable();
-
-	/* arch number of Lubbock-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_PLEB2;
-
-	/* adress of boot parameters */
-	gd->bd->bi_boot_params = 0xa0000100;
-
-	return 0;
-}
-
-int board_late_init(void)
-{
-	setenv("stdout", "serial");
-	setenv("stderr", "serial");
-	return 0;
-}
-
-extern void pxa_dram_init(void);
-int dram_init(void)
-{
-	pxa_dram_init();
-	gd->ram_size = PHYS_SDRAM_1_SIZE;
-	return 0;
-}
-
-void dram_init_banksize(void)
-{
-	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-}
diff --git a/boards.cfg b/boards.cfg
index fe90db2..19aadac 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -220,7 +220,6 @@ colibri_pxa270               arm         pxa
 lubbock                      arm         pxa
 palmld                       arm         pxa
 palmtc                       arm         pxa
-pleb2                        arm         pxa
 polaris                      arm         pxa         trizepsiv           -              -           trizepsiv:POLARIS
 pxa255_idp                   arm         pxa
 trizepsiv                    arm         pxa
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index 3ebb01b..1148cc1 100644
--- a/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@ -11,6 +11,7 @@ easily if here is something they might want to dig for...
 
 Board	Arch	CPU	removed	    Commit	last known maintainer/contact
 =============================================================================
+pleb2   arm     pxa     b185a1c   2011-25-11
 cradle  arm     pxa     4e24f8a   2011-25-11    Kyle Harris <kharris@nexus-tech.net>
 cerf250 arm     pxa     a3f1241   2011-25-11    Prakash Kumar <prakash@embedx.com>
 mpq101	powerpc	mpc85xx	-	  2011-10-23	Alex Dubov <oakad@yahoo.com>
diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
deleted file mode 100644
index 2aeb7fb..0000000
--- a/include/configs/pleb2.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * (C) Copyright 2002
- * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * Configuration settings for the PLEB 2 board.
- *
- * 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
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-#define CONFIG_PXA250		1	/* This is an PXA255 CPU    */
-#define CONFIG_PLEB2		1	/* on an PLEB2 Board	    */
-#undef CONFIG_LCD
-#undef CONFIG_MMC
-#define CONFIG_BOARD_LATE_INIT
-#define	CONFIG_SYS_TEXT_BASE	0x0
-
-#undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff */
-
-/* we will never enable dcache, because we have to setup MMU first */
-#define CONFIG_SYS_DCACHE_OFF
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN	    (CONFIG_ENV_SIZE + 128*1024)
-
-/*
- * Hardware drivers
- */
-
-/* None - PLEB 2 doesn't have any of this.
-	#define CONFIG_LAN91C96
-	#define CONFIG_LAN91C96_BASE 0x0C000000
- */
-
-/*
- * select serial console configuration
- */
-#define CONFIG_PXA_SERIAL
-#define CONFIG_FFUART	       1       /* we use FFUART on PLEB 2 */
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
-#define CONFIG_BAUDRATE		115200
-
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-
-/*
- * Command line configuration.
- */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
-
-
-#define CONFIG_BOOTDELAY	3
-#define CONFIG_ETHADDR		08:00:3e:26:0a:5b
-#define CONFIG_NETMASK		255.255.0.0
-#define CONFIG_IPADDR		192.168.0.21
-#define CONFIG_SERVERIP		192.168.0.250
-#define CONFIG_BOOTCOMMAND	"bootm 40000"
-#define CONFIG_BOOTARGS		"root=/dev/mtdblock2 prompt_ramdisk=0 load_ramdisk=1 console=ttyS0,115200"
-
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_KGDB_BAUDRATE	230400		/* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	2		/* which serial port to use */
-#endif
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_HUSH_PARSER		1
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-
-#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT		"$ "		/* Monitor Command Prompt */
-#else
-#define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt */
-#endif
-#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
-#define CONFIG_SYS_DEVICE_NULLDEV	1
-
-#define CONFIG_SYS_MEMTEST_START	0xa0400000	/* memtest works on	*/
-#define CONFIG_SYS_MEMTEST_END		0xa0800000	/* 4 ... 8 MB in DRAM	*/
-
-#define CONFIG_SYS_LOAD_ADDR		0xa2000000	/* default load address */
-
-#define CONFIG_SYS_HZ			1000
-#define CONFIG_SYS_CPUSPEED		0x141		/* set core clock to 200/200/100 MHz */
-
-						/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
-#ifdef CONFIG_MMC
-#define CONFIG_PXA_MMC
-#define CONFIG_CMD_MMC
-#endif
-
-/*
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
-#endif
-
-/*
- * Physical Memory Map
- */
-#define CONFIG_NR_DRAM_BANKS	1	   /* we have 1 bank of DRAM */
-#define PHYS_SDRAM_1		0xa0000000 /* SDRAM Bank #1 */
-#define PHYS_SDRAM_1_SIZE	0x02000000 /* 32 MB */
-
-#define PHYS_FLASH_1		0x00000000 /* Flash Bank #1 */
-#define PHYS_FLASH_2		0x04000000 /* Flash Bank #2 */
-#define PHYS_FLASH_SIZE		0x00800000 /* 4 MB */
-
-/* Not entirely sure about this - DS/CHC */
-#define PHYS_FLASH_BANK_SIZE	0x02000000 /* 32 MB Banks */
-#define PHYS_FLASH_SECT_SIZE	0x00010000 /* 64 KB sectors (x2) */
-
-#define CONFIG_SYS_DRAM_BASE		PHYS_SDRAM_1
-#define CONFIG_SYS_DRAM_SIZE		PHYS_SDRAM_1_SIZE
-
-#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_FLASH_BASE
-
-#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define	CONFIG_SYS_INIT_SP_ADDR		(GENERATED_GBL_DATA_SIZE + PHYS_SDRAM_1)
-
-/*
- * GPIO settings
- */
-#define CONFIG_SYS_GPSR0_VAL		0x00000000  /* Don't set anything */
-#define CONFIG_SYS_GPSR1_VAL		0x00000080
-#define CONFIG_SYS_GPSR2_VAL		0x00000000
-
-#define CONFIG_SYS_GPCR0_VAL		0x00000000  /* Don't clear anything */
-#define CONFIG_SYS_GPCR1_VAL		0x00000000
-#define CONFIG_SYS_GPCR2_VAL		0x00000000
-
-#define CONFIG_SYS_GPDR0_VAL		0x00000000
-#define CONFIG_SYS_GPDR1_VAL		0x000007C3
-#define CONFIG_SYS_GPDR2_VAL		0x00000000
-
-/* Edge detect registers (these are set by the kernel) */
-#define CONFIG_SYS_GRER0_VAL	    0x00000000
-#define CONFIG_SYS_GRER1_VAL	    0x00000000
-#define CONFIG_SYS_GRER2_VAL	    0x00000000
-#define CONFIG_SYS_GFER0_VAL	    0x00000000
-#define CONFIG_SYS_GFER1_VAL	    0x00000000
-#define CONFIG_SYS_GFER2_VAL	    0x00000000
-
-#define CONFIG_SYS_GAFR0_L_VAL		0x00000000
-#define CONFIG_SYS_GAFR0_U_VAL		0x00000000
-#define CONFIG_SYS_GAFR1_L_VAL		0x00008010  /* Use FF UART Send and Receive */
-#define CONFIG_SYS_GAFR1_U_VAL		0x00000000
-#define CONFIG_SYS_GAFR2_L_VAL		0x00000000
-#define CONFIG_SYS_GAFR2_U_VAL		0x00000000
-
-#define CONFIG_SYS_PSSR_VAL		0x20
-#define CONFIG_SYS_CCCR		    0x00000141	/* 100 MHz memory, 200 MHz CPU	*/
-#define CONFIG_SYS_CKEN		    0x00000060	/* FFUART and STUART enabled	*/
-#define CONFIG_SYS_ICMR		    0x00000000	/* No interrupts enabled	*/
-
-/*
- * Memory settings
- */
-#define CONFIG_SYS_MSC0_VAL		0x00007FF0 /* Not properly calculated - FIXME (DS) */
-#define CONFIG_SYS_MSC1_VAL		0x00000000
-#define CONFIG_SYS_MSC2_VAL		0x00000000
-
-#define CONFIG_SYS_MDCNFG_VAL		0x00000aC9 /* Memory timings for the SDRAM.
-					      tRP=2, CL=2, tRCD=2, tRAS=5, tRC=8 */
-
-#define CONFIG_SYS_MDREFR_VAL		0x00403018 /* Initial setting, individual	*/
-					   /* bits set in lowlevel_init.S	*/
-#define CONFIG_SYS_MDMRS_VAL		0x00000000
-
-#define	CONFIG_SYS_FLYCNFG_VAL		0x00000000
-#define	CONFIG_SYS_SXCNFG_VAL		0x00000000
-
-/*
- * PCMCIA and CF Interfaces
- */
-#define CONFIG_SYS_MECR_VAL		0x00000000  /* Hangover from Lubbock.
-					       Needs calculating. (DS/CHC) */
-#define CONFIG_SYS_MCMEM0_VAL		0x00010504
-#define CONFIG_SYS_MCMEM1_VAL		0x00010504
-#define CONFIG_SYS_MCATT0_VAL		0x00010504
-#define CONFIG_SYS_MCATT1_VAL		0x00010504
-#define CONFIG_SYS_MCIO0_VAL		0x00004715
-#define CONFIG_SYS_MCIO1_VAL		0x00004715
-
-/*
- * FLASH and environment organization
- */
-#define CONFIG_SYS_MAX_FLASH_BANKS	1	/* max number of memory banks		*/
-#define CONFIG_SYS_MAX_FLASH_SECT	64	/* max number of sectors on one chip	*/
-
-/* timeout values are in ticks */
-/* FIXME */
-#define CONFIG_SYS_FLASH_ERASE_TOUT	(25*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
-#define CONFIG_SYS_FLASH_WRITE_TOUT	(25*CONFIG_SYS_HZ) /* Timeout for Flash Write */
-
-/* Flash protection */
-#define CONFIG_SYS_FLASH_PROTECTION	1
-
-/* FIXME */
-#define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_ADDR		(PHYS_FLASH_1 + 0x3C000)	/* Addr of Environment Sector	*/
-#define CONFIG_ENV_SIZE		0x4000	/* Total Size of Environment */
-#define CONFIG_ENV_SECT_SIZE	0x20000
-
-/* Option added to get around byte ordering issues in the flash driver */
-#define CONFIG_SYS_LITTLE_ENDIAN	1
-
-#endif	/* __CONFIG_H */
-- 
1.7.7.1

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH 4/4] PXA: Drop XM250 board
  2011-11-25 18:53 [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board Marek Vasut
  2011-11-25 18:53 ` [U-Boot] [PATCH 2/4] PXA: Drop CRADLE board Marek Vasut
  2011-11-25 18:53 ` [U-Boot] [PATCH 3/4] PXA: Drop PLEB2 board Marek Vasut
@ 2011-11-25 18:53 ` Marek Vasut
  2011-11-28 17:12 ` [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board Simon Glass
  3 siblings, 0 replies; 10+ messages in thread
From: Marek Vasut @ 2011-11-25 18:53 UTC (permalink / raw)
  To: u-boot

The board is unmaintained and maintainer doesn't respond.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Anatolij Gustschin <agust@denx.de>
---
 board/xm250/Makefile    |   43 ----
 board/xm250/flash.c     |  535 -----------------------------------------------
 board/xm250/xm250.c     |   95 ---------
 boards.cfg              |    1 -
 doc/README.scrapyard    |    1 +
 include/configs/xm250.h |  369 --------------------------------
 6 files changed, 1 insertions(+), 1043 deletions(-)
 delete mode 100644 board/xm250/Makefile
 delete mode 100644 board/xm250/flash.c
 delete mode 100644 board/xm250/xm250.c
 delete mode 100644 include/configs/xm250.h

diff --git a/board/xm250/Makefile b/board/xm250/Makefile
deleted file mode 100644
index 6a0cca0..0000000
--- a/board/xm250/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd at 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	= $(obj)lib$(BOARD).o
-
-COBJS	:= xm250.o flash.o
-
-SRCS	:= $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-
-$(LIB):	$(obj).depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/xm250/flash.c b/board/xm250/flash.c
deleted file mode 100644
index e825aba..0000000
--- a/board/xm250/flash.c
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- * (C) Copyright 2001
- * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
- *
- * (C) Copyright 2001-2004
- * Wolfgang Denk, DENX Software Engineering, wd at 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 <common.h>
-#include <linux/byteorder/swab.h>
-
-
-flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* info for FLASH chips    */
-
-/* Board support for 1 or 2 flash devices */
-#define FLASH_PORT_WIDTH32
-#undef FLASH_PORT_WIDTH16
-
-#ifdef FLASH_PORT_WIDTH16
-#define FLASH_PORT_WIDTH		ushort
-#define FLASH_PORT_WIDTHV		vu_short
-#define SWAP(x)               __swab16(x)
-#else
-#define FLASH_PORT_WIDTH		ulong
-#define FLASH_PORT_WIDTHV		vu_long
-#define SWAP(x)               __swab32(x)
-#endif
-
-/* Intel-compatible flash ID */
-#define INTEL_COMPAT  0x00890089
-#define INTEL_ALT     0x00B000B0
-
-/* Intel-compatible flash commands */
-#define INTEL_PROGRAM 0x00100010
-#define INTEL_ERASE   0x00200020
-#define INTEL_CLEAR   0x00500050
-#define INTEL_LOCKBIT 0x00600060
-#define INTEL_PROTECT 0x00010001
-#define INTEL_STATUS  0x00700070
-#define INTEL_READID  0x00900090
-#define INTEL_CONFIRM 0x00D000D0
-#define INTEL_RESET   0xFFFFFFFF
-
-/* Intel-compatible flash status bits */
-#define INTEL_FINISHED 0x00800080
-#define INTEL_OK       0x00800080
-
-#define FPW	   FLASH_PORT_WIDTH
-#define FPWV   FLASH_PORT_WIDTHV
-
-#define mb() __asm__ __volatile__ ("" : : : "memory")
-
-/*-----------------------------------------------------------------------
- * Functions
- */
-static ulong flash_get_size (FPW *addr, flash_info_t *info);
-static int write_data (flash_info_t *info, ulong dest, FPW data);
-static void flash_get_offsets (ulong base, flash_info_t *info);
-void inline spin_wheel (void);
-
-/*-----------------------------------------------------------------------
- */
-
-unsigned long flash_init (void)
-{
-	int i;
-	ulong size = 0;
-
-	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
-		switch (i) {
-		case 0:
-			flash_get_size ((FPW *) PHYS_FLASH_1, &flash_info[i]);
-			flash_get_offsets (PHYS_FLASH_1, &flash_info[i]);
-			break;
-		case 1:
-			flash_get_size ((FPW *) PHYS_FLASH_2, &flash_info[i]);
-			flash_get_offsets (PHYS_FLASH_2, &flash_info[i]);
-			break;
-		default:
-			panic ("configured to many flash banks!\n");
-			break;
-		}
-		size += flash_info[i].size;
-	}
-
-	/* Protect monitor and environment sectors
-	 */
-	flash_protect ( FLAG_PROTECT_SET,
-			CONFIG_SYS_FLASH_BASE,
-			CONFIG_SYS_FLASH_BASE + monitor_flash_len - 1,
-			&flash_info[0] );
-
-	flash_protect ( FLAG_PROTECT_SET,
-			CONFIG_ENV_ADDR,
-			CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );
-
-	return size;
-}
-
-/*-----------------------------------------------------------------------
- */
-static void flash_get_offsets (ulong base, flash_info_t *info)
-{
-	int i;
-
-	if (info->flash_id == FLASH_UNKNOWN) {
-		return;
-	}
-
-	if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
-		for (i = 0; i < info->sector_count; i++) {
-			info->start[i] = base + (i * PHYS_FLASH_SECT_SIZE);
-			info->protect[i] = 0;
-		}
-	}
-}
-
-/*-----------------------------------------------------------------------
- */
-void flash_print_info (flash_info_t *info)
-{
-	int i;
-
-	if (info->flash_id == FLASH_UNKNOWN) {
-		printf ("missing or unknown FLASH type\n");
-		return;
-	}
-
-	switch (info->flash_id & FLASH_VENDMASK) {
-	case FLASH_MAN_INTEL:
-		printf ("INTEL ");
-		break;
-	default:
-		printf ("Unknown Vendor ");
-		break;
-	}
-
-	switch (info->flash_id & FLASH_TYPEMASK) {
-	case FLASH_28F128J3A:
-		printf ("28F128J3A\n");
-		break;
-
-	case FLASH_28F640J3A:
-		printf ("28F640J3A\n");
-		break;
-	default:
-		printf ("Unknown Chip Type\n");
-		break;
-	}
-
-	printf ("  Size: %ld MB in %d Sectors\n",
-			info->size >> 20, info->sector_count);
-
-	printf ("  Sector Start Addresses:");
-	for (i = 0; i < info->sector_count; ++i) {
-		if ((i % 5) == 0)
-			printf ("\n   ");
-		printf (" %08lX%s",
-			info->start[i],
-			info->protect[i] ? " (RO)" : "     ");
-	}
-	printf ("\n");
-	return;
-}
-
-/*
- * The following code cannot be run from FLASH!
- */
-static ulong flash_get_size (FPW *addr, flash_info_t *info)
-{
-	volatile FPW value;
-
-	/* Write auto select command: read Manufacturer ID */
-	addr[0x5555] = (FPW) 0x00AA00AA;
-	addr[0x2AAA] = (FPW) 0x00550055;
-	addr[0x5555] = (FPW) 0x00900090;
-
-	mb ();
-	value = addr[0];
-
-	switch (value) {
-
-	case (FPW) INTEL_MANUFACT:
-		info->flash_id = FLASH_MAN_INTEL;
-		break;
-
-	default:
-		info->flash_id = FLASH_UNKNOWN;
-		info->sector_count = 0;
-		info->size = 0;
-		addr[0] = (FPW) 0x00FF00FF;	/* restore read mode */
-		return (0);			/* no or unknown flash  */
-	}
-
-	mb ();
-	value = addr[1];			/* device ID        */
-
-	switch (value) {
-
-	case (FPW) INTEL_ID_28F128J3A:
-		info->flash_id += FLASH_28F128J3A;
-		info->sector_count = 128;
-		info->size = 0x02000000;
-		break;				/* => 32 MB     */
-
-	case (FPW) INTEL_ID_28F640J3A:
-		info->flash_id += FLASH_28F640J3A;
-		info->sector_count = 64;
-		info->size = 0x01000000;
-		break;				/* => 16 MB     */
-
-	default:
-		info->flash_id = FLASH_UNKNOWN;
-		break;
-	}
-
-	if (info->sector_count > CONFIG_SYS_MAX_FLASH_SECT) {
-		printf ("** ERROR: sector count %d > max (%d) **\n",
-			info->sector_count, CONFIG_SYS_MAX_FLASH_SECT);
-		info->sector_count = CONFIG_SYS_MAX_FLASH_SECT;
-	}
-
-	addr[0] = (FPW) 0x00FF00FF;		/* restore read mode */
-
-	return (info->size);
-}
-
-
-/*-----------------------------------------------------------------------
- */
-
-int flash_erase (flash_info_t *info, int s_first, int s_last)
-{
-	int flag, prot, sect;
-	ulong type, start;
-	int rcode = 0;
-
-	if ((s_first < 0) || (s_first > s_last)) {
-		if (info->flash_id == FLASH_UNKNOWN) {
-			printf ("- missing\n");
-		} else {
-			printf ("- no sectors to erase\n");
-		}
-		return 1;
-	}
-
-	type = (info->flash_id & FLASH_VENDMASK);
-	if ((type != FLASH_MAN_INTEL)) {
-		printf ("Can't erase unknown flash type %08lx - aborted\n",
-			info->flash_id);
-		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");
-	}
-
-	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
-
-	/* Start erase on unprotected sectors */
-	for (sect = s_first; sect <= s_last; sect++) {
-		if (info->protect[sect] == 0) {	/* not protected */
-			FPWV *addr = (FPWV *) (info->start[sect]);
-			FPW status;
-
-			printf ("Erasing sector %2d ... ", sect);
-
-			/* arm simple, non interrupt dependent timer */
-			start = get_timer(0);
-
-			*addr = (FPW) 0x00500050;	/* clear status register */
-			*addr = (FPW) 0x00200020;	/* erase setup */
-			*addr = (FPW) 0x00D000D0;	/* erase confirm */
-
-			while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
-				if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
-					printf ("Timeout\n");
-					*addr = (FPW) 0x00B000B0;	/* suspend erase     */
-					*addr = (FPW) 0x00FF00FF;	/* reset to read mode */
-					rcode = 1;
-					break;
-				}
-			}
-
-			*addr = 0x00500050;	/* clear status register cmd.   */
-			*addr = 0x00FF00FF;	/* resest to read mode          */
-
-			printf (" done\n");
-		}
-	}
-	return rcode;
-}
-
-/*-----------------------------------------------------------------------
- * Copy memory to flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- * 4 - Flash not identified
- */
-
-int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
-{
-	ulong cp, wp;
-	FPW data;
-	int count, i, l, rc, port_width;
-
-	if (info->flash_id == FLASH_UNKNOWN) {
-		return 4;
-	}
-/* get lower word aligned address */
-#ifdef FLASH_PORT_WIDTH16
-	wp = (addr & ~1);
-	port_width = 2;
-#else
-	wp = (addr & ~3);
-	port_width = 4;
-#endif
-
-	/*
-	 * handle unaligned start bytes
-	 */
-	if ((l = addr - wp) != 0) {
-		data = 0;
-		for (i = 0, cp = wp; i < l; ++i, ++cp) {
-			data = (data << 8) | (*(uchar *) cp);
-		}
-		for (; i < port_width && cnt > 0; ++i) {
-			data = (data << 8) | *src++;
-			--cnt;
-			++cp;
-		}
-		for (; cnt == 0 && i < port_width; ++i, ++cp) {
-			data = (data << 8) | (*(uchar *) cp);
-		}
-
-		if ((rc = write_data (info, wp, SWAP (data))) != 0) {
-			return (rc);
-		}
-		wp += port_width;
-	}
-
-	/*
-	 * handle word aligned part
-	 */
-	count = 0;
-	while (cnt >= port_width) {
-		data = 0;
-		for (i = 0; i < port_width; ++i) {
-			data = (data << 8) | *src++;
-		}
-		if ((rc = write_data (info, wp, SWAP (data))) != 0) {
-			return (rc);
-		}
-		wp += port_width;
-		cnt -= port_width;
-		if (count++ > 0x800) {
-			spin_wheel ();
-			count = 0;
-		}
-	}
-
-	if (cnt == 0) {
-		return (0);
-	}
-
-	/*
-	 * handle unaligned tail bytes
-	 */
-	data = 0;
-	for (i = 0, cp = wp; i < port_width && cnt > 0; ++i, ++cp) {
-		data = (data << 8) | *src++;
-		--cnt;
-	}
-	for (; i < port_width; ++i, ++cp) {
-		data = (data << 8) | (*(uchar *) cp);
-	}
-
-	return (write_data (info, wp, SWAP (data)));
-}
-
-/*-----------------------------------------------------------------------
- * Write a word or halfword to Flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-static int write_data (flash_info_t *info, ulong dest, FPW data)
-{
-	FPWV *addr = (FPWV *) dest;
-	ulong status;
-	int flag;
-	ulong start;
-
-	/* Check if Flash is (sufficiently) erased */
-	if ((*addr & data) != data) {
-		printf ("not erased@%08lx (%lx)\n", (ulong) addr, *addr);
-		return (2);
-	}
-	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
-
-	*addr = (FPW) 0x00400040;	/* write setup */
-	*addr = data;
-
-	/* arm simple, non interrupt dependent timer */
-	start = get_timer(0);
-
-	/* wait while polling the status register */
-	while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
-		if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
-			*addr = (FPW) 0x00FF00FF;	/* restore read mode */
-			return (1);
-		}
-	}
-
-	*addr = (FPW) 0x00FF00FF;	/* restore read mode */
-
-	return (0);
-}
-
-void inline spin_wheel (void)
-{
-	static int p = 0;
-	static char w[] = "\\/-";
-
-	printf ("\010%c", w[p]);
-	(++p == 3) ? (p = 0) : 0;
-}
-
-/*-----------------------------------------------------------------------
- * Set/Clear sector's lock bit, returns:
- * 0 - OK
- * 1 - Error (timeout, voltage problems, etc.)
- */
-int flash_real_protect(flash_info_t *info, long sector, int prot)
-{
-	int i;
-	int rc = 0;
-	vu_long *addr = (vu_long *)(info->start[sector]);
-	int flag = disable_interrupts();
-	ulong start;
-
-	*addr = INTEL_CLEAR;	/* Clear status register */
-	if (prot) {			/* Set sector lock bit */
-		*addr = INTEL_LOCKBIT;	/* Sector lock bit */
-		*addr = INTEL_PROTECT;	/* set */
-	}
-	else {				/* Clear sector lock bit */
-		*addr = INTEL_LOCKBIT;	/* All sectors lock bits */
-		*addr = INTEL_CONFIRM;	/* clear */
-	}
-
-	start = get_timer(0);
-
-	while ((*addr & INTEL_FINISHED) != INTEL_FINISHED) {
-		if (get_timer(start) > CONFIG_SYS_FLASH_UNLOCK_TOUT) {
-			printf("Flash lock bit operation timed out\n");
-			rc = 1;
-			break;
-		}
-	}
-
-	if (*addr != INTEL_OK) {
-		printf("Flash lock bit operation failed at %08X, CSR=%08X\n",
-		       (uint)addr, (uint)*addr);
-		rc = 1;
-	}
-
-	if (!rc)
-		info->protect[sector] = prot;
-
-	/*
-	 * Clear lock bit command clears all sectors lock bits, so
-	 * we have to restore lock bits of protected sectors.
-	 */
-	if (!prot)
-	{
-		for (i = 0; i < info->sector_count; i++)
-		{
-			if (info->protect[i])
-			{
-				start = get_timer(0);
-				addr = (vu_long *)(info->start[i]);
-				*addr = INTEL_LOCKBIT;	/* Sector lock bit */
-				*addr = INTEL_PROTECT;	/* set */
-				while ((*addr & INTEL_FINISHED) != INTEL_FINISHED)
-				{
-					if (get_timer(start) > CONFIG_SYS_FLASH_UNLOCK_TOUT)
-					{
-						printf("Flash lock bit operation timed out\n");
-						rc = 1;
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	if (flag)
-		enable_interrupts();
-
-	*addr = INTEL_RESET;		/* Reset to read array mode */
-
-	return rc;
-}
diff --git a/board/xm250/xm250.c b/board/xm250/xm250.c
deleted file mode 100644
index 3188cf2..0000000
--- a/board/xm250/xm250.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * (C) Copyright 2002
- * Kyle Harris, Nexus Technologies, Inc. kharris at 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 <asm/arch/pxa-regs.h>
-#include <common.h>
-#include <netdev.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* ------------------------------------------------------------------------- */
-
-/* local prototypes */
-
-inline void sleep (int i);
-
-inline void
-/**********************************************************/
-sleep (int i)
-/**********************************************************/
-{
-	while (i--) {
-		udelay (1000000);
-	}
-}
-
-/*
- * Miscelaneous platform dependent initialisations
- */
-
-int
-/**********************************************************/
-board_init (void)
-/**********************************************************/
-{
-	/* We have RAM, disable cache */
-	dcache_disable();
-	icache_disable();
-
-	/* arch number of MicroSys XM250 */
-	gd->bd->bi_arch_number = MACH_TYPE_XM250;
-
-	/* adress of boot parameters */
-	gd->bd->bi_boot_params = 0xa0000100;
-
-	return 0;
-}
-
-extern void pxa_dram_init(void);
-int dram_init(void)
-{
-	pxa_dram_init();
-	gd->ram_size = PHYS_SDRAM_1_SIZE;
-	return 0;
-}
-
-void dram_init_banksize(void)
-{
-	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-}
-
-#ifdef CONFIG_CMD_NET
-int board_eth_init(bd_t *bis)
-{
-	int rc = 0;
-#ifdef CONFIG_SMC91111
-	rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
-#endif
-	return rc;
-}
-#endif
diff --git a/boards.cfg b/boards.cfg
index 19aadac..2b6fe58 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -227,7 +227,6 @@ vpac270_nor_128              arm         pxa         vpac270             -
 vpac270_nor_256              arm         pxa         vpac270             -              -           vpac270:NOR,RAM_256M
 vpac270_ond_256              arm         pxa         vpac270             -              -           vpac270:ONENAND,RAM_256M
 xaeniax                      arm         pxa
-xm250                        arm         pxa
 zipitz2                      arm         pxa
 jornada                      arm         sa1100
 atngw100                     avr32       at32ap      -                   atmel          at32ap700x
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index 1148cc1..7f643c7 100644
--- a/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@ -11,6 +11,7 @@ easily if here is something they might want to dig for...
 
 Board	Arch	CPU	removed	    Commit	last known maintainer/contact
 =============================================================================
+xm250   arm     pxa     c746cdd   2011-25-11
 pleb2   arm     pxa     b185a1c   2011-25-11
 cradle  arm     pxa     4e24f8a   2011-25-11    Kyle Harris <kharris@nexus-tech.net>
 cerf250 arm     pxa     a3f1241   2011-25-11    Prakash Kumar <prakash@embedx.com>
diff --git a/include/configs/xm250.h b/include/configs/xm250.h
deleted file mode 100644
index a35bce3..0000000
--- a/include/configs/xm250.h
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- * (C) Copyright 2002
- * Kyle Harris, Nexus Technologies, Inc. kharris at 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
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-#define CONFIG_PXA250	       1	/* This is an PXA250 CPU	*/
-#define CONFIG_XM250	       1	/* on a MicroSys XM250 Board	*/
-#undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
-#define	CONFIG_SYS_TEXT_BASE	0x0
-
-/* we will never enable dcache, because we have to setup MMU first */
-#define CONFIG_SYS_DCACHE_OFF
-
-/*
- * Size of malloc() pool; this lives below the uppermost 128 KiB which are
- * used for the RAM copy of the uboot code
- *
- */
-#define CONFIG_SYS_MALLOC_LEN		(256*1024)
-
-/*
- * Hardware drivers
- */
-#define CONFIG_SMC91111
-#define CONFIG_SMC91111_BASE		0x04000300
-#undef	CONFIG_SMC91111_EXT_PHY
-#define CONFIG_SMC_USE_32_BIT
-#undef	CONFIG_SHOW_ACTIVITY
-#define CONFIG_NET_RETRY_COUNT		10	   /* # of retries		*/
-
-/*
- * I2C bus
- */
-#define CONFIG_I2C_MV			1
-#define CONFIG_MV_I2C_REG		0x40301680
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED			50000
-#define CONFIG_SYS_I2C_SLAVE			0xfe
-
-#define CONFIG_RTC_PCF8563		1
-#define CONFIG_SYS_I2C_RTC_ADDR		0x51
-
-#define CONFIG_SYS_I2C_EEPROM_ADDR		0x58	/* A0 = 0 (hardwired)		*/
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	4	/* 4 bits = 16 octets		*/
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* between stop and start	*/
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN		1	/* length of address		*/
-#define CONFIG_SYS_EEPROM_SIZE			2048	/* size in bytes		*/
-#undef	CONFIG_SYS_I2C_INIT_BOARD			/* board has no own init	*/
-
-/*
- * select serial console configuration
- */
-#define CONFIG_PXA_SERIAL
-#define CONFIG_FFUART	       1       /* we use FFUART */
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
-#define CONFIG_BAUDRATE		115200
-
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-
-/*
- * Command line configuration.
- */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_DATE
-#define CONFIG_CMD_I2C
-
-
-#define CONFIG_BOOTDELAY	3
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
-#define CONFIG_SYS_PROMPT		"=> "		/* Monitor Command Prompt	*/
-#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size	*/
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS		16		/* max number of command args	*/
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
-
-#define CONFIG_SYS_MEMTEST_START	0xa0400000	/* memtest works on		*/
-#define CONFIG_SYS_MEMTEST_END		0xa0800000	/* 4 ... 8 MB in DRAM		*/
-
-#define CONFIG_SYS_LOAD_ADDR		0xa3000000	/* default load address */
-
-#define CONFIG_SYS_HZ			1000
-#define CONFIG_SYS_CPUSPEED		0x161		/* set core clock to 400/400/100 MHz */
-
-						/* valid baudrates */
-
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
-/*
- * Definitions related to passing arguments to kernel.
- */
-#define CONFIG_CMDLINE_TAG	 1	 /* send commandline to Kernel		*/
-#define CONFIG_SETUP_MEMORY_TAGS 1	 /* send memory definition to kernel	*/
-#define	CONFIG_INITRD_TAG	 1	 /* do not send initrd params		*/
-
-/*
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE	(128*1024)	/* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ	(4*1024)	/* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ	(4*1024)	/* FIQ stack */
-#endif
-
-/*
- * Physical Memory Map
- */
-#define CONFIG_NR_DRAM_BANKS	4
-#define PHYS_SDRAM_1		0xa0000000 /* SDRAM Bank #1	*/
-#define PHYS_SDRAM_1_SIZE	0x04000000 /* 64 MB		*/
-#define PHYS_SDRAM_2		0xa4000000 /* SDRAM Bank #2	*/
-#define PHYS_SDRAM_2_SIZE	0x00000000 /* 0 MB		*/
-#define PHYS_SDRAM_3		0xa8000000 /* SDRAM Bank #3	*/
-#define PHYS_SDRAM_3_SIZE	0x00000000 /* 0 MB		*/
-#define PHYS_SDRAM_4		0xac000000 /* SDRAM Bank #4	*/
-#define PHYS_SDRAM_4_SIZE	0x00000000 /* 0 MB		*/
-
-#define PHYS_FLASH_1		0x00000000 /* Flash Bank #1	*/
-#define PHYS_FLASH_2		0x04000000 /* Flash Bank #1	*/
-#define PHYS_FLASH_SIZE		0x01000000 /* 16 MB		*/
-#define PHYS_FLASH_BANK_SIZE	0x01000000 /* 16 MB Banks	*/
-#define PHYS_FLASH_SECT_SIZE	0x00040000 /* 256 KB sectors (x2) */
-
-#define CONFIG_SYS_DRAM_BASE		0xa0000000
-#define CONFIG_SYS_DRAM_SIZE		0x04000000
-
-#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
-
-#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define	CONFIG_SYS_INIT_SP_ADDR		(GENERATED_GBL_DATA_SIZE + PHYS_SDRAM_1)
-
-/*
- * FLASH and environment organization
- */
-#define CONFIG_SYS_MAX_FLASH_BANKS	1     /* max number of memory banks		*/
-#define CONFIG_SYS_MAX_FLASH_SECT	128   /* max number of sectors on one chip	*/
-
-/* timeout values are in ticks */
-#define CONFIG_SYS_FLASH_ERASE_TOUT	(2*CONFIG_SYS_HZ)	/* Timeout for Flash Erase	*/
-#define CONFIG_SYS_FLASH_WRITE_TOUT	(2*CONFIG_SYS_HZ)	/* Timeout for Flash Write	*/
-#define CONFIG_SYS_FLASH_LOCK_TOUT	(2*CONFIG_SYS_HZ)	/* Timeout for Flash Set Lock Bit */
-#define CONFIG_SYS_FLASH_UNLOCK_TOUT	(2*CONFIG_SYS_HZ)	/* Timeout for Flash Clear Lock Bits */
-#define CONFIG_SYS_FLASH_PROTECTION			/* "Real" (hardware) sectors protection */
-
-#define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_ADDR		(PHYS_FLASH_1 + 0x40000)	/* Addr of Environment Sector	*/
-#define CONFIG_ENV_SIZE		0x4000
-#define CONFIG_ENV_SECT_SIZE	0x40000				/* Size of the Environment Sector	*/
-#define CONFIG_SYS_MONITOR_LEN		0x20000				/* 128 KiB */
-
-/******************************************************************************
- *
- * CPU specific defines
- *
- ******************************************************************************/
-
-/*
- * GPIO settings
- *
- * GPIO pin assignments
- * GPIO	    Name	Dir Out AF
- * 0	    NC
- * 1	    NC
- * 2	    SIRQ1	I
- * 3	    SIRQ2	I
- * 4	    SIRQ3	I
- * 5	    DMAACK1	O   0
- * 6	    DMAACK2	O   0
- * 7	    DMAACK3	O   0
- * 8	    TC1		O   0
- * 9	    TC2		O   0
- * 10	    TC3		O   0
- * 11	    nDMAEN	O   1
- * 12	    AENCTRL	O   0
- * 13	    PLDTC	O   0
- * 14	    ETHIRQ	I
- * 15	    NC
- * 16	    NC
- * 17	    NC
- * 18	    RDY		I
- * 19	    DMASIO	I
- * 20	    ETHIRQ	NC
- * 21	    NC
- * 22	    PGMEN	O   1	 FIXME for debug only enable flash
- * 23	    NC
- * 24	    NC
- * 25	    NC
- * 26	    NC
- * 27	    NC
- * 28	    NC
- * 29	    NC
- * 30	    NC
- * 31	    NC
- * 32	    NC
- * 33	    NC
- * 34	    FFRXD	I	01
- * 35	    FFCTS	I	01
- * 36	    FFDCD	I	01
- * 37	    FFDSR	I	01
- * 38	    FFRI	I	01
- * 39	    FFTXD	O   1	10
- * 40	    FFDTR	O   0	10
- * 41	    FFRTS	O   0	10
- * 42	    RS232FOFF	O   0	00
- * 43	    NC
- * 44	    NC
- * 45	    IRSL0	O   0
- * 46	    IRRX0	I	01
- * 47	    IRTX0	O   0	10
- * 48	    NC
- * 49	    nIOWE	O   0
- * 50	    NC
- * 51	    NC
- * 52	    NC
- * 53	    NC
- * 54	    NC
- * 55	    NC
- * 56	    NC
- * 57	    NC
- * 58	    DKDIRQ	I
- * 59	    NC
- * 60	    NC
- * 61	    NC
- * 62	    NC
- * 63	    NC
- * 64	    COMLED	O   0
- * 65	    COMLED	O   0
- * 66	    COMLED	O   0
- * 67	    COMLED	O   0
- * 68	    COMLED	O   0
- * 69	    COMLED	O   0
- * 70	    COMLED	O   0
- * 71	    COMLED	O   0
- * 72	    NC
- * 73	    NC
- * 74	    NC
- * 75	    NC
- * 76	    NC
- * 77	    NC
- * 78	    CSIO	O   1
- * 79	    NC
- * 80	    CSETH	O   1
- *
- * NOTE: All NC's are defined to be outputs
- *
- */
-/* Pin direction control */
-#define CONFIG_SYS_GPDR0_VAL	    0xd3808000
-#define CONFIG_SYS_GPDR1_VAL	    0xfcffab83
-#define CONFIG_SYS_GPDR2_VAL	    0x0001ffff
-/* Set and Clear registers */
-#define CONFIG_SYS_GPSR0_VAL	    0x00008000
-#define CONFIG_SYS_GPSR1_VAL	    0x00ff0002
-#define CONFIG_SYS_GPSR2_VAL	    0x0001c000
-#define CONFIG_SYS_GPCR0_VAL	    0x00000000
-#define CONFIG_SYS_GPCR1_VAL	    0x00000000
-#define CONFIG_SYS_GPCR2_VAL	    0x00000000
-/* Edge detect registers (these are set by the kernel) */
-#define CONFIG_SYS_GRER0_VAL	    0x00002180
-#define CONFIG_SYS_GRER1_VAL	    0x00000000
-#define CONFIG_SYS_GRER2_VAL	    0x00000000
-#define CONFIG_SYS_GFER0_VAL	    0x000043e0
-#define CONFIG_SYS_GFER1_VAL	    0x00000000
-#define CONFIG_SYS_GFER2_VAL	    0x00000000
-/* Alternate function registers */
-#define CONFIG_SYS_GAFR0_L_VAL	    0x80000004
-#define CONFIG_SYS_GAFR0_U_VAL	    0x595a8010
-#define CONFIG_SYS_GAFR1_L_VAL	    0x699a9559
-#define CONFIG_SYS_GAFR1_U_VAL	    0xaaa5aaaa
-#define CONFIG_SYS_GAFR2_L_VAL	    0xaaaaaaaa
-#define CONFIG_SYS_GAFR2_U_VAL	    0x00000002
-
-/*
- * Clocks, power control and interrupts
- */
-#define CONFIG_SYS_PSSR_VAL	    0x00000030
-#define CONFIG_SYS_CCCR		    0x00000161	/* 100 MHz memory, 400 MHz CPU, 400 Turbo  */
-#define CONFIG_SYS_CKEN		    0x000141ec	/* FFUART and STUART enabled	*/
-#define CONFIG_SYS_ICMR		    0x00000000	/* No interrupts enabled	*/
-
-/* FIXME
- *
- * RTC settings
- * Watchdog
- *
- */
-
-/*
- * Memory settings
- *
- */
-#define CONFIG_SYS_MSC0_VAL	    0x122423f0	/* FLASH   / LAN	    (cs0)/(cS1)	  */
-#define CONFIG_SYS_MSC1_VAL	    0x35f4aa4c	/* USB	   / ST3+ST5	    (cs2)/(cS3)	  */
-#define CONFIG_SYS_MSC2_VAL	    0x35f435fc	/* IDE	   / BCR + WatchDog (cs4)/(cS5)	  */
-#define CONFIG_SYS_MDCNFG_VAL	    0x000009c9
-#define CONFIG_SYS_MDMRS_VAL	    0x00220022
-#define CONFIG_SYS_MDREFR_VAL	    0x000da018	/* Initial setting, individual bits set in lowlevel_init.S */
-#define	CONFIG_SYS_FLYCNFG_VAL		0x00000000
-#define	CONFIG_SYS_SXCNFG_VAL		0x00000000
-
-/*
- * PCMCIA and CF Interfaces (NOT USED, these values from lubbock init)
- */
-#define CONFIG_SYS_MECR_VAL	      0x00000000
-#define CONFIG_SYS_MCMEM0_VAL	      0x00010504
-#define CONFIG_SYS_MCMEM1_VAL	      0x00010504
-#define CONFIG_SYS_MCATT0_VAL	      0x00010504
-#define CONFIG_SYS_MCATT1_VAL	      0x00010504
-#define CONFIG_SYS_MCIO0_VAL	      0x00004715
-#define CONFIG_SYS_MCIO1_VAL	      0x00004715
-
-/* Board specific defines */
-
-#ifndef __ASSEMBLY__
-
-/* global prototypes */
-void led_code(int code, int color);
-
-#endif
-
-#endif	/* __CONFIG_H */
-- 
1.7.7.1

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board
  2011-11-25 18:53 [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board Marek Vasut
                   ` (2 preceding siblings ...)
  2011-11-25 18:53 ` [U-Boot] [PATCH 4/4] PXA: Drop XM250 board Marek Vasut
@ 2011-11-28 17:12 ` Simon Glass
  2011-11-28 17:21   ` Marek Vasut
  3 siblings, 1 reply; 10+ messages in thread
From: Simon Glass @ 2011-11-28 17:12 UTC (permalink / raw)
  To: u-boot

Hi Marek,

On Fri, Nov 25, 2011 at 10:53 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> The board is unmaintained and maintainer doesn't respond.

Should this and the other patches be version 2, or perhaps 3?

Also I like Mike's suggested phrasing (something like "The board
doesn't build and maintainer doesn't respond") since if it built OK we
would presumably just leave it.

Regards,
Simon

>
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Anatolij Gustschin <agust@denx.de>
> ---
> ?MAINTAINERS ? ? ? ? ? ? ? | ? ?4 -
> ?board/cerf250/Makefile ? ?| ? 43 -----
> ?board/cerf250/cerf250.c ? | ? 85 ---------
> ?board/cerf250/flash.c ? ? | ?429 ---------------------------------------------
> ?boards.cfg ? ? ? ? ? ? ? ?| ? ?1 -
> ?doc/README.scrapyard ? ? ?| ? ?1 +
> ?include/configs/cerf250.h | ?229 ------------------------
> ?7 files changed, 1 insertions(+), 791 deletions(-)
> ?delete mode 100644 board/cerf250/Makefile
> ?delete mode 100644 board/cerf250/cerf250.c
> ?delete mode 100644 board/cerf250/flash.c
> ?delete mode 100644 include/configs/cerf250.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 37bbb34..3835154 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -711,10 +711,6 @@ Sergey Kubushyn <ksi@koi8.net>
> ? ? ? ?SONATA ? ? ? ? ?ARM926EJS
> ? ? ? ?SCHMOOGIE ? ? ? ARM926EJS
>
> -Prakash Kumar <prakash@embedx.com>
> -
> - ? ? ? cerf250 ? ? ? ? xscale/pxa
> -
> ?Vipin Kumar <vipin.kumar@st.com>
>
> ? ? ? ?spear300 ? ? ? ?ARM926EJS (spear300 Soc)
> diff --git a/board/cerf250/Makefile b/board/cerf250/Makefile
> deleted file mode 100644
> index cf4742e..0000000
> --- a/board/cerf250/Makefile
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -#
> -# (C) Copyright 2000-2006
> -# Wolfgang Denk, DENX Software Engineering, wd at 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 ? ?= $(obj)lib$(BOARD).o
> -
> -COBJS ?:= cerf250.o flash.o
> -
> -SRCS ? := $(COBJS:.o=.c)
> -OBJS ? := $(addprefix $(obj),$(COBJS))
> -
> -$(LIB): ? ? ? ?$(obj).depend $(OBJS)
> - ? ? ? $(call cmd_link_o_target, $(OBJS))
> -
> -#########################################################################
> -
> -# defines $(obj).depend target
> -include $(SRCTREE)/rules.mk
> -
> -sinclude $(obj).depend
> -
> -#########################################################################
> diff --git a/board/cerf250/cerf250.c b/board/cerf250/cerf250.c
> deleted file mode 100644
> index 043afea..0000000
> --- a/board/cerf250/cerf250.c
> +++ /dev/null
> @@ -1,85 +0,0 @@
> -/*
> - * (C) Copyright 2002
> - * Kyle Harris, Nexus Technologies, Inc. kharris at 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>
> -#include <netdev.h>
> -
> -DECLARE_GLOBAL_DATA_PTR;
> -
> -/* ------------------------------------------------------------------------- */
> -
> -
> -/*
> - * Miscelaneous platform dependent initialisations
> - */
> -
> -int board_init (void)
> -{
> - ? ? ? /* We have RAM, disable cache */
> - ? ? ? dcache_disable();
> - ? ? ? icache_disable();
> -
> - ? ? ? /* arch number of cerf PXA Board */
> - ? ? ? gd->bd->bi_arch_number = MACH_TYPE_PXA_CERF;
> -
> - ? ? ? /* adress of boot parameters */
> - ? ? ? gd->bd->bi_boot_params = 0xa0000100;
> -
> - ? ? ? return 0;
> -}
> -
> -int board_late_init(void)
> -{
> - ? ? ? setenv("stdout", "serial");
> - ? ? ? setenv("stderr", "serial");
> - ? ? ? return 0;
> -}
> -
> -extern void pxa_dram_init(void);
> -int dram_init(void)
> -{
> - ? ? ? pxa_dram_init();
> - ? ? ? gd->ram_size = PHYS_SDRAM_1_SIZE;
> - ? ? ? return 0;
> -}
> -
> -void dram_init_banksize(void)
> -{
> - ? ? ? gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
> - ? ? ? gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
> -}
> -
> -#ifdef CONFIG_CMD_NET
> -int board_eth_init(bd_t *bis)
> -{
> - ? ? ? int rc = 0;
> -#ifdef CONFIG_SMC91111
> - ? ? ? rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
> -#endif
> - ? ? ? return rc;
> -}
> -#endif
> diff --git a/board/cerf250/flash.c b/board/cerf250/flash.c
> deleted file mode 100644
> index e1e7807..0000000
> --- a/board/cerf250/flash.c
> +++ /dev/null
> @@ -1,429 +0,0 @@
> -/*
> - * (C) Copyright 2001
> - * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
> - *
> - * (C) Copyright 2001
> - * Wolfgang Denk, DENX Software Engineering, wd at 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 <common.h>
> -#include <linux/byteorder/swab.h>
> -
> -
> -flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; ? /* info for FLASH chips ? ?*/
> -
> -/* Board support for 1 or 2 flash devices */
> -#define FLASH_PORT_WIDTH32
> -#undef FLASH_PORT_WIDTH16
> -
> -#ifdef FLASH_PORT_WIDTH16
> -#define FLASH_PORT_WIDTH ? ? ? ? ? ? ? ushort
> -#define FLASH_PORT_WIDTHV ? ? ? ? ? ? ?vu_short
> -#define SWAP(x) ? ? ? ? ? ? ? __swab16(x)
> -#else
> -#define FLASH_PORT_WIDTH ? ? ? ? ? ? ? ulong
> -#define FLASH_PORT_WIDTHV ? ? ? ? ? ? ?vu_long
> -#define SWAP(x) ? ? ? ? ? ? ? __swab32(x)
> -#endif
> -
> -#define FPW ? ? ? FLASH_PORT_WIDTH
> -#define FPWV ? FLASH_PORT_WIDTHV
> -
> -#define mb() __asm__ __volatile__ ("" : : : "memory")
> -
> -/*-----------------------------------------------------------------------
> - * Functions
> - */
> -static ulong flash_get_size (FPW *addr, flash_info_t *info);
> -static int write_data (flash_info_t *info, ulong dest, FPW data);
> -static void flash_get_offsets (ulong base, flash_info_t *info);
> -void inline spin_wheel (void);
> -
> -/*-----------------------------------------------------------------------
> - */
> -
> -unsigned long flash_init (void)
> -{
> - ? ? ? int i;
> - ? ? ? ulong size = 0;
> -
> - ? ? ? for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
> - ? ? ? ? ? ? ? switch (i) {
> - ? ? ? ? ? ? ? case 0:
> - ? ? ? ? ? ? ? ? ? ? ? flash_get_size ((FPW *) PHYS_FLASH_1, &flash_info[i]);
> - ? ? ? ? ? ? ? ? ? ? ? flash_get_offsets (PHYS_FLASH_1, &flash_info[i]);
> - ? ? ? ? ? ? ? ? ? ? ? break;
> - ? ? ? ? ? ? ? case 1:
> - ? ? ? ? ? ? ? ? ? ? ? flash_get_size ((FPW *) PHYS_FLASH_2, &flash_info[i]);
> - ? ? ? ? ? ? ? ? ? ? ? flash_get_offsets (PHYS_FLASH_2, &flash_info[i]);
> - ? ? ? ? ? ? ? ? ? ? ? break;
> - ? ? ? ? ? ? ? default:
> - ? ? ? ? ? ? ? ? ? ? ? panic ("configured too many flash banks!\n");
> - ? ? ? ? ? ? ? ? ? ? ? break;
> - ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? size += flash_info[i].size;
> - ? ? ? }
> -
> - ? ? ? /* Protect monitor and environment sectors
> - ? ? ? ?*/
> - ? ? ? flash_protect ( FLAG_PROTECT_SET,
> - ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_FLASH_BASE,
> - ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_FLASH_BASE + monitor_flash_len - 1,
> - ? ? ? ? ? ? ? ? ? ? ? &flash_info[0] );
> -
> - ? ? ? flash_protect ( FLAG_PROTECT_SET,
> - ? ? ? ? ? ? ? ? ? ? ? CONFIG_ENV_ADDR,
> - ? ? ? ? ? ? ? ? ? ? ? CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );
> -
> - ? ? ? return size;
> -}
> -
> -/*-----------------------------------------------------------------------
> - */
> -static void flash_get_offsets (ulong base, flash_info_t *info)
> -{
> - ? ? ? int i;
> -
> - ? ? ? if (info->flash_id == FLASH_UNKNOWN) {
> - ? ? ? ? ? ? ? return;
> - ? ? ? }
> -
> - ? ? ? if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
> - ? ? ? ? ? ? ? for (i = 0; i < info->sector_count; i++) {
> - ? ? ? ? ? ? ? ? ? ? ? info->start[i] = base + (i * PHYS_FLASH_SECT_SIZE);
> - ? ? ? ? ? ? ? ? ? ? ? info->protect[i] = 0;
> - ? ? ? ? ? ? ? }
> - ? ? ? }
> -}
> -
> -/*-----------------------------------------------------------------------
> - */
> -void flash_print_info (flash_info_t *info)
> -{
> - ? ? ? int i;
> -
> - ? ? ? if (info->flash_id == FLASH_UNKNOWN) {
> - ? ? ? ? ? ? ? printf ("missing or unknown FLASH type\n");
> - ? ? ? ? ? ? ? return;
> - ? ? ? }
> -
> - ? ? ? switch (info->flash_id & FLASH_VENDMASK) {
> - ? ? ? case FLASH_MAN_INTEL:
> - ? ? ? ? ? ? ? printf ("INTEL ");
> - ? ? ? ? ? ? ? break;
> - ? ? ? default:
> - ? ? ? ? ? ? ? printf ("Unknown Vendor ");
> - ? ? ? ? ? ? ? break;
> - ? ? ? }
> -
> - ? ? ? switch (info->flash_id & FLASH_TYPEMASK) {
> - ? ? ? case FLASH_28F128J3A:
> - ? ? ? ? ? ? ? printf ("28F128J3A\n");
> - ? ? ? ? ? ? ? break;
> - ? ? ? default:
> - ? ? ? ? ? ? ? printf ("Unknown Chip Type\n");
> - ? ? ? ? ? ? ? break;
> - ? ? ? }
> -
> - ? ? ? printf (" ?Size: %ld MB in %d Sectors\n",
> - ? ? ? ? ? ? ? ? ? ? ? info->size >> 20, info->sector_count);
> -
> - ? ? ? printf (" ?Sector Start Addresses:");
> - ? ? ? for (i = 0; i < info->sector_count; ++i) {
> - ? ? ? ? ? ? ? if ((i % 5) == 0)
> - ? ? ? ? ? ? ? ? ? ? ? printf ("\n ? ");
> - ? ? ? ? ? ? ? printf (" %08lX%s",
> - ? ? ? ? ? ? ? ? ? ? ? info->start[i],
> - ? ? ? ? ? ? ? ? ? ? ? info->protect[i] ? " (RO)" : " ? ? ");
> - ? ? ? }
> - ? ? ? printf ("\n");
> - ? ? ? return;
> -}
> -
> -/*
> - * The following code cannot be run from FLASH!
> - */
> -static ulong flash_get_size (FPW *addr, flash_info_t *info)
> -{
> - ? ? ? volatile FPW value;
> -
> - ? ? ? /* Write auto select command: read Manufacturer ID */
> - ? ? ? addr[0x5555] = (FPW) 0x00AA00AA;
> - ? ? ? addr[0x2AAA] = (FPW) 0x00550055;
> - ? ? ? addr[0x5555] = (FPW) 0x00900090;
> -
> - ? ? ? mb ();
> - ? ? ? value = addr[0];
> -
> - ? ? ? switch (value) {
> -
> - ? ? ? case (FPW) INTEL_MANUFACT:
> - ? ? ? ? ? ? ? info->flash_id = FLASH_MAN_INTEL;
> - ? ? ? ? ? ? ? break;
> -
> - ? ? ? default:
> - ? ? ? ? ? ? ? info->flash_id = FLASH_UNKNOWN;
> - ? ? ? ? ? ? ? info->sector_count = 0;
> - ? ? ? ? ? ? ? info->size = 0;
> - ? ? ? ? ? ? ? addr[0] = (FPW) 0x00FF00FF; ? ? /* restore read mode */
> - ? ? ? ? ? ? ? return (0); ? ? ? ? ? ? ? ? ? ? /* no or unknown flash ?*/
> - ? ? ? }
> -
> - ? ? ? mb ();
> - ? ? ? value = addr[1]; ? ? ? ? ? ? ? ? ? ? ? ?/* device ID ? ? ? ?*/
> -
> - ? ? ? switch (value) {
> -
> - ? ? ? case (FPW) INTEL_ID_28F128J3A:
> - ? ? ? ? ? ? ? info->flash_id += FLASH_28F128J3A;
> - ? ? ? ? ? ? ? info->sector_count = 128;
> - ? ? ? ? ? ? ? info->size = 0x02000000;
> - ? ? ? ? ? ? ? break; ? ? ? ? ? ? ? ? ? ? ? ? ?/* => 16 MB ? ? */
> -
> - ? ? ? default:
> - ? ? ? ? ? ? ? info->flash_id = FLASH_UNKNOWN;
> - ? ? ? ? ? ? ? break;
> - ? ? ? }
> -
> - ? ? ? if (info->sector_count > CONFIG_SYS_MAX_FLASH_SECT) {
> - ? ? ? ? ? ? ? printf ("** ERROR: sector count %d > max (%d) **\n",
> - ? ? ? ? ? ? ? ? ? ? ? info->sector_count, CONFIG_SYS_MAX_FLASH_SECT);
> - ? ? ? ? ? ? ? info->sector_count = CONFIG_SYS_MAX_FLASH_SECT;
> - ? ? ? }
> -
> - ? ? ? addr[0] = (FPW) 0x00FF00FF; ? ? ? ? ? ? /* restore read mode */
> -
> - ? ? ? return (info->size);
> -}
> -
> -
> -/*-----------------------------------------------------------------------
> - */
> -
> -int flash_erase (flash_info_t *info, int s_first, int s_last)
> -{
> - ? ? ? int flag, prot, sect;
> - ? ? ? ulong type, start;
> - ? ? ? int rcode = 0;
> -
> - ? ? ? if ((s_first < 0) || (s_first > s_last)) {
> - ? ? ? ? ? ? ? if (info->flash_id == FLASH_UNKNOWN) {
> - ? ? ? ? ? ? ? ? ? ? ? printf ("- missing\n");
> - ? ? ? ? ? ? ? } else {
> - ? ? ? ? ? ? ? ? ? ? ? printf ("- no sectors to erase\n");
> - ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? return 1;
> - ? ? ? }
> -
> - ? ? ? type = (info->flash_id & FLASH_VENDMASK);
> - ? ? ? if ((type != FLASH_MAN_INTEL)) {
> - ? ? ? ? ? ? ? printf ("Can't erase unknown flash type %08lx - aborted\n",
> - ? ? ? ? ? ? ? ? ? ? ? info->flash_id);
> - ? ? ? ? ? ? ? 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");
> - ? ? ? }
> -
> - ? ? ? /* Disable interrupts which might cause a timeout here */
> - ? ? ? flag = disable_interrupts ();
> -
> - ? ? ? /* Start erase on unprotected sectors */
> - ? ? ? for (sect = s_first; sect <= s_last; sect++) {
> - ? ? ? ? ? ? ? if (info->protect[sect] == 0) { /* not protected */
> - ? ? ? ? ? ? ? ? ? ? ? FPWV *addr = (FPWV *) (info->start[sect]);
> - ? ? ? ? ? ? ? ? ? ? ? FPW status;
> -
> - ? ? ? ? ? ? ? ? ? ? ? printf ("Erasing sector %2d ... ", sect);
> -
> - ? ? ? ? ? ? ? ? ? ? ? /* arm simple, non interrupt dependent timer */
> - ? ? ? ? ? ? ? ? ? ? ? start = get_timer(0);
> -
> - ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00500050; ? ? ? /* clear status register */
> - ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00200020; ? ? ? /* erase setup */
> - ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00D000D0; ? ? ? /* erase confirm */
> -
> - ? ? ? ? ? ? ? ? ? ? ? while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? printf ("Timeout\n");
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00B000B0; ? ? ? /* suspend erase ? ? */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00FF00FF; ? ? ? /* reset to read mode */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? rcode = 1;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? break;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? ? ? ? ? }
> -
> - ? ? ? ? ? ? ? ? ? ? ? *addr = 0x00500050; ? ? /* clear status register cmd. ? */
> - ? ? ? ? ? ? ? ? ? ? ? *addr = 0x00FF00FF; ? ? /* resest to read mode ? ? ? ? ?*/
> -
> - ? ? ? ? ? ? ? ? ? ? ? printf (" done\n");
> - ? ? ? ? ? ? ? }
> - ? ? ? }
> - ? ? ? return rcode;
> -}
> -
> -/*-----------------------------------------------------------------------
> - * Copy memory to flash, returns:
> - * 0 - OK
> - * 1 - write timeout
> - * 2 - Flash not erased
> - * 4 - Flash not identified
> - */
> -
> -int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
> -{
> - ? ? ? ulong cp, wp;
> - ? ? ? FPW data;
> - ? ? ? int count, i, l, rc, port_width;
> -
> - ? ? ? if (info->flash_id == FLASH_UNKNOWN) {
> - ? ? ? ? ? ? ? return 4;
> - ? ? ? }
> -/* get lower word aligned address */
> -#ifdef FLASH_PORT_WIDTH16
> - ? ? ? wp = (addr & ~1);
> - ? ? ? port_width = 2;
> -#else
> - ? ? ? wp = (addr & ~3);
> - ? ? ? port_width = 4;
> -#endif
> -
> - ? ? ? /*
> - ? ? ? ?* handle unaligned start bytes
> - ? ? ? ?*/
> - ? ? ? if ((l = addr - wp) != 0) {
> - ? ? ? ? ? ? ? data = 0;
> - ? ? ? ? ? ? ? for (i = 0, cp = wp; i < l; ++i, ++cp) {
> - ? ? ? ? ? ? ? ? ? ? ? data = (data << 8) | (*(uchar *) cp);
> - ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? for (; i < port_width && cnt > 0; ++i) {
> - ? ? ? ? ? ? ? ? ? ? ? data = (data << 8) | *src++;
> - ? ? ? ? ? ? ? ? ? ? ? --cnt;
> - ? ? ? ? ? ? ? ? ? ? ? ++cp;
> - ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? for (; cnt == 0 && i < port_width; ++i, ++cp) {
> - ? ? ? ? ? ? ? ? ? ? ? data = (data << 8) | (*(uchar *) cp);
> - ? ? ? ? ? ? ? }
> -
> - ? ? ? ? ? ? ? if ((rc = write_data (info, wp, SWAP (data))) != 0) {
> - ? ? ? ? ? ? ? ? ? ? ? return (rc);
> - ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? wp += port_width;
> - ? ? ? }
> -
> - ? ? ? /*
> - ? ? ? ?* handle word aligned part
> - ? ? ? ?*/
> - ? ? ? count = 0;
> - ? ? ? while (cnt >= port_width) {
> - ? ? ? ? ? ? ? data = 0;
> - ? ? ? ? ? ? ? for (i = 0; i < port_width; ++i) {
> - ? ? ? ? ? ? ? ? ? ? ? data = (data << 8) | *src++;
> - ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? if ((rc = write_data (info, wp, SWAP (data))) != 0) {
> - ? ? ? ? ? ? ? ? ? ? ? return (rc);
> - ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? wp += port_width;
> - ? ? ? ? ? ? ? cnt -= port_width;
> - ? ? ? ? ? ? ? if (count++ > 0x800) {
> - ? ? ? ? ? ? ? ? ? ? ? spin_wheel ();
> - ? ? ? ? ? ? ? ? ? ? ? count = 0;
> - ? ? ? ? ? ? ? }
> - ? ? ? }
> -
> - ? ? ? if (cnt == 0) {
> - ? ? ? ? ? ? ? return (0);
> - ? ? ? }
> -
> - ? ? ? /*
> - ? ? ? ?* handle unaligned tail bytes
> - ? ? ? ?*/
> - ? ? ? data = 0;
> - ? ? ? for (i = 0, cp = wp; i < port_width && cnt > 0; ++i, ++cp) {
> - ? ? ? ? ? ? ? data = (data << 8) | *src++;
> - ? ? ? ? ? ? ? --cnt;
> - ? ? ? }
> - ? ? ? for (; i < port_width; ++i, ++cp) {
> - ? ? ? ? ? ? ? data = (data << 8) | (*(uchar *) cp);
> - ? ? ? }
> -
> - ? ? ? return (write_data (info, wp, SWAP (data)));
> -}
> -
> -/*-----------------------------------------------------------------------
> - * Write a word or halfword to Flash, returns:
> - * 0 - OK
> - * 1 - write timeout
> - * 2 - Flash not erased
> - */
> -static int write_data (flash_info_t *info, ulong dest, FPW data)
> -{
> - ? ? ? FPWV *addr = (FPWV *) dest;
> - ? ? ? ulong status;
> - ? ? ? int flag;
> - ? ? ? ulong start;
> -
> - ? ? ? /* Check if Flash is (sufficiently) erased */
> - ? ? ? if ((*addr & data) != data) {
> - ? ? ? ? ? ? ? printf ("not erased at %08lx (%lx)\n", (ulong) addr, *addr);
> - ? ? ? ? ? ? ? return (2);
> - ? ? ? }
> - ? ? ? /* Disable interrupts which might cause a timeout here */
> - ? ? ? flag = disable_interrupts ();
> -
> - ? ? ? *addr = (FPW) 0x00400040; ? ? ? /* write setup */
> - ? ? ? *addr = data;
> -
> - ? ? ? /* arm simple, non interrupt dependent timer */
> - ? ? ? start = get_timer(0);
> -
> - ? ? ? /* wait while polling the status register */
> - ? ? ? while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
> - ? ? ? ? ? ? ? if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
> - ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00FF00FF; ? ? ? /* restore read mode */
> - ? ? ? ? ? ? ? ? ? ? ? return (1);
> - ? ? ? ? ? ? ? }
> - ? ? ? }
> -
> - ? ? ? *addr = (FPW) 0x00FF00FF; ? ? ? /* restore read mode */
> -
> - ? ? ? return (0);
> -}
> -
> -void inline spin_wheel (void)
> -{
> - ? ? ? static int p = 0;
> - ? ? ? static char w[] = "\\/-";
> -
> - ? ? ? printf ("\010%c", w[p]);
> - ? ? ? (++p == 3) ? (p = 0) : 0;
> -}
> diff --git a/boards.cfg b/boards.cfg
> index 7c63449..d65ca12 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -216,7 +216,6 @@ actux3 ? ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? ixp
> ?actux4 ? ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? ixp
> ?dvlhost ? ? ? ? ? ? ? ? ? ? ?arm ? ? ? ? ixp
> ?balloon3 ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? pxa
> -cerf250 ? ? ? ? ? ? ? ? ? ? ?arm ? ? ? ? pxa
> ?colibri_pxa270 ? ? ? ? ? ? ? arm ? ? ? ? pxa
> ?cradle ? ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? pxa
> ?lubbock ? ? ? ? ? ? ? ? ? ? ?arm ? ? ? ? pxa
> diff --git a/doc/README.scrapyard b/doc/README.scrapyard
> index cb5e4bc..232cd68 100644
> --- a/doc/README.scrapyard
> +++ b/doc/README.scrapyard
> @@ -11,6 +11,7 @@ easily if here is something they might want to dig for...
>
> ?Board ?Arch ? ?CPU ? ? removed ? ? Commit ? ? ?last known maintainer/contact
> ?=============================================================================
> +cerf250 arm ? ? pxa ? ? a3f1241 ? 2011-25-11 ? ?Prakash Kumar <prakash@embedx.com>
> ?mpq101 powerpc mpc85xx - ? ? ? ? 2011-10-23 ? ?Alex Dubov <oakad@yahoo.com>
> ?ixdpg425 arm ? ixp ? ? 0ca8eb7 ? 2011-09-22 ? ?Stefan Roese <sr@denx.de>
> ?ixdp425 arm ? ?ixp ? ? 0ca8eb7 ? 2011-09-22 ? ?Kyle Harris <kharris@nexus-tech.net>
> diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h
> deleted file mode 100644
> index 70427da..0000000
> --- a/include/configs/cerf250.h
> +++ /dev/null
> @@ -1,229 +0,0 @@
> -/*
> - * (C) Copyright 2002
> - * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
> - *
> - * (C) Copyright 2002
> - * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
> - * Marius Groeger <mgroeger@sysgo.de>
> - *
> - * Configuation settings for the CERF250 board.
> - *
> - * 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
> - */
> -
> -#ifndef __CONFIG_H
> -#define __CONFIG_H
> -
> -/*
> - * High Level Configuration Options
> - * (easy to change)
> - */
> -#define CONFIG_PXA250 ? ? ? ? ?1 ? ? ? /* This is an PXA250 CPU ? ?*/
> -#define CONFIG_CERF250 ? ? ? ? 1 ? ? ? /* on Cerf PXA Board ? ? ? ?*/
> -#define CONFIG_BOARD_LATE_INIT
> -#define CONFIG_BAUDRATE ? ? ? ? ? ? ? ?38400
> -#define ? ? ? ?CONFIG_SYS_TEXT_BASE ? ?0x0
> -
> -#undef CONFIG_USE_IRQ ? ? ? ? ? ? ? ? ?/* we don't need IRQ/FIQ stuff */
> -
> -/* we will never enable dcache, because we have to setup MMU first */
> -#define CONFIG_SYS_DCACHE_OFF
> -
> -/*
> - * Size of malloc() pool
> - */
> -#define CONFIG_SYS_MALLOC_LEN ? ? ?(CONFIG_ENV_SIZE + 128*1024)
> -
> -/*
> - * Hardware drivers
> - */
> -#define CONFIG_SMC91111
> -#define CONFIG_SMC91111_BASE 0x04000300
> -#define CONFIG_SMC_USE_32_BIT
> -
> -/*
> - * select serial console configuration
> - */
> -#define CONFIG_PXA_SERIAL
> -#define CONFIG_FFUART ? ? ? 1 ?/* we use FFUART on CERF PXA */
> -
> -/* allow to overwrite serial and ethaddr */
> -#define CONFIG_ENV_OVERWRITE
> -
> -/*
> - * BOOTP options
> - */
> -#define CONFIG_BOOTP_BOOTFILESIZE
> -#define CONFIG_BOOTP_BOOTPATH
> -#define CONFIG_BOOTP_GATEWAY
> -#define CONFIG_BOOTP_HOSTNAME
> -
> -
> -/*
> - * Command line configuration.
> - */
> -#include <config_cmd_default.h>
> -
> -
> -#define CONFIG_BOOTDELAY ? ? ? 3
> -#define CONFIG_ETHADDR ? ? ? ? 00:D0:CA:F1:3C:D2
> -#define CONFIG_NETMASK ? ? ? ? 255.255.255.0
> -#define CONFIG_IPADDR ? ? ? ? ?192.168.0.5
> -#define CONFIG_SERVERIP ? ? ? ? ? ? ? ?192.168.0.2
> -#define CONFIG_BOOTCOMMAND ? ? "bootm 0xC0000"
> -#define CONFIG_BOOTARGS ? ? ? ? ? ? ? ?"root=/dev/mtdblock3 rootfstype=jffs2 console=ttyS0,38400"
> -#define CONFIG_CMDLINE_TAG
> -
> -#if defined(CONFIG_CMD_KGDB)
> -#define CONFIG_KGDB_BAUDRATE ? 230400 ?/* speed to run kgdb serial port */
> -#define CONFIG_KGDB_SER_INDEX ?2 ? ? ? ? ? ? ? /* which serial port to use */
> -#endif
> -
> -/*
> - * Miscellaneous configurable options
> - */
> -#define CONFIG_SYS_HUSH_PARSER ? ? ? ? 1
> -#define CONFIG_SYS_PROMPT_HUSH_PS2 ? ? "> "
> -
> -#define CONFIG_SYS_LONGHELP ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?/* undef to save memory ? ? ? ? */
> -#ifdef CONFIG_SYS_HUSH_PARSER
> -#define CONFIG_SYS_PROMPT ? ? ? ? ? ? ? ? ? ? ?"uboot$ " ? ? ? /* Monitor Command Prompt */
> -#else
> -#define CONFIG_SYS_PROMPT ? ? ? ? ? ? ? ? ? ? ?"=> " ? ? ? ? ? /* Monitor Command Prompt */
> -#endif
> -#define CONFIG_SYS_CBSIZE ? ? ? ? ? ? ? ? ? ? ?256 ? ? ? ? ? ? ? ? ? ? /* Console I/O Buffer Size ? ? ?*/
> -#define CONFIG_SYS_PBSIZE ? ? ? ? ? ? ? ? ? ? ?(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* Print Buffer Size */
> -#define CONFIG_SYS_MAXARGS ? ? ? ? ? ? ? ? ? ? 16 ? ? ? ? ? ? ? ? ? ? ?/* max number of command args ? */
> -#define CONFIG_SYS_BARGSIZE ? ? ? ? ? ?CONFIG_SYS_CBSIZE ? ? ? /* Boot Argument Buffer Size ? ?*/
> -#define CONFIG_SYS_DEVICE_NULLDEV ? ? ?1
> -
> -#define CONFIG_SYS_MEMTEST_START ? ? ? 0xa0400000 ? ? ?/* memtest works on ? ? */
> -#define CONFIG_SYS_MEMTEST_END ? ? ? ? 0xa0800000 ? ? ?/* 4 ... 8 MB in DRAM ? */
> -
> -#define CONFIG_SYS_LOAD_ADDR ? ? ? ? ? 0xa2000000 ? ? ?/* default load address */
> -
> -#define CONFIG_SYS_HZ ? ? ? ? ? ? ? ? ?1000
> -#define CONFIG_SYS_CPUSPEED ? ? ? ? ? ?0x141 ? ? ? ? ? /* set core clock to 400/200/100 MHz */
> -
> -#define CONFIG_SYS_BAUDRATE_TABLE ? ? ?{ 9600, 19200, 38400, 57600, 115200 }
> -
> -
> -/*
> - * Stack sizes
> - *
> - * The stack sizes are set up in start.S using the settings below
> - */
> -#define CONFIG_STACKSIZE ? ? ? ? ? ? ? (128*1024) ? ? ?/* regular stack */
> -#ifdef CONFIG_USE_IRQ
> -#define CONFIG_STACKSIZE_IRQ ? (4*1024) ? ? ? ?/* IRQ stack */
> -#define CONFIG_STACKSIZE_FIQ ? (4*1024) ? ? ? ?/* FIQ stack */
> -#endif
> -
> -/*
> - * Physical Memory Map
> - */
> -#define CONFIG_NR_DRAM_BANKS ? ? ? ? ? 1 ? ? ? ? ? ? ? /* we have 1 bank of DRAM */
> -#define PHYS_SDRAM_1 ? ? ? ? ? ? ? ? ? 0xa0000000 ? ? ?/* SDRAM Bank #1 */
> -#define PHYS_SDRAM_1_SIZE ? ? ? ? ? ? ?0x04000000 ? ? ?/* 64 MB */
> -
> -#define PHYS_FLASH_1 ? ? ? ? ? ? ? ? ? 0x00000000 ? ? ?/* Flash Bank #1 */
> -#define PHYS_FLASH_2 ? ? ? ? ? ? ? ? ? 0x04000000 ? ? ?/* Flash Bank #2 */
> -#define PHYS_FLASH_SIZE ? ? ? ? ? ? ? ? ? ? ? ?0x02000000 ? ? ?/* 32 MB */
> -#define PHYS_FLASH_BANK_SIZE ? ? ? ? ? 0x02000000 ? ? ?/* 32 MB Banks */
> -#define PHYS_FLASH_SECT_SIZE ? ? ? ? ? 0x00040000 ? ? ?/* 256 KB sectors (x2) */
> -
> -#define CONFIG_SYS_DRAM_BASE ? ? ? ? ? ? ? ? ? 0xa0000000
> -#define CONFIG_SYS_DRAM_SIZE ? ? ? ? ? ? ? ? ? 0x04000000
> -
> -#define CONFIG_SYS_FLASH_BASE ? ? ? ? ? ? ? ? ?PHYS_FLASH_1
> -
> -#define CONFIG_SYS_SDRAM_BASE ? ? ? ? ?PHYS_SDRAM_1
> -#define ? ? ? ?CONFIG_SYS_INIT_SP_ADDR ? ? ? ? (GENERATED_GBL_DATA_SIZE + PHYS_SDRAM_1)
> -
> -/*
> - * GPIO settings
> - */
> -
> -
> -#define CONFIG_SYS_GPSR0_VAL ? ? ? ? ? 0x00408030
> -#define CONFIG_SYS_GPSR1_VAL ? ? ? ? ? 0x00BFA882
> -#define CONFIG_SYS_GPSR2_VAL ? ? ? ? ? 0x0001C000
> -#define CONFIG_SYS_GPCR0_VAL ? ? ? ? ? 0xC0031100
> -#define CONFIG_SYS_GPCR1_VAL ? ? ? ? ? 0xFC400300
> -#define CONFIG_SYS_GPCR2_VAL ? ? ? ? ? 0x00003FFF
> -#define CONFIG_SYS_GPDR0_VAL ? ? ? ? ? 0xC0439330
> -#define CONFIG_SYS_GPDR1_VAL ? ? ? ? ? 0xFCFFAB82
> -#define CONFIG_SYS_GPDR2_VAL ? ? ? ? ? 0x0001FFFF
> -#define CONFIG_SYS_GAFR0_L_VAL ? ? ? ? 0x80000000
> -#define CONFIG_SYS_GAFR0_U_VAL ? ? ? ? 0xA5000010
> -#define CONFIG_SYS_GAFR1_L_VAL ? ? ? ? 0x60008018
> -#define CONFIG_SYS_GAFR1_U_VAL ? ? ? ? 0xAAA5AAAA
> -#define CONFIG_SYS_GAFR2_L_VAL ? ? ? ? 0xAAA0000A
> -#define CONFIG_SYS_GAFR2_U_VAL ? ? ? ? 0x00000002
> -
> -#define CONFIG_SYS_PSSR_VAL ? ? ? ? ? ?0x20
> -
> -#define ? ? ? ?CONFIG_SYS_CCCR ? ? ? ? ? ? ? ? CCCR_L27|CCCR_M2|CCCR_N10
> -#define ? ? ? ?CONFIG_SYS_CKEN ? ? ? ? ? ? ? ? 0x0
> -
> -/*
> - * Memory settings
> - */
> -#define CONFIG_SYS_MSC0_VAL ? ? ? ? ? ?0x12447FF0
> -#define CONFIG_SYS_MSC1_VAL ? ? ? ? ? ?0x12BC5554
> -#define CONFIG_SYS_MSC2_VAL ? ? ? ? ? ?0x7FF97FF1
> -#define CONFIG_SYS_MDCNFG_VAL ? ? ? ? ?0x00001AC9
> -#define CONFIG_SYS_MDREFR_VAL ? ? ? ? ?0x03CDC017
> -#define CONFIG_SYS_MDMRS_VAL ? ? ? ? ? 0x00000000
> -#define ? ? ? ?CONFIG_SYS_FLYCNFG_VAL ? ? ? ? ?0x00000000
> -#define ? ? ? ?CONFIG_SYS_SXCNFG_VAL ? ? ? ? ? 0x00000000
> -
> -/*
> - * PCMCIA and CF Interfaces
> - */
> -#define CONFIG_SYS_MECR_VAL ? ? ? ? ? ?0x00000000
> -#define CONFIG_SYS_MCMEM0_VAL ? ? ? ? ?0x00010504
> -#define CONFIG_SYS_MCMEM1_VAL ? ? ? ? ?0x00010504
> -#define CONFIG_SYS_MCATT0_VAL ? ? ? ? ?0x00010504
> -#define CONFIG_SYS_MCATT1_VAL ? ? ? ? ?0x00010504
> -#define CONFIG_SYS_MCIO0_VAL ? ? ? ? ? 0x00004715
> -#define CONFIG_SYS_MCIO1_VAL ? ? ? ? ? 0x00004715
> -
> -#define _LED ? ? ? ? ? ? ? ? ? 0x08000010 ? ? ?/*check this */
> -#define LED_BLANK ? ? ? ? ? ? ?0x08000040
> -#define LED_GPIO ? ? ? ? ? ? ? 0x10
> -
> -/*
> - * FLASH and environment organization
> - */
> -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 1 ? ? ? /* max number of memory banks ? ? ? ? ? */
> -#define CONFIG_SYS_MAX_FLASH_SECT ? ? ?128 ? ? /* max number of sectors on one chip ? ?*/
> -
> -/* timeout values are in ticks */
> -#define CONFIG_SYS_FLASH_ERASE_TOUT ? ?(25*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
> -#define CONFIG_SYS_FLASH_WRITE_TOUT ? ?(25*CONFIG_SYS_HZ) /* Timeout for Flash Write */
> -
> -#define CONFIG_SYS_MONITOR_LEN ? ? ? ? 0x40000 ? ? ? ? /* 256 KiB */
> -#define CONFIG_ENV_IS_IN_FLASH 1
> -#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ?(PHYS_FLASH_1 + CONFIG_SYS_MONITOR_LEN)
> -#define CONFIG_ENV_SIZE ? ? ? ? ? ? ? ?0x40000 /* Total Size of Environment Sector ? ? */
> -
> -
> -#endif /* __CONFIG_H */
> --
> 1.7.7.1
>
>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board
  2011-11-28 17:12 ` [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board Simon Glass
@ 2011-11-28 17:21   ` Marek Vasut
  2011-11-28 17:23     ` Simon Glass
  0 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2011-11-28 17:21 UTC (permalink / raw)
  To: u-boot

> Hi Marek,
> 
> On Fri, Nov 25, 2011 at 10:53 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> > The board is unmaintained and maintainer doesn't respond.
> 
> Should this and the other patches be version 2, or perhaps 3?

Probably.
> 
> Also I like Mike's suggested phrasing (something like "The board
> doesn't build and maintainer doesn't respond") since if it built OK we
> would presumably just leave it.

I think they don't build, at least that's how it was when I recently tried. And 
since I don't see any opposing force, let's drop them.

M
> 
> Regards,
> Simon
> 
> > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> > Cc: Simon Glass <sjg@chromium.org>
> > Cc: Anatolij Gustschin <agust@denx.de>
> > ---
> >  MAINTAINERS               |    4 -
> >  board/cerf250/Makefile    |   43 -----
> >  board/cerf250/cerf250.c   |   85 ---------
> >  board/cerf250/flash.c     |  429
> > --------------------------------------------- boards.cfg              
> >  |    1 -
> >  doc/README.scrapyard      |    1 +
> >  include/configs/cerf250.h |  229 ------------------------
> >  7 files changed, 1 insertions(+), 791 deletions(-)
> >  delete mode 100644 board/cerf250/Makefile
> >  delete mode 100644 board/cerf250/cerf250.c
> >  delete mode 100644 board/cerf250/flash.c
> >  delete mode 100644 include/configs/cerf250.h
> > 
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 37bbb34..3835154 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -711,10 +711,6 @@ Sergey Kubushyn <ksi@koi8.net>
> >        SONATA          ARM926EJS
> >        SCHMOOGIE       ARM926EJS
> > 
> > -Prakash Kumar <prakash@embedx.com>
> > -
> > -       cerf250         xscale/pxa
> > -
> >  Vipin Kumar <vipin.kumar@st.com>
> > 
> >        spear300        ARM926EJS (spear300 Soc)
> > diff --git a/board/cerf250/Makefile b/board/cerf250/Makefile
> > deleted file mode 100644
> > index cf4742e..0000000
> > --- a/board/cerf250/Makefile
> > +++ /dev/null
> > @@ -1,43 +0,0 @@
> > -#
> > -# (C) Copyright 2000-2006
> > -# Wolfgang Denk, DENX Software Engineering, wd at 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    = $(obj)lib$(BOARD).o
> > -
> > -COBJS  := cerf250.o flash.o
> > -
> > -SRCS   := $(COBJS:.o=.c)
> > -OBJS   := $(addprefix $(obj),$(COBJS))
> > -
> > -$(LIB):        $(obj).depend $(OBJS)
> > -       $(call cmd_link_o_target, $(OBJS))
> > -
> > -########################################################################
> > # -
> > -# defines $(obj).depend target
> > -include $(SRCTREE)/rules.mk
> > -
> > -sinclude $(obj).depend
> > -
> > -########################################################################
> > # diff --git a/board/cerf250/cerf250.c b/board/cerf250/cerf250.c
> > deleted file mode 100644
> > index 043afea..0000000
> > --- a/board/cerf250/cerf250.c
> > +++ /dev/null
> > @@ -1,85 +0,0 @@
> > -/*
> > - * (C) Copyright 2002
> > - * Kyle Harris, Nexus Technologies, Inc. kharris at 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>
> > -#include <netdev.h>
> > -
> > -DECLARE_GLOBAL_DATA_PTR;
> > -
> > -/*
> > ------------------------------------------------------------------------
> > - */ -
> > -
> > -/*
> > - * Miscelaneous platform dependent initialisations
> > - */
> > -
> > -int board_init (void)
> > -{
> > -       /* We have RAM, disable cache */
> > -       dcache_disable();
> > -       icache_disable();
> > -
> > -       /* arch number of cerf PXA Board */
> > -       gd->bd->bi_arch_number = MACH_TYPE_PXA_CERF;
> > -
> > -       /* adress of boot parameters */
> > -       gd->bd->bi_boot_params = 0xa0000100;
> > -
> > -       return 0;
> > -}
> > -
> > -int board_late_init(void)
> > -{
> > -       setenv("stdout", "serial");
> > -       setenv("stderr", "serial");
> > -       return 0;
> > -}
> > -
> > -extern void pxa_dram_init(void);
> > -int dram_init(void)
> > -{
> > -       pxa_dram_init();
> > -       gd->ram_size = PHYS_SDRAM_1_SIZE;
> > -       return 0;
> > -}
> > -
> > -void dram_init_banksize(void)
> > -{
> > -       gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
> > -       gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
> > -}
> > -
> > -#ifdef CONFIG_CMD_NET
> > -int board_eth_init(bd_t *bis)
> > -{
> > -       int rc = 0;
> > -#ifdef CONFIG_SMC91111
> > -       rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
> > -#endif
> > -       return rc;
> > -}
> > -#endif
> > diff --git a/board/cerf250/flash.c b/board/cerf250/flash.c
> > deleted file mode 100644
> > index e1e7807..0000000
> > --- a/board/cerf250/flash.c
> > +++ /dev/null
> > @@ -1,429 +0,0 @@
> > -/*
> > - * (C) Copyright 2001
> > - * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
> > - *
> > - * (C) Copyright 2001
> > - * Wolfgang Denk, DENX Software Engineering, wd at 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 <common.h>
> > -#include <linux/byteorder/swab.h>
> > -
> > -
> > -flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];   /* info for FLASH
> > chips    */ -
> > -/* Board support for 1 or 2 flash devices */
> > -#define FLASH_PORT_WIDTH32
> > -#undef FLASH_PORT_WIDTH16
> > -
> > -#ifdef FLASH_PORT_WIDTH16
> > -#define FLASH_PORT_WIDTH               ushort
> > -#define FLASH_PORT_WIDTHV              vu_short
> > -#define SWAP(x)               __swab16(x)
> > -#else
> > -#define FLASH_PORT_WIDTH               ulong
> > -#define FLASH_PORT_WIDTHV              vu_long
> > -#define SWAP(x)               __swab32(x)
> > -#endif
> > -
> > -#define FPW       FLASH_PORT_WIDTH
> > -#define FPWV   FLASH_PORT_WIDTHV
> > -
> > -#define mb() __asm__ __volatile__ ("" : : : "memory")
> > -
> > -/*----------------------------------------------------------------------
> > - - * Functions
> > - */
> > -static ulong flash_get_size (FPW *addr, flash_info_t *info);
> > -static int write_data (flash_info_t *info, ulong dest, FPW data);
> > -static void flash_get_offsets (ulong base, flash_info_t *info);
> > -void inline spin_wheel (void);
> > -
> > -/*----------------------------------------------------------------------
> > - - */
> > -
> > -unsigned long flash_init (void)
> > -{
> > -       int i;
> > -       ulong size = 0;
> > -
> > -       for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
> > -               switch (i) {
> > -               case 0:
> > -                       flash_get_size ((FPW *) PHYS_FLASH_1,
> > &flash_info[i]); -                       flash_get_offsets
> > (PHYS_FLASH_1, &flash_info[i]); -                       break;
> > -               case 1:
> > -                       flash_get_size ((FPW *) PHYS_FLASH_2,
> > &flash_info[i]); -                       flash_get_offsets
> > (PHYS_FLASH_2, &flash_info[i]); -                       break;
> > -               default:
> > -                       panic ("configured too many flash banks!\n");
> > -                       break;
> > -               }
> > -               size += flash_info[i].size;
> > -       }
> > -
> > -       /* Protect monitor and environment sectors
> > -        */
> > -       flash_protect ( FLAG_PROTECT_SET,
> > -                       CONFIG_SYS_FLASH_BASE,
> > -                       CONFIG_SYS_FLASH_BASE + monitor_flash_len - 1,
> > -                       &flash_info[0] );
> > -
> > -       flash_protect ( FLAG_PROTECT_SET,
> > -                       CONFIG_ENV_ADDR,
> > -                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
> > &flash_info[0] ); -
> > -       return size;
> > -}
> > -
> > -/*----------------------------------------------------------------------
> > - - */
> > -static void flash_get_offsets (ulong base, flash_info_t *info)
> > -{
> > -       int i;
> > -
> > -       if (info->flash_id == FLASH_UNKNOWN) {
> > -               return;
> > -       }
> > -
> > -       if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
> > -               for (i = 0; i < info->sector_count; i++) {
> > -                       info->start[i] = base + (i *
> > PHYS_FLASH_SECT_SIZE); -                       info->protect[i] = 0;
> > -               }
> > -       }
> > -}
> > -
> > -/*----------------------------------------------------------------------
> > - - */
> > -void flash_print_info (flash_info_t *info)
> > -{
> > -       int i;
> > -
> > -       if (info->flash_id == FLASH_UNKNOWN) {
> > -               printf ("missing or unknown FLASH type\n");
> > -               return;
> > -       }
> > -
> > -       switch (info->flash_id & FLASH_VENDMASK) {
> > -       case FLASH_MAN_INTEL:
> > -               printf ("INTEL ");
> > -               break;
> > -       default:
> > -               printf ("Unknown Vendor ");
> > -               break;
> > -       }
> > -
> > -       switch (info->flash_id & FLASH_TYPEMASK) {
> > -       case FLASH_28F128J3A:
> > -               printf ("28F128J3A\n");
> > -               break;
> > -       default:
> > -               printf ("Unknown Chip Type\n");
> > -               break;
> > -       }
> > -
> > -       printf ("  Size: %ld MB in %d Sectors\n",
> > -                       info->size >> 20, info->sector_count);
> > -
> > -       printf ("  Sector Start Addresses:");
> > -       for (i = 0; i < info->sector_count; ++i) {
> > -               if ((i % 5) == 0)
> > -                       printf ("\n   ");
> > -               printf (" %08lX%s",
> > -                       info->start[i],
> > -                       info->protect[i] ? " (RO)" : "     ");
> > -       }
> > -       printf ("\n");
> > -       return;
> > -}
> > -
> > -/*
> > - * The following code cannot be run from FLASH!
> > - */
> > -static ulong flash_get_size (FPW *addr, flash_info_t *info)
> > -{
> > -       volatile FPW value;
> > -
> > -       /* Write auto select command: read Manufacturer ID */
> > -       addr[0x5555] = (FPW) 0x00AA00AA;
> > -       addr[0x2AAA] = (FPW) 0x00550055;
> > -       addr[0x5555] = (FPW) 0x00900090;
> > -
> > -       mb ();
> > -       value = addr[0];
> > -
> > -       switch (value) {
> > -
> > -       case (FPW) INTEL_MANUFACT:
> > -               info->flash_id = FLASH_MAN_INTEL;
> > -               break;
> > -
> > -       default:
> > -               info->flash_id = FLASH_UNKNOWN;
> > -               info->sector_count = 0;
> > -               info->size = 0;
> > -               addr[0] = (FPW) 0x00FF00FF;     /* restore read mode */
> > -               return (0);                     /* no or unknown flash
> >  */ -       }
> > -
> > -       mb ();
> > -       value = addr[1];                        /* device ID        */
> > -
> > -       switch (value) {
> > -
> > -       case (FPW) INTEL_ID_28F128J3A:
> > -               info->flash_id += FLASH_28F128J3A;
> > -               info->sector_count = 128;
> > -               info->size = 0x02000000;
> > -               break;                          /* => 16 MB     */
> > -
> > -       default:
> > -               info->flash_id = FLASH_UNKNOWN;
> > -               break;
> > -       }
> > -
> > -       if (info->sector_count > CONFIG_SYS_MAX_FLASH_SECT) {
> > -               printf ("** ERROR: sector count %d > max (%d) **\n",
> > -                       info->sector_count, CONFIG_SYS_MAX_FLASH_SECT);
> > -               info->sector_count = CONFIG_SYS_MAX_FLASH_SECT;
> > -       }
> > -
> > -       addr[0] = (FPW) 0x00FF00FF;             /* restore read mode */
> > -
> > -       return (info->size);
> > -}
> > -
> > -
> > -/*----------------------------------------------------------------------
> > - - */
> > -
> > -int flash_erase (flash_info_t *info, int s_first, int s_last)
> > -{
> > -       int flag, prot, sect;
> > -       ulong type, start;
> > -       int rcode = 0;
> > -
> > -       if ((s_first < 0) || (s_first > s_last)) {
> > -               if (info->flash_id == FLASH_UNKNOWN) {
> > -                       printf ("- missing\n");
> > -               } else {
> > -                       printf ("- no sectors to erase\n");
> > -               }
> > -               return 1;
> > -       }
> > -
> > -       type = (info->flash_id & FLASH_VENDMASK);
> > -       if ((type != FLASH_MAN_INTEL)) {
> > -               printf ("Can't erase unknown flash type %08lx -
> > aborted\n", -                       info->flash_id);
> > -               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");
> > -       }
> > -
> > -       /* Disable interrupts which might cause a timeout here */
> > -       flag = disable_interrupts ();
> > -
> > -       /* Start erase on unprotected sectors */
> > -       for (sect = s_first; sect <= s_last; sect++) {
> > -               if (info->protect[sect] == 0) { /* not protected */
> > -                       FPWV *addr = (FPWV *) (info->start[sect]);
> > -                       FPW status;
> > -
> > -                       printf ("Erasing sector %2d ... ", sect);
> > -
> > -                       /* arm simple, non interrupt dependent timer */
> > -                       start = get_timer(0);
> > -
> > -                       *addr = (FPW) 0x00500050;       /* clear status
> > register */ -                       *addr = (FPW) 0x00200020;       /*
> > erase setup */ -                       *addr = (FPW) 0x00D000D0;      
> > /* erase confirm */ -
> > -                       while (((status = *addr) & (FPW) 0x00800080) !=
> > (FPW) 0x00800080) { -                               if (get_timer(start)
> > > CONFIG_SYS_FLASH_ERASE_TOUT) { -                                      
> > printf ("Timeout\n");
> > -                                       *addr = (FPW) 0x00B000B0;      
> > /* suspend erase     */ -                                       *addr =
> > (FPW) 0x00FF00FF;       /* reset to read mode */ -                      
> >                 rcode = 1;
> > -                                       break;
> > -                               }
> > -                       }
> > -
> > -                       *addr = 0x00500050;     /* clear status register
> > cmd.   */ -                       *addr = 0x00FF00FF;     /* resest to
> > read mode          */ -
> > -                       printf (" done\n");
> > -               }
> > -       }
> > -       return rcode;
> > -}
> > -
> > -/*----------------------------------------------------------------------
> > - - * Copy memory to flash, returns:
> > - * 0 - OK
> > - * 1 - write timeout
> > - * 2 - Flash not erased
> > - * 4 - Flash not identified
> > - */
> > -
> > -int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
> > -{
> > -       ulong cp, wp;
> > -       FPW data;
> > -       int count, i, l, rc, port_width;
> > -
> > -       if (info->flash_id == FLASH_UNKNOWN) {
> > -               return 4;
> > -       }
> > -/* get lower word aligned address */
> > -#ifdef FLASH_PORT_WIDTH16
> > -       wp = (addr & ~1);
> > -       port_width = 2;
> > -#else
> > -       wp = (addr & ~3);
> > -       port_width = 4;
> > -#endif
> > -
> > -       /*
> > -        * handle unaligned start bytes
> > -        */
> > -       if ((l = addr - wp) != 0) {
> > -               data = 0;
> > -               for (i = 0, cp = wp; i < l; ++i, ++cp) {
> > -                       data = (data << 8) | (*(uchar *) cp);
> > -               }
> > -               for (; i < port_width && cnt > 0; ++i) {
> > -                       data = (data << 8) | *src++;
> > -                       --cnt;
> > -                       ++cp;
> > -               }
> > -               for (; cnt == 0 && i < port_width; ++i, ++cp) {
> > -                       data = (data << 8) | (*(uchar *) cp);
> > -               }
> > -
> > -               if ((rc = write_data (info, wp, SWAP (data))) != 0) {
> > -                       return (rc);
> > -               }
> > -               wp += port_width;
> > -       }
> > -
> > -       /*
> > -        * handle word aligned part
> > -        */
> > -       count = 0;
> > -       while (cnt >= port_width) {
> > -               data = 0;
> > -               for (i = 0; i < port_width; ++i) {
> > -                       data = (data << 8) | *src++;
> > -               }
> > -               if ((rc = write_data (info, wp, SWAP (data))) != 0) {
> > -                       return (rc);
> > -               }
> > -               wp += port_width;
> > -               cnt -= port_width;
> > -               if (count++ > 0x800) {
> > -                       spin_wheel ();
> > -                       count = 0;
> > -               }
> > -       }
> > -
> > -       if (cnt == 0) {
> > -               return (0);
> > -       }
> > -
> > -       /*
> > -        * handle unaligned tail bytes
> > -        */
> > -       data = 0;
> > -       for (i = 0, cp = wp; i < port_width && cnt > 0; ++i, ++cp) {
> > -               data = (data << 8) | *src++;
> > -               --cnt;
> > -       }
> > -       for (; i < port_width; ++i, ++cp) {
> > -               data = (data << 8) | (*(uchar *) cp);
> > -       }
> > -
> > -       return (write_data (info, wp, SWAP (data)));
> > -}
> > -
> > -/*----------------------------------------------------------------------
> > - - * Write a word or halfword to Flash, returns:
> > - * 0 - OK
> > - * 1 - write timeout
> > - * 2 - Flash not erased
> > - */
> > -static int write_data (flash_info_t *info, ulong dest, FPW data)
> > -{
> > -       FPWV *addr = (FPWV *) dest;
> > -       ulong status;
> > -       int flag;
> > -       ulong start;
> > -
> > -       /* Check if Flash is (sufficiently) erased */
> > -       if ((*addr & data) != data) {
> > -               printf ("not erased at %08lx (%lx)\n", (ulong) addr,
> > *addr); -               return (2);
> > -       }
> > -       /* Disable interrupts which might cause a timeout here */
> > -       flag = disable_interrupts ();
> > -
> > -       *addr = (FPW) 0x00400040;       /* write setup */
> > -       *addr = data;
> > -
> > -       /* arm simple, non interrupt dependent timer */
> > -       start = get_timer(0);
> > -
> > -       /* wait while polling the status register */
> > -       while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080)
> > { -               if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
> > -                       *addr = (FPW) 0x00FF00FF;       /* restore read
> > mode */ -                       return (1);
> > -               }
> > -       }
> > -
> > -       *addr = (FPW) 0x00FF00FF;       /* restore read mode */
> > -
> > -       return (0);
> > -}
> > -
> > -void inline spin_wheel (void)
> > -{
> > -       static int p = 0;
> > -       static char w[] = "\\/-";
> > -
> > -       printf ("\010%c", w[p]);
> > -       (++p == 3) ? (p = 0) : 0;
> > -}
> > diff --git a/boards.cfg b/boards.cfg
> > index 7c63449..d65ca12 100644
> > --- a/boards.cfg
> > +++ b/boards.cfg
> > @@ -216,7 +216,6 @@ actux3                       arm         ixp
> >  actux4                       arm         ixp
> >  dvlhost                      arm         ixp
> >  balloon3                     arm         pxa
> > -cerf250                      arm         pxa
> >  colibri_pxa270               arm         pxa
> >  cradle                       arm         pxa
> >  lubbock                      arm         pxa
> > diff --git a/doc/README.scrapyard b/doc/README.scrapyard
> > index cb5e4bc..232cd68 100644
> > --- a/doc/README.scrapyard
> > +++ b/doc/README.scrapyard
> > @@ -11,6 +11,7 @@ easily if here is something they might want to dig
> > for...
> > 
> >  Board  Arch    CPU     removed     Commit      last known
> > maintainer/contact
> > ========================================================================
> > ===== +cerf250 arm     pxa     a3f1241   2011-25-11    Prakash Kumar
> > <prakash@embedx.com> mpq101 powerpc mpc85xx -         2011-10-23    Alex
> > Dubov <oakad@yahoo.com> ixdpg425 arm   ixp     0ca8eb7   2011-09-22  
> >  Stefan Roese <sr@denx.de> ixdp425 arm    ixp     0ca8eb7   2011-09-22  
> >  Kyle Harris <kharris@nexus-tech.net> diff --git
> > a/include/configs/cerf250.h b/include/configs/cerf250.h deleted file
> > mode 100644
> > index 70427da..0000000
> > --- a/include/configs/cerf250.h
> > +++ /dev/null
> > @@ -1,229 +0,0 @@
> > -/*
> > - * (C) Copyright 2002
> > - * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
> > - *
> > - * (C) Copyright 2002
> > - * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
> > - * Marius Groeger <mgroeger@sysgo.de>
> > - *
> > - * Configuation settings for the CERF250 board.
> > - *
> > - * 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
> > - */
> > -
> > -#ifndef __CONFIG_H
> > -#define __CONFIG_H
> > -
> > -/*
> > - * High Level Configuration Options
> > - * (easy to change)
> > - */
> > -#define CONFIG_PXA250          1       /* This is an PXA250 CPU    */
> > -#define CONFIG_CERF250         1       /* on Cerf PXA Board        */
> > -#define CONFIG_BOARD_LATE_INIT
> > -#define CONFIG_BAUDRATE                38400
> > -#define        CONFIG_SYS_TEXT_BASE    0x0
> > -
> > -#undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff */
> > -
> > -/* we will never enable dcache, because we have to setup MMU first */
> > -#define CONFIG_SYS_DCACHE_OFF
> > -
> > -/*
> > - * Size of malloc() pool
> > - */
> > -#define CONFIG_SYS_MALLOC_LEN      (CONFIG_ENV_SIZE + 128*1024)
> > -
> > -/*
> > - * Hardware drivers
> > - */
> > -#define CONFIG_SMC91111
> > -#define CONFIG_SMC91111_BASE 0x04000300
> > -#define CONFIG_SMC_USE_32_BIT
> > -
> > -/*
> > - * select serial console configuration
> > - */
> > -#define CONFIG_PXA_SERIAL
> > -#define CONFIG_FFUART       1  /* we use FFUART on CERF PXA */
> > -
> > -/* allow to overwrite serial and ethaddr */
> > -#define CONFIG_ENV_OVERWRITE
> > -
> > -/*
> > - * BOOTP options
> > - */
> > -#define CONFIG_BOOTP_BOOTFILESIZE
> > -#define CONFIG_BOOTP_BOOTPATH
> > -#define CONFIG_BOOTP_GATEWAY
> > -#define CONFIG_BOOTP_HOSTNAME
> > -
> > -
> > -/*
> > - * Command line configuration.
> > - */
> > -#include <config_cmd_default.h>
> > -
> > -
> > -#define CONFIG_BOOTDELAY       3
> > -#define CONFIG_ETHADDR         00:D0:CA:F1:3C:D2
> > -#define CONFIG_NETMASK         255.255.255.0
> > -#define CONFIG_IPADDR          192.168.0.5
> > -#define CONFIG_SERVERIP                192.168.0.2
> > -#define CONFIG_BOOTCOMMAND     "bootm 0xC0000"
> > -#define CONFIG_BOOTARGS                "root=/dev/mtdblock3
> > rootfstype=jffs2 console=ttyS0,38400" -#define CONFIG_CMDLINE_TAG
> > -
> > -#if defined(CONFIG_CMD_KGDB)
> > -#define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port
> > */ -#define CONFIG_KGDB_SER_INDEX  2               /* which serial port
> > to use */ -#endif
> > -
> > -/*
> > - * Miscellaneous configurable options
> > - */
> > -#define CONFIG_SYS_HUSH_PARSER         1
> > -#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
> > -
> > -#define CONFIG_SYS_LONGHELP                                    /* undef
> > to save memory         */ -#ifdef CONFIG_SYS_HUSH_PARSER
> > -#define CONFIG_SYS_PROMPT                      "uboot$ "       /*
> > Monitor Command Prompt */ -#else
> > -#define CONFIG_SYS_PROMPT                      "=> "           /*
> > Monitor Command Prompt */ -#endif
> > -#define CONFIG_SYS_CBSIZE                      256                    
> > /* Console I/O Buffer Size      */ -#define CONFIG_SYS_PBSIZE          
> >            (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) -          
> >                                                                     /*
> > Print Buffer Size */ -#define CONFIG_SYS_MAXARGS                     16
> >                      /* max number of command args   */ -#define
> > CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE       /* Boot Argument
> > Buffer Size    */ -#define CONFIG_SYS_DEVICE_NULLDEV      1
> > -
> > -#define CONFIG_SYS_MEMTEST_START       0xa0400000      /* memtest works
> > on     */ -#define CONFIG_SYS_MEMTEST_END         0xa0800000      /* 4
> > ... 8 MB in DRAM   */ -
> > -#define CONFIG_SYS_LOAD_ADDR           0xa2000000      /* default load
> > address */ -
> > -#define CONFIG_SYS_HZ                  1000
> > -#define CONFIG_SYS_CPUSPEED            0x141           /* set core clock
> > to 400/200/100 MHz */ -
> > -#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600,
> > 115200 } -
> > -
> > -/*
> > - * Stack sizes
> > - *
> > - * The stack sizes are set up in start.S using the settings below
> > - */
> > -#define CONFIG_STACKSIZE               (128*1024)      /* regular stack
> > */ -#ifdef CONFIG_USE_IRQ
> > -#define CONFIG_STACKSIZE_IRQ   (4*1024)        /* IRQ stack */
> > -#define CONFIG_STACKSIZE_FIQ   (4*1024)        /* FIQ stack */
> > -#endif
> > -
> > -/*
> > - * Physical Memory Map
> > - */
> > -#define CONFIG_NR_DRAM_BANKS           1               /* we have 1 bank
> > of DRAM */ -#define PHYS_SDRAM_1                   0xa0000000      /*
> > SDRAM Bank #1 */ -#define PHYS_SDRAM_1_SIZE              0x04000000    
> >  /* 64 MB */ -
> > -#define PHYS_FLASH_1                   0x00000000      /* Flash Bank #1
> > */ -#define PHYS_FLASH_2                   0x04000000      /* Flash Bank
> > #2 */ -#define PHYS_FLASH_SIZE                        0x02000000      /*
> > 32 MB */ -#define PHYS_FLASH_BANK_SIZE           0x02000000      /* 32
> > MB Banks */ -#define PHYS_FLASH_SECT_SIZE           0x00040000      /*
> > 256 KB sectors (x2) */ -
> > -#define CONFIG_SYS_DRAM_BASE                   0xa0000000
> > -#define CONFIG_SYS_DRAM_SIZE                   0x04000000
> > -
> > -#define CONFIG_SYS_FLASH_BASE                  PHYS_FLASH_1
> > -
> > -#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
> > -#define        CONFIG_SYS_INIT_SP_ADDR         (GENERATED_GBL_DATA_SIZE
> > + PHYS_SDRAM_1) -
> > -/*
> > - * GPIO settings
> > - */
> > -
> > -
> > -#define CONFIG_SYS_GPSR0_VAL           0x00408030
> > -#define CONFIG_SYS_GPSR1_VAL           0x00BFA882
> > -#define CONFIG_SYS_GPSR2_VAL           0x0001C000
> > -#define CONFIG_SYS_GPCR0_VAL           0xC0031100
> > -#define CONFIG_SYS_GPCR1_VAL           0xFC400300
> > -#define CONFIG_SYS_GPCR2_VAL           0x00003FFF
> > -#define CONFIG_SYS_GPDR0_VAL           0xC0439330
> > -#define CONFIG_SYS_GPDR1_VAL           0xFCFFAB82
> > -#define CONFIG_SYS_GPDR2_VAL           0x0001FFFF
> > -#define CONFIG_SYS_GAFR0_L_VAL         0x80000000
> > -#define CONFIG_SYS_GAFR0_U_VAL         0xA5000010
> > -#define CONFIG_SYS_GAFR1_L_VAL         0x60008018
> > -#define CONFIG_SYS_GAFR1_U_VAL         0xAAA5AAAA
> > -#define CONFIG_SYS_GAFR2_L_VAL         0xAAA0000A
> > -#define CONFIG_SYS_GAFR2_U_VAL         0x00000002
> > -
> > -#define CONFIG_SYS_PSSR_VAL            0x20
> > -
> > -#define        CONFIG_SYS_CCCR                 CCCR_L27|CCCR_M2|CCCR_N10
> > -#define        CONFIG_SYS_CKEN                 0x0
> > -
> > -/*
> > - * Memory settings
> > - */
> > -#define CONFIG_SYS_MSC0_VAL            0x12447FF0
> > -#define CONFIG_SYS_MSC1_VAL            0x12BC5554
> > -#define CONFIG_SYS_MSC2_VAL            0x7FF97FF1
> > -#define CONFIG_SYS_MDCNFG_VAL          0x00001AC9
> > -#define CONFIG_SYS_MDREFR_VAL          0x03CDC017
> > -#define CONFIG_SYS_MDMRS_VAL           0x00000000
> > -#define        CONFIG_SYS_FLYCNFG_VAL          0x00000000
> > -#define        CONFIG_SYS_SXCNFG_VAL           0x00000000
> > -
> > -/*
> > - * PCMCIA and CF Interfaces
> > - */
> > -#define CONFIG_SYS_MECR_VAL            0x00000000
> > -#define CONFIG_SYS_MCMEM0_VAL          0x00010504
> > -#define CONFIG_SYS_MCMEM1_VAL          0x00010504
> > -#define CONFIG_SYS_MCATT0_VAL          0x00010504
> > -#define CONFIG_SYS_MCATT1_VAL          0x00010504
> > -#define CONFIG_SYS_MCIO0_VAL           0x00004715
> > -#define CONFIG_SYS_MCIO1_VAL           0x00004715
> > -
> > -#define _LED                   0x08000010      /*check this */
> > -#define LED_BLANK              0x08000040
> > -#define LED_GPIO               0x10
> > -
> > -/*
> > - * FLASH and environment organization
> > - */
> > -#define CONFIG_SYS_MAX_FLASH_BANKS     1       /* max number of memory
> > banks           */ -#define CONFIG_SYS_MAX_FLASH_SECT      128     /*
> > max number of sectors on one chip    */ -
> > -/* timeout values are in ticks */
> > -#define CONFIG_SYS_FLASH_ERASE_TOUT    (25*CONFIG_SYS_HZ) /* Timeout for
> > Flash Erase */ -#define CONFIG_SYS_FLASH_WRITE_TOUT  
> >  (25*CONFIG_SYS_HZ) /* Timeout for Flash Write */ -
> > -#define CONFIG_SYS_MONITOR_LEN         0x40000         /* 256 KiB */
> > -#define CONFIG_ENV_IS_IN_FLASH 1
> > -#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 +
> > CONFIG_SYS_MONITOR_LEN) -#define CONFIG_ENV_SIZE                0x40000
> > /* Total Size of Environment Sector     */ -
> > -
> > -#endif /* __CONFIG_H */
> > --
> > 1.7.7.1

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board
  2011-11-28 17:21   ` Marek Vasut
@ 2011-11-28 17:23     ` Simon Glass
  2011-11-28 19:05       ` Marek Vasut
  0 siblings, 1 reply; 10+ messages in thread
From: Simon Glass @ 2011-11-28 17:23 UTC (permalink / raw)
  To: u-boot

Hi Marek,

On Mon, Nov 28, 2011 at 9:21 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
>> Hi Marek,
>>
>> On Fri, Nov 25, 2011 at 10:53 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
>> > The board is unmaintained and maintainer doesn't respond.
>>
>> Should this and the other patches be version 2, or perhaps 3?
>
> Probably.
>>
>> Also I like Mike's suggested phrasing (something like "The board
>> doesn't build and maintainer doesn't respond") since if it built OK we
>> would presumably just leave it.
>
> I think they don't build, at least that's how it was when I recently tried. And
> since I don't see any opposing force, let's drop them.

OK, so does that mean you will change the commit message along these
lines and issue a new version?

Regards,
Simon

>
> M
>>
>> Regards,
>> Simon
>>
>> > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
>> > Cc: Simon Glass <sjg@chromium.org>
>> > Cc: Anatolij Gustschin <agust@denx.de>
>> > ---
>> > ?MAINTAINERS ? ? ? ? ? ? ? | ? ?4 -
>> > ?board/cerf250/Makefile ? ?| ? 43 -----
>> > ?board/cerf250/cerf250.c ? | ? 85 ---------
>> > ?board/cerf250/flash.c ? ? | ?429
>> > --------------------------------------------- boards.cfg
>> > ?| ? ?1 -
>> > ?doc/README.scrapyard ? ? ?| ? ?1 +
>> > ?include/configs/cerf250.h | ?229 ------------------------
>> > ?7 files changed, 1 insertions(+), 791 deletions(-)
>> > ?delete mode 100644 board/cerf250/Makefile
>> > ?delete mode 100644 board/cerf250/cerf250.c
>> > ?delete mode 100644 board/cerf250/flash.c
>> > ?delete mode 100644 include/configs/cerf250.h
>> >
>> > diff --git a/MAINTAINERS b/MAINTAINERS
>> > index 37bbb34..3835154 100644
>> > --- a/MAINTAINERS
>> > +++ b/MAINTAINERS
>> > @@ -711,10 +711,6 @@ Sergey Kubushyn <ksi@koi8.net>
>> > ? ? ? ?SONATA ? ? ? ? ?ARM926EJS
>> > ? ? ? ?SCHMOOGIE ? ? ? ARM926EJS
>> >
>> > -Prakash Kumar <prakash@embedx.com>
>> > -
>> > - ? ? ? cerf250 ? ? ? ? xscale/pxa
>> > -
>> > ?Vipin Kumar <vipin.kumar@st.com>
>> >
>> > ? ? ? ?spear300 ? ? ? ?ARM926EJS (spear300 Soc)
>> > diff --git a/board/cerf250/Makefile b/board/cerf250/Makefile
>> > deleted file mode 100644
>> > index cf4742e..0000000
>> > --- a/board/cerf250/Makefile
>> > +++ /dev/null
>> > @@ -1,43 +0,0 @@
>> > -#
>> > -# (C) Copyright 2000-2006
>> > -# Wolfgang Denk, DENX Software Engineering, wd at 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 ? ?= $(obj)lib$(BOARD).o
>> > -
>> > -COBJS ?:= cerf250.o flash.o
>> > -
>> > -SRCS ? := $(COBJS:.o=.c)
>> > -OBJS ? := $(addprefix $(obj),$(COBJS))
>> > -
>> > -$(LIB): ? ? ? ?$(obj).depend $(OBJS)
>> > - ? ? ? $(call cmd_link_o_target, $(OBJS))
>> > -
>> > -########################################################################
>> > # -
>> > -# defines $(obj).depend target
>> > -include $(SRCTREE)/rules.mk
>> > -
>> > -sinclude $(obj).depend
>> > -
>> > -########################################################################
>> > # diff --git a/board/cerf250/cerf250.c b/board/cerf250/cerf250.c
>> > deleted file mode 100644
>> > index 043afea..0000000
>> > --- a/board/cerf250/cerf250.c
>> > +++ /dev/null
>> > @@ -1,85 +0,0 @@
>> > -/*
>> > - * (C) Copyright 2002
>> > - * Kyle Harris, Nexus Technologies, Inc. kharris at 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>
>> > -#include <netdev.h>
>> > -
>> > -DECLARE_GLOBAL_DATA_PTR;
>> > -
>> > -/*
>> > ------------------------------------------------------------------------
>> > - */ -
>> > -
>> > -/*
>> > - * Miscelaneous platform dependent initialisations
>> > - */
>> > -
>> > -int board_init (void)
>> > -{
>> > - ? ? ? /* We have RAM, disable cache */
>> > - ? ? ? dcache_disable();
>> > - ? ? ? icache_disable();
>> > -
>> > - ? ? ? /* arch number of cerf PXA Board */
>> > - ? ? ? gd->bd->bi_arch_number = MACH_TYPE_PXA_CERF;
>> > -
>> > - ? ? ? /* adress of boot parameters */
>> > - ? ? ? gd->bd->bi_boot_params = 0xa0000100;
>> > -
>> > - ? ? ? return 0;
>> > -}
>> > -
>> > -int board_late_init(void)
>> > -{
>> > - ? ? ? setenv("stdout", "serial");
>> > - ? ? ? setenv("stderr", "serial");
>> > - ? ? ? return 0;
>> > -}
>> > -
>> > -extern void pxa_dram_init(void);
>> > -int dram_init(void)
>> > -{
>> > - ? ? ? pxa_dram_init();
>> > - ? ? ? gd->ram_size = PHYS_SDRAM_1_SIZE;
>> > - ? ? ? return 0;
>> > -}
>> > -
>> > -void dram_init_banksize(void)
>> > -{
>> > - ? ? ? gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
>> > - ? ? ? gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
>> > -}
>> > -
>> > -#ifdef CONFIG_CMD_NET
>> > -int board_eth_init(bd_t *bis)
>> > -{
>> > - ? ? ? int rc = 0;
>> > -#ifdef CONFIG_SMC91111
>> > - ? ? ? rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
>> > -#endif
>> > - ? ? ? return rc;
>> > -}
>> > -#endif
>> > diff --git a/board/cerf250/flash.c b/board/cerf250/flash.c
>> > deleted file mode 100644
>> > index e1e7807..0000000
>> > --- a/board/cerf250/flash.c
>> > +++ /dev/null
>> > @@ -1,429 +0,0 @@
>> > -/*
>> > - * (C) Copyright 2001
>> > - * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
>> > - *
>> > - * (C) Copyright 2001
>> > - * Wolfgang Denk, DENX Software Engineering, wd at 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 <common.h>
>> > -#include <linux/byteorder/swab.h>
>> > -
>> > -
>> > -flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; ? /* info for FLASH
>> > chips ? ?*/ -
>> > -/* Board support for 1 or 2 flash devices */
>> > -#define FLASH_PORT_WIDTH32
>> > -#undef FLASH_PORT_WIDTH16
>> > -
>> > -#ifdef FLASH_PORT_WIDTH16
>> > -#define FLASH_PORT_WIDTH ? ? ? ? ? ? ? ushort
>> > -#define FLASH_PORT_WIDTHV ? ? ? ? ? ? ?vu_short
>> > -#define SWAP(x) ? ? ? ? ? ? ? __swab16(x)
>> > -#else
>> > -#define FLASH_PORT_WIDTH ? ? ? ? ? ? ? ulong
>> > -#define FLASH_PORT_WIDTHV ? ? ? ? ? ? ?vu_long
>> > -#define SWAP(x) ? ? ? ? ? ? ? __swab32(x)
>> > -#endif
>> > -
>> > -#define FPW ? ? ? FLASH_PORT_WIDTH
>> > -#define FPWV ? FLASH_PORT_WIDTHV
>> > -
>> > -#define mb() __asm__ __volatile__ ("" : : : "memory")
>> > -
>> > -/*----------------------------------------------------------------------
>> > - - * Functions
>> > - */
>> > -static ulong flash_get_size (FPW *addr, flash_info_t *info);
>> > -static int write_data (flash_info_t *info, ulong dest, FPW data);
>> > -static void flash_get_offsets (ulong base, flash_info_t *info);
>> > -void inline spin_wheel (void);
>> > -
>> > -/*----------------------------------------------------------------------
>> > - - */
>> > -
>> > -unsigned long flash_init (void)
>> > -{
>> > - ? ? ? int i;
>> > - ? ? ? ulong size = 0;
>> > -
>> > - ? ? ? for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
>> > - ? ? ? ? ? ? ? switch (i) {
>> > - ? ? ? ? ? ? ? case 0:
>> > - ? ? ? ? ? ? ? ? ? ? ? flash_get_size ((FPW *) PHYS_FLASH_1,
>> > &flash_info[i]); - ? ? ? ? ? ? ? ? ? ? ? flash_get_offsets
>> > (PHYS_FLASH_1, &flash_info[i]); - ? ? ? ? ? ? ? ? ? ? ? break;
>> > - ? ? ? ? ? ? ? case 1:
>> > - ? ? ? ? ? ? ? ? ? ? ? flash_get_size ((FPW *) PHYS_FLASH_2,
>> > &flash_info[i]); - ? ? ? ? ? ? ? ? ? ? ? flash_get_offsets
>> > (PHYS_FLASH_2, &flash_info[i]); - ? ? ? ? ? ? ? ? ? ? ? break;
>> > - ? ? ? ? ? ? ? default:
>> > - ? ? ? ? ? ? ? ? ? ? ? panic ("configured too many flash banks!\n");
>> > - ? ? ? ? ? ? ? ? ? ? ? break;
>> > - ? ? ? ? ? ? ? }
>> > - ? ? ? ? ? ? ? size += flash_info[i].size;
>> > - ? ? ? }
>> > -
>> > - ? ? ? /* Protect monitor and environment sectors
>> > - ? ? ? ?*/
>> > - ? ? ? flash_protect ( FLAG_PROTECT_SET,
>> > - ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_FLASH_BASE,
>> > - ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_FLASH_BASE + monitor_flash_len - 1,
>> > - ? ? ? ? ? ? ? ? ? ? ? &flash_info[0] );
>> > -
>> > - ? ? ? flash_protect ( FLAG_PROTECT_SET,
>> > - ? ? ? ? ? ? ? ? ? ? ? CONFIG_ENV_ADDR,
>> > - ? ? ? ? ? ? ? ? ? ? ? CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
>> > &flash_info[0] ); -
>> > - ? ? ? return size;
>> > -}
>> > -
>> > -/*----------------------------------------------------------------------
>> > - - */
>> > -static void flash_get_offsets (ulong base, flash_info_t *info)
>> > -{
>> > - ? ? ? int i;
>> > -
>> > - ? ? ? if (info->flash_id == FLASH_UNKNOWN) {
>> > - ? ? ? ? ? ? ? return;
>> > - ? ? ? }
>> > -
>> > - ? ? ? if ((info->flash_id & FLASH_VENDMASK) == FLASH_MAN_INTEL) {
>> > - ? ? ? ? ? ? ? for (i = 0; i < info->sector_count; i++) {
>> > - ? ? ? ? ? ? ? ? ? ? ? info->start[i] = base + (i *
>> > PHYS_FLASH_SECT_SIZE); - ? ? ? ? ? ? ? ? ? ? ? info->protect[i] = 0;
>> > - ? ? ? ? ? ? ? }
>> > - ? ? ? }
>> > -}
>> > -
>> > -/*----------------------------------------------------------------------
>> > - - */
>> > -void flash_print_info (flash_info_t *info)
>> > -{
>> > - ? ? ? int i;
>> > -
>> > - ? ? ? if (info->flash_id == FLASH_UNKNOWN) {
>> > - ? ? ? ? ? ? ? printf ("missing or unknown FLASH type\n");
>> > - ? ? ? ? ? ? ? return;
>> > - ? ? ? }
>> > -
>> > - ? ? ? switch (info->flash_id & FLASH_VENDMASK) {
>> > - ? ? ? case FLASH_MAN_INTEL:
>> > - ? ? ? ? ? ? ? printf ("INTEL ");
>> > - ? ? ? ? ? ? ? break;
>> > - ? ? ? default:
>> > - ? ? ? ? ? ? ? printf ("Unknown Vendor ");
>> > - ? ? ? ? ? ? ? break;
>> > - ? ? ? }
>> > -
>> > - ? ? ? switch (info->flash_id & FLASH_TYPEMASK) {
>> > - ? ? ? case FLASH_28F128J3A:
>> > - ? ? ? ? ? ? ? printf ("28F128J3A\n");
>> > - ? ? ? ? ? ? ? break;
>> > - ? ? ? default:
>> > - ? ? ? ? ? ? ? printf ("Unknown Chip Type\n");
>> > - ? ? ? ? ? ? ? break;
>> > - ? ? ? }
>> > -
>> > - ? ? ? printf (" ?Size: %ld MB in %d Sectors\n",
>> > - ? ? ? ? ? ? ? ? ? ? ? info->size >> 20, info->sector_count);
>> > -
>> > - ? ? ? printf (" ?Sector Start Addresses:");
>> > - ? ? ? for (i = 0; i < info->sector_count; ++i) {
>> > - ? ? ? ? ? ? ? if ((i % 5) == 0)
>> > - ? ? ? ? ? ? ? ? ? ? ? printf ("\n ? ");
>> > - ? ? ? ? ? ? ? printf (" %08lX%s",
>> > - ? ? ? ? ? ? ? ? ? ? ? info->start[i],
>> > - ? ? ? ? ? ? ? ? ? ? ? info->protect[i] ? " (RO)" : " ? ? ");
>> > - ? ? ? }
>> > - ? ? ? printf ("\n");
>> > - ? ? ? return;
>> > -}
>> > -
>> > -/*
>> > - * The following code cannot be run from FLASH!
>> > - */
>> > -static ulong flash_get_size (FPW *addr, flash_info_t *info)
>> > -{
>> > - ? ? ? volatile FPW value;
>> > -
>> > - ? ? ? /* Write auto select command: read Manufacturer ID */
>> > - ? ? ? addr[0x5555] = (FPW) 0x00AA00AA;
>> > - ? ? ? addr[0x2AAA] = (FPW) 0x00550055;
>> > - ? ? ? addr[0x5555] = (FPW) 0x00900090;
>> > -
>> > - ? ? ? mb ();
>> > - ? ? ? value = addr[0];
>> > -
>> > - ? ? ? switch (value) {
>> > -
>> > - ? ? ? case (FPW) INTEL_MANUFACT:
>> > - ? ? ? ? ? ? ? info->flash_id = FLASH_MAN_INTEL;
>> > - ? ? ? ? ? ? ? break;
>> > -
>> > - ? ? ? default:
>> > - ? ? ? ? ? ? ? info->flash_id = FLASH_UNKNOWN;
>> > - ? ? ? ? ? ? ? info->sector_count = 0;
>> > - ? ? ? ? ? ? ? info->size = 0;
>> > - ? ? ? ? ? ? ? addr[0] = (FPW) 0x00FF00FF; ? ? /* restore read mode */
>> > - ? ? ? ? ? ? ? return (0); ? ? ? ? ? ? ? ? ? ? /* no or unknown flash
>> > ?*/ - ? ? ? }
>> > -
>> > - ? ? ? mb ();
>> > - ? ? ? value = addr[1]; ? ? ? ? ? ? ? ? ? ? ? ?/* device ID ? ? ? ?*/
>> > -
>> > - ? ? ? switch (value) {
>> > -
>> > - ? ? ? case (FPW) INTEL_ID_28F128J3A:
>> > - ? ? ? ? ? ? ? info->flash_id += FLASH_28F128J3A;
>> > - ? ? ? ? ? ? ? info->sector_count = 128;
>> > - ? ? ? ? ? ? ? info->size = 0x02000000;
>> > - ? ? ? ? ? ? ? break; ? ? ? ? ? ? ? ? ? ? ? ? ?/* => 16 MB ? ? */
>> > -
>> > - ? ? ? default:
>> > - ? ? ? ? ? ? ? info->flash_id = FLASH_UNKNOWN;
>> > - ? ? ? ? ? ? ? break;
>> > - ? ? ? }
>> > -
>> > - ? ? ? if (info->sector_count > CONFIG_SYS_MAX_FLASH_SECT) {
>> > - ? ? ? ? ? ? ? printf ("** ERROR: sector count %d > max (%d) **\n",
>> > - ? ? ? ? ? ? ? ? ? ? ? info->sector_count, CONFIG_SYS_MAX_FLASH_SECT);
>> > - ? ? ? ? ? ? ? info->sector_count = CONFIG_SYS_MAX_FLASH_SECT;
>> > - ? ? ? }
>> > -
>> > - ? ? ? addr[0] = (FPW) 0x00FF00FF; ? ? ? ? ? ? /* restore read mode */
>> > -
>> > - ? ? ? return (info->size);
>> > -}
>> > -
>> > -
>> > -/*----------------------------------------------------------------------
>> > - - */
>> > -
>> > -int flash_erase (flash_info_t *info, int s_first, int s_last)
>> > -{
>> > - ? ? ? int flag, prot, sect;
>> > - ? ? ? ulong type, start;
>> > - ? ? ? int rcode = 0;
>> > -
>> > - ? ? ? if ((s_first < 0) || (s_first > s_last)) {
>> > - ? ? ? ? ? ? ? if (info->flash_id == FLASH_UNKNOWN) {
>> > - ? ? ? ? ? ? ? ? ? ? ? printf ("- missing\n");
>> > - ? ? ? ? ? ? ? } else {
>> > - ? ? ? ? ? ? ? ? ? ? ? printf ("- no sectors to erase\n");
>> > - ? ? ? ? ? ? ? }
>> > - ? ? ? ? ? ? ? return 1;
>> > - ? ? ? }
>> > -
>> > - ? ? ? type = (info->flash_id & FLASH_VENDMASK);
>> > - ? ? ? if ((type != FLASH_MAN_INTEL)) {
>> > - ? ? ? ? ? ? ? printf ("Can't erase unknown flash type %08lx -
>> > aborted\n", - ? ? ? ? ? ? ? ? ? ? ? info->flash_id);
>> > - ? ? ? ? ? ? ? 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");
>> > - ? ? ? }
>> > -
>> > - ? ? ? /* Disable interrupts which might cause a timeout here */
>> > - ? ? ? flag = disable_interrupts ();
>> > -
>> > - ? ? ? /* Start erase on unprotected sectors */
>> > - ? ? ? for (sect = s_first; sect <= s_last; sect++) {
>> > - ? ? ? ? ? ? ? if (info->protect[sect] == 0) { /* not protected */
>> > - ? ? ? ? ? ? ? ? ? ? ? FPWV *addr = (FPWV *) (info->start[sect]);
>> > - ? ? ? ? ? ? ? ? ? ? ? FPW status;
>> > -
>> > - ? ? ? ? ? ? ? ? ? ? ? printf ("Erasing sector %2d ... ", sect);
>> > -
>> > - ? ? ? ? ? ? ? ? ? ? ? /* arm simple, non interrupt dependent timer */
>> > - ? ? ? ? ? ? ? ? ? ? ? start = get_timer(0);
>> > -
>> > - ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00500050; ? ? ? /* clear status
>> > register */ - ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00200020; ? ? ? /*
>> > erase setup */ - ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00D000D0;
>> > /* erase confirm */ -
>> > - ? ? ? ? ? ? ? ? ? ? ? while (((status = *addr) & (FPW) 0x00800080) !=
>> > (FPW) 0x00800080) { - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (get_timer(start)
>> > > CONFIG_SYS_FLASH_ERASE_TOUT) { -
>> > printf ("Timeout\n");
>> > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00B000B0;
>> > /* suspend erase ? ? */ - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? *addr =
>> > (FPW) 0x00FF00FF; ? ? ? /* reset to read mode */ -
>> > ? ? ? ? ? ? ? ? rcode = 1;
>> > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? break;
>> > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? }
>> > - ? ? ? ? ? ? ? ? ? ? ? }
>> > -
>> > - ? ? ? ? ? ? ? ? ? ? ? *addr = 0x00500050; ? ? /* clear status register
>> > cmd. ? */ - ? ? ? ? ? ? ? ? ? ? ? *addr = 0x00FF00FF; ? ? /* resest to
>> > read mode ? ? ? ? ?*/ -
>> > - ? ? ? ? ? ? ? ? ? ? ? printf (" done\n");
>> > - ? ? ? ? ? ? ? }
>> > - ? ? ? }
>> > - ? ? ? return rcode;
>> > -}
>> > -
>> > -/*----------------------------------------------------------------------
>> > - - * Copy memory to flash, returns:
>> > - * 0 - OK
>> > - * 1 - write timeout
>> > - * 2 - Flash not erased
>> > - * 4 - Flash not identified
>> > - */
>> > -
>> > -int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
>> > -{
>> > - ? ? ? ulong cp, wp;
>> > - ? ? ? FPW data;
>> > - ? ? ? int count, i, l, rc, port_width;
>> > -
>> > - ? ? ? if (info->flash_id == FLASH_UNKNOWN) {
>> > - ? ? ? ? ? ? ? return 4;
>> > - ? ? ? }
>> > -/* get lower word aligned address */
>> > -#ifdef FLASH_PORT_WIDTH16
>> > - ? ? ? wp = (addr & ~1);
>> > - ? ? ? port_width = 2;
>> > -#else
>> > - ? ? ? wp = (addr & ~3);
>> > - ? ? ? port_width = 4;
>> > -#endif
>> > -
>> > - ? ? ? /*
>> > - ? ? ? ?* handle unaligned start bytes
>> > - ? ? ? ?*/
>> > - ? ? ? if ((l = addr - wp) != 0) {
>> > - ? ? ? ? ? ? ? data = 0;
>> > - ? ? ? ? ? ? ? for (i = 0, cp = wp; i < l; ++i, ++cp) {
>> > - ? ? ? ? ? ? ? ? ? ? ? data = (data << 8) | (*(uchar *) cp);
>> > - ? ? ? ? ? ? ? }
>> > - ? ? ? ? ? ? ? for (; i < port_width && cnt > 0; ++i) {
>> > - ? ? ? ? ? ? ? ? ? ? ? data = (data << 8) | *src++;
>> > - ? ? ? ? ? ? ? ? ? ? ? --cnt;
>> > - ? ? ? ? ? ? ? ? ? ? ? ++cp;
>> > - ? ? ? ? ? ? ? }
>> > - ? ? ? ? ? ? ? for (; cnt == 0 && i < port_width; ++i, ++cp) {
>> > - ? ? ? ? ? ? ? ? ? ? ? data = (data << 8) | (*(uchar *) cp);
>> > - ? ? ? ? ? ? ? }
>> > -
>> > - ? ? ? ? ? ? ? if ((rc = write_data (info, wp, SWAP (data))) != 0) {
>> > - ? ? ? ? ? ? ? ? ? ? ? return (rc);
>> > - ? ? ? ? ? ? ? }
>> > - ? ? ? ? ? ? ? wp += port_width;
>> > - ? ? ? }
>> > -
>> > - ? ? ? /*
>> > - ? ? ? ?* handle word aligned part
>> > - ? ? ? ?*/
>> > - ? ? ? count = 0;
>> > - ? ? ? while (cnt >= port_width) {
>> > - ? ? ? ? ? ? ? data = 0;
>> > - ? ? ? ? ? ? ? for (i = 0; i < port_width; ++i) {
>> > - ? ? ? ? ? ? ? ? ? ? ? data = (data << 8) | *src++;
>> > - ? ? ? ? ? ? ? }
>> > - ? ? ? ? ? ? ? if ((rc = write_data (info, wp, SWAP (data))) != 0) {
>> > - ? ? ? ? ? ? ? ? ? ? ? return (rc);
>> > - ? ? ? ? ? ? ? }
>> > - ? ? ? ? ? ? ? wp += port_width;
>> > - ? ? ? ? ? ? ? cnt -= port_width;
>> > - ? ? ? ? ? ? ? if (count++ > 0x800) {
>> > - ? ? ? ? ? ? ? ? ? ? ? spin_wheel ();
>> > - ? ? ? ? ? ? ? ? ? ? ? count = 0;
>> > - ? ? ? ? ? ? ? }
>> > - ? ? ? }
>> > -
>> > - ? ? ? if (cnt == 0) {
>> > - ? ? ? ? ? ? ? return (0);
>> > - ? ? ? }
>> > -
>> > - ? ? ? /*
>> > - ? ? ? ?* handle unaligned tail bytes
>> > - ? ? ? ?*/
>> > - ? ? ? data = 0;
>> > - ? ? ? for (i = 0, cp = wp; i < port_width && cnt > 0; ++i, ++cp) {
>> > - ? ? ? ? ? ? ? data = (data << 8) | *src++;
>> > - ? ? ? ? ? ? ? --cnt;
>> > - ? ? ? }
>> > - ? ? ? for (; i < port_width; ++i, ++cp) {
>> > - ? ? ? ? ? ? ? data = (data << 8) | (*(uchar *) cp);
>> > - ? ? ? }
>> > -
>> > - ? ? ? return (write_data (info, wp, SWAP (data)));
>> > -}
>> > -
>> > -/*----------------------------------------------------------------------
>> > - - * Write a word or halfword to Flash, returns:
>> > - * 0 - OK
>> > - * 1 - write timeout
>> > - * 2 - Flash not erased
>> > - */
>> > -static int write_data (flash_info_t *info, ulong dest, FPW data)
>> > -{
>> > - ? ? ? FPWV *addr = (FPWV *) dest;
>> > - ? ? ? ulong status;
>> > - ? ? ? int flag;
>> > - ? ? ? ulong start;
>> > -
>> > - ? ? ? /* Check if Flash is (sufficiently) erased */
>> > - ? ? ? if ((*addr & data) != data) {
>> > - ? ? ? ? ? ? ? printf ("not erased at %08lx (%lx)\n", (ulong) addr,
>> > *addr); - ? ? ? ? ? ? ? return (2);
>> > - ? ? ? }
>> > - ? ? ? /* Disable interrupts which might cause a timeout here */
>> > - ? ? ? flag = disable_interrupts ();
>> > -
>> > - ? ? ? *addr = (FPW) 0x00400040; ? ? ? /* write setup */
>> > - ? ? ? *addr = data;
>> > -
>> > - ? ? ? /* arm simple, non interrupt dependent timer */
>> > - ? ? ? start = get_timer(0);
>> > -
>> > - ? ? ? /* wait while polling the status register */
>> > - ? ? ? while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080)
>> > { - ? ? ? ? ? ? ? if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
>> > - ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00FF00FF; ? ? ? /* restore read
>> > mode */ - ? ? ? ? ? ? ? ? ? ? ? return (1);
>> > - ? ? ? ? ? ? ? }
>> > - ? ? ? }
>> > -
>> > - ? ? ? *addr = (FPW) 0x00FF00FF; ? ? ? /* restore read mode */
>> > -
>> > - ? ? ? return (0);
>> > -}
>> > -
>> > -void inline spin_wheel (void)
>> > -{
>> > - ? ? ? static int p = 0;
>> > - ? ? ? static char w[] = "\\/-";
>> > -
>> > - ? ? ? printf ("\010%c", w[p]);
>> > - ? ? ? (++p == 3) ? (p = 0) : 0;
>> > -}
>> > diff --git a/boards.cfg b/boards.cfg
>> > index 7c63449..d65ca12 100644
>> > --- a/boards.cfg
>> > +++ b/boards.cfg
>> > @@ -216,7 +216,6 @@ actux3 ? ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? ixp
>> > ?actux4 ? ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? ixp
>> > ?dvlhost ? ? ? ? ? ? ? ? ? ? ?arm ? ? ? ? ixp
>> > ?balloon3 ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? pxa
>> > -cerf250 ? ? ? ? ? ? ? ? ? ? ?arm ? ? ? ? pxa
>> > ?colibri_pxa270 ? ? ? ? ? ? ? arm ? ? ? ? pxa
>> > ?cradle ? ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? pxa
>> > ?lubbock ? ? ? ? ? ? ? ? ? ? ?arm ? ? ? ? pxa
>> > diff --git a/doc/README.scrapyard b/doc/README.scrapyard
>> > index cb5e4bc..232cd68 100644
>> > --- a/doc/README.scrapyard
>> > +++ b/doc/README.scrapyard
>> > @@ -11,6 +11,7 @@ easily if here is something they might want to dig
>> > for...
>> >
>> > ?Board ?Arch ? ?CPU ? ? removed ? ? Commit ? ? ?last known
>> > maintainer/contact
>> > ========================================================================
>> > ===== +cerf250 arm ? ? pxa ? ? a3f1241 ? 2011-25-11 ? ?Prakash Kumar
>> > <prakash@embedx.com> mpq101 powerpc mpc85xx - ? ? ? ? 2011-10-23 ? ?Alex
>> > Dubov <oakad@yahoo.com> ixdpg425 arm ? ixp ? ? 0ca8eb7 ? 2011-09-22
>> > ?Stefan Roese <sr@denx.de> ixdp425 arm ? ?ixp ? ? 0ca8eb7 ? 2011-09-22
>> > ?Kyle Harris <kharris@nexus-tech.net> diff --git
>> > a/include/configs/cerf250.h b/include/configs/cerf250.h deleted file
>> > mode 100644
>> > index 70427da..0000000
>> > --- a/include/configs/cerf250.h
>> > +++ /dev/null
>> > @@ -1,229 +0,0 @@
>> > -/*
>> > - * (C) Copyright 2002
>> > - * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
>> > - *
>> > - * (C) Copyright 2002
>> > - * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
>> > - * Marius Groeger <mgroeger@sysgo.de>
>> > - *
>> > - * Configuation settings for the CERF250 board.
>> > - *
>> > - * 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
>> > - */
>> > -
>> > -#ifndef __CONFIG_H
>> > -#define __CONFIG_H
>> > -
>> > -/*
>> > - * High Level Configuration Options
>> > - * (easy to change)
>> > - */
>> > -#define CONFIG_PXA250 ? ? ? ? ?1 ? ? ? /* This is an PXA250 CPU ? ?*/
>> > -#define CONFIG_CERF250 ? ? ? ? 1 ? ? ? /* on Cerf PXA Board ? ? ? ?*/
>> > -#define CONFIG_BOARD_LATE_INIT
>> > -#define CONFIG_BAUDRATE ? ? ? ? ? ? ? ?38400
>> > -#define ? ? ? ?CONFIG_SYS_TEXT_BASE ? ?0x0
>> > -
>> > -#undef CONFIG_USE_IRQ ? ? ? ? ? ? ? ? ?/* we don't need IRQ/FIQ stuff */
>> > -
>> > -/* we will never enable dcache, because we have to setup MMU first */
>> > -#define CONFIG_SYS_DCACHE_OFF
>> > -
>> > -/*
>> > - * Size of malloc() pool
>> > - */
>> > -#define CONFIG_SYS_MALLOC_LEN ? ? ?(CONFIG_ENV_SIZE + 128*1024)
>> > -
>> > -/*
>> > - * Hardware drivers
>> > - */
>> > -#define CONFIG_SMC91111
>> > -#define CONFIG_SMC91111_BASE 0x04000300
>> > -#define CONFIG_SMC_USE_32_BIT
>> > -
>> > -/*
>> > - * select serial console configuration
>> > - */
>> > -#define CONFIG_PXA_SERIAL
>> > -#define CONFIG_FFUART ? ? ? 1 ?/* we use FFUART on CERF PXA */
>> > -
>> > -/* allow to overwrite serial and ethaddr */
>> > -#define CONFIG_ENV_OVERWRITE
>> > -
>> > -/*
>> > - * BOOTP options
>> > - */
>> > -#define CONFIG_BOOTP_BOOTFILESIZE
>> > -#define CONFIG_BOOTP_BOOTPATH
>> > -#define CONFIG_BOOTP_GATEWAY
>> > -#define CONFIG_BOOTP_HOSTNAME
>> > -
>> > -
>> > -/*
>> > - * Command line configuration.
>> > - */
>> > -#include <config_cmd_default.h>
>> > -
>> > -
>> > -#define CONFIG_BOOTDELAY ? ? ? 3
>> > -#define CONFIG_ETHADDR ? ? ? ? 00:D0:CA:F1:3C:D2
>> > -#define CONFIG_NETMASK ? ? ? ? 255.255.255.0
>> > -#define CONFIG_IPADDR ? ? ? ? ?192.168.0.5
>> > -#define CONFIG_SERVERIP ? ? ? ? ? ? ? ?192.168.0.2
>> > -#define CONFIG_BOOTCOMMAND ? ? "bootm 0xC0000"
>> > -#define CONFIG_BOOTARGS ? ? ? ? ? ? ? ?"root=/dev/mtdblock3
>> > rootfstype=jffs2 console=ttyS0,38400" -#define CONFIG_CMDLINE_TAG
>> > -
>> > -#if defined(CONFIG_CMD_KGDB)
>> > -#define CONFIG_KGDB_BAUDRATE ? 230400 ?/* speed to run kgdb serial port
>> > */ -#define CONFIG_KGDB_SER_INDEX ?2 ? ? ? ? ? ? ? /* which serial port
>> > to use */ -#endif
>> > -
>> > -/*
>> > - * Miscellaneous configurable options
>> > - */
>> > -#define CONFIG_SYS_HUSH_PARSER ? ? ? ? 1
>> > -#define CONFIG_SYS_PROMPT_HUSH_PS2 ? ? "> "
>> > -
>> > -#define CONFIG_SYS_LONGHELP ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?/* undef
>> > to save memory ? ? ? ? */ -#ifdef CONFIG_SYS_HUSH_PARSER
>> > -#define CONFIG_SYS_PROMPT ? ? ? ? ? ? ? ? ? ? ?"uboot$ " ? ? ? /*
>> > Monitor Command Prompt */ -#else
>> > -#define CONFIG_SYS_PROMPT ? ? ? ? ? ? ? ? ? ? ?"=> " ? ? ? ? ? /*
>> > Monitor Command Prompt */ -#endif
>> > -#define CONFIG_SYS_CBSIZE ? ? ? ? ? ? ? ? ? ? ?256
>> > /* Console I/O Buffer Size ? ? ?*/ -#define CONFIG_SYS_PBSIZE
>> > ? ? ? ? ? ?(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) -
>> > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /*
>> > Print Buffer Size */ -#define CONFIG_SYS_MAXARGS ? ? ? ? ? ? ? ? ? ? 16
>> > ? ? ? ? ? ? ? ? ? ? ?/* max number of command args ? */ -#define
>> > CONFIG_SYS_BARGSIZE ? ? ? ? ? ?CONFIG_SYS_CBSIZE ? ? ? /* Boot Argument
>> > Buffer Size ? ?*/ -#define CONFIG_SYS_DEVICE_NULLDEV ? ? ?1
>> > -
>> > -#define CONFIG_SYS_MEMTEST_START ? ? ? 0xa0400000 ? ? ?/* memtest works
>> > on ? ? */ -#define CONFIG_SYS_MEMTEST_END ? ? ? ? 0xa0800000 ? ? ?/* 4
>> > ... 8 MB in DRAM ? */ -
>> > -#define CONFIG_SYS_LOAD_ADDR ? ? ? ? ? 0xa2000000 ? ? ?/* default load
>> > address */ -
>> > -#define CONFIG_SYS_HZ ? ? ? ? ? ? ? ? ?1000
>> > -#define CONFIG_SYS_CPUSPEED ? ? ? ? ? ?0x141 ? ? ? ? ? /* set core clock
>> > to 400/200/100 MHz */ -
>> > -#define CONFIG_SYS_BAUDRATE_TABLE ? ? ?{ 9600, 19200, 38400, 57600,
>> > 115200 } -
>> > -
>> > -/*
>> > - * Stack sizes
>> > - *
>> > - * The stack sizes are set up in start.S using the settings below
>> > - */
>> > -#define CONFIG_STACKSIZE ? ? ? ? ? ? ? (128*1024) ? ? ?/* regular stack
>> > */ -#ifdef CONFIG_USE_IRQ
>> > -#define CONFIG_STACKSIZE_IRQ ? (4*1024) ? ? ? ?/* IRQ stack */
>> > -#define CONFIG_STACKSIZE_FIQ ? (4*1024) ? ? ? ?/* FIQ stack */
>> > -#endif
>> > -
>> > -/*
>> > - * Physical Memory Map
>> > - */
>> > -#define CONFIG_NR_DRAM_BANKS ? ? ? ? ? 1 ? ? ? ? ? ? ? /* we have 1 bank
>> > of DRAM */ -#define PHYS_SDRAM_1 ? ? ? ? ? ? ? ? ? 0xa0000000 ? ? ?/*
>> > SDRAM Bank #1 */ -#define PHYS_SDRAM_1_SIZE ? ? ? ? ? ? ?0x04000000
>> > ?/* 64 MB */ -
>> > -#define PHYS_FLASH_1 ? ? ? ? ? ? ? ? ? 0x00000000 ? ? ?/* Flash Bank #1
>> > */ -#define PHYS_FLASH_2 ? ? ? ? ? ? ? ? ? 0x04000000 ? ? ?/* Flash Bank
>> > #2 */ -#define PHYS_FLASH_SIZE ? ? ? ? ? ? ? ? ? ? ? ?0x02000000 ? ? ?/*
>> > 32 MB */ -#define PHYS_FLASH_BANK_SIZE ? ? ? ? ? 0x02000000 ? ? ?/* 32
>> > MB Banks */ -#define PHYS_FLASH_SECT_SIZE ? ? ? ? ? 0x00040000 ? ? ?/*
>> > 256 KB sectors (x2) */ -
>> > -#define CONFIG_SYS_DRAM_BASE ? ? ? ? ? ? ? ? ? 0xa0000000
>> > -#define CONFIG_SYS_DRAM_SIZE ? ? ? ? ? ? ? ? ? 0x04000000
>> > -
>> > -#define CONFIG_SYS_FLASH_BASE ? ? ? ? ? ? ? ? ?PHYS_FLASH_1
>> > -
>> > -#define CONFIG_SYS_SDRAM_BASE ? ? ? ? ?PHYS_SDRAM_1
>> > -#define ? ? ? ?CONFIG_SYS_INIT_SP_ADDR ? ? ? ? (GENERATED_GBL_DATA_SIZE
>> > + PHYS_SDRAM_1) -
>> > -/*
>> > - * GPIO settings
>> > - */
>> > -
>> > -
>> > -#define CONFIG_SYS_GPSR0_VAL ? ? ? ? ? 0x00408030
>> > -#define CONFIG_SYS_GPSR1_VAL ? ? ? ? ? 0x00BFA882
>> > -#define CONFIG_SYS_GPSR2_VAL ? ? ? ? ? 0x0001C000
>> > -#define CONFIG_SYS_GPCR0_VAL ? ? ? ? ? 0xC0031100
>> > -#define CONFIG_SYS_GPCR1_VAL ? ? ? ? ? 0xFC400300
>> > -#define CONFIG_SYS_GPCR2_VAL ? ? ? ? ? 0x00003FFF
>> > -#define CONFIG_SYS_GPDR0_VAL ? ? ? ? ? 0xC0439330
>> > -#define CONFIG_SYS_GPDR1_VAL ? ? ? ? ? 0xFCFFAB82
>> > -#define CONFIG_SYS_GPDR2_VAL ? ? ? ? ? 0x0001FFFF
>> > -#define CONFIG_SYS_GAFR0_L_VAL ? ? ? ? 0x80000000
>> > -#define CONFIG_SYS_GAFR0_U_VAL ? ? ? ? 0xA5000010
>> > -#define CONFIG_SYS_GAFR1_L_VAL ? ? ? ? 0x60008018
>> > -#define CONFIG_SYS_GAFR1_U_VAL ? ? ? ? 0xAAA5AAAA
>> > -#define CONFIG_SYS_GAFR2_L_VAL ? ? ? ? 0xAAA0000A
>> > -#define CONFIG_SYS_GAFR2_U_VAL ? ? ? ? 0x00000002
>> > -
>> > -#define CONFIG_SYS_PSSR_VAL ? ? ? ? ? ?0x20
>> > -
>> > -#define ? ? ? ?CONFIG_SYS_CCCR ? ? ? ? ? ? ? ? CCCR_L27|CCCR_M2|CCCR_N10
>> > -#define ? ? ? ?CONFIG_SYS_CKEN ? ? ? ? ? ? ? ? 0x0
>> > -
>> > -/*
>> > - * Memory settings
>> > - */
>> > -#define CONFIG_SYS_MSC0_VAL ? ? ? ? ? ?0x12447FF0
>> > -#define CONFIG_SYS_MSC1_VAL ? ? ? ? ? ?0x12BC5554
>> > -#define CONFIG_SYS_MSC2_VAL ? ? ? ? ? ?0x7FF97FF1
>> > -#define CONFIG_SYS_MDCNFG_VAL ? ? ? ? ?0x00001AC9
>> > -#define CONFIG_SYS_MDREFR_VAL ? ? ? ? ?0x03CDC017
>> > -#define CONFIG_SYS_MDMRS_VAL ? ? ? ? ? 0x00000000
>> > -#define ? ? ? ?CONFIG_SYS_FLYCNFG_VAL ? ? ? ? ?0x00000000
>> > -#define ? ? ? ?CONFIG_SYS_SXCNFG_VAL ? ? ? ? ? 0x00000000
>> > -
>> > -/*
>> > - * PCMCIA and CF Interfaces
>> > - */
>> > -#define CONFIG_SYS_MECR_VAL ? ? ? ? ? ?0x00000000
>> > -#define CONFIG_SYS_MCMEM0_VAL ? ? ? ? ?0x00010504
>> > -#define CONFIG_SYS_MCMEM1_VAL ? ? ? ? ?0x00010504
>> > -#define CONFIG_SYS_MCATT0_VAL ? ? ? ? ?0x00010504
>> > -#define CONFIG_SYS_MCATT1_VAL ? ? ? ? ?0x00010504
>> > -#define CONFIG_SYS_MCIO0_VAL ? ? ? ? ? 0x00004715
>> > -#define CONFIG_SYS_MCIO1_VAL ? ? ? ? ? 0x00004715
>> > -
>> > -#define _LED ? ? ? ? ? ? ? ? ? 0x08000010 ? ? ?/*check this */
>> > -#define LED_BLANK ? ? ? ? ? ? ?0x08000040
>> > -#define LED_GPIO ? ? ? ? ? ? ? 0x10
>> > -
>> > -/*
>> > - * FLASH and environment organization
>> > - */
>> > -#define CONFIG_SYS_MAX_FLASH_BANKS ? ? 1 ? ? ? /* max number of memory
>> > banks ? ? ? ? ? */ -#define CONFIG_SYS_MAX_FLASH_SECT ? ? ?128 ? ? /*
>> > max number of sectors on one chip ? ?*/ -
>> > -/* timeout values are in ticks */
>> > -#define CONFIG_SYS_FLASH_ERASE_TOUT ? ?(25*CONFIG_SYS_HZ) /* Timeout for
>> > Flash Erase */ -#define CONFIG_SYS_FLASH_WRITE_TOUT
>> > ?(25*CONFIG_SYS_HZ) /* Timeout for Flash Write */ -
>> > -#define CONFIG_SYS_MONITOR_LEN ? ? ? ? 0x40000 ? ? ? ? /* 256 KiB */
>> > -#define CONFIG_ENV_IS_IN_FLASH 1
>> > -#define CONFIG_ENV_ADDR ? ? ? ? ? ? ? ?(PHYS_FLASH_1 +
>> > CONFIG_SYS_MONITOR_LEN) -#define CONFIG_ENV_SIZE ? ? ? ? ? ? ? ?0x40000
>> > /* Total Size of Environment Sector ? ? */ -
>> > -
>> > -#endif /* __CONFIG_H */
>> > --
>> > 1.7.7.1
>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board
  2011-11-28 17:23     ` Simon Glass
@ 2011-11-28 19:05       ` Marek Vasut
  2011-11-28 19:22         ` Simon Glass
  0 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2011-11-28 19:05 UTC (permalink / raw)
  To: u-boot

> Hi Marek,
> 
> On Mon, Nov 28, 2011 at 9:21 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> >> Hi Marek,
> >> 
> >> On Fri, Nov 25, 2011 at 10:53 AM, Marek Vasut <marek.vasut@gmail.com> 
wrote:
> >> > The board is unmaintained and maintainer doesn't respond.
> >> 
> >> Should this and the other patches be version 2, or perhaps 3?
> > 
> > Probably.
> > 
> >> Also I like Mike's suggested phrasing (something like "The board
> >> doesn't build and maintainer doesn't respond") since if it built OK we
> >> would presumably just leave it.
> > 
> > I think they don't build, at least that's how it was when I recently
> > tried. And since I don't see any opposing force, let's drop them.
> 
> OK, so does that mean you will change the commit message along these
> lines and issue a new version?
> 
Wasn't this already pulled in tho?

M

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board
  2011-11-28 19:05       ` Marek Vasut
@ 2011-11-28 19:22         ` Simon Glass
  2011-11-28 19:33           ` Marek Vasut
  0 siblings, 1 reply; 10+ messages in thread
From: Simon Glass @ 2011-11-28 19:22 UTC (permalink / raw)
  To: u-boot

Hi Marek,

On Mon, Nov 28, 2011 at 11:05 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
>> Hi Marek,
>>
>> On Mon, Nov 28, 2011 at 9:21 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
>> >> Hi Marek,
>> >>
>> >> On Fri, Nov 25, 2011 at 10:53 AM, Marek Vasut <marek.vasut@gmail.com>
> wrote:
>> >> > The board is unmaintained and maintainer doesn't respond.
>> >>
>> >> Should this and the other patches be version 2, or perhaps 3?
>> >
>> > Probably.
>> >
>> >> Also I like Mike's suggested phrasing (something like "The board
>> >> doesn't build and maintainer doesn't respond") since if it built OK we
>> >> would presumably just leave it.
>> >
>> > I think they don't build, at least that's how it was when I recently
>> > tried. And since I don't see any opposing force, let's drop them.
>>
>> OK, so does that mean you will change the commit message along these
>> lines and issue a new version?
>>
> Wasn't this already pulled in tho?

Yes, sorry. For some reason I didn't see the 'Applied' message to the
mailing list.

Regards,
Simon

>
> M
>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board
  2011-11-28 19:22         ` Simon Glass
@ 2011-11-28 19:33           ` Marek Vasut
  0 siblings, 0 replies; 10+ messages in thread
From: Marek Vasut @ 2011-11-28 19:33 UTC (permalink / raw)
  To: u-boot

> Hi Marek,
> 
> On Mon, Nov 28, 2011 at 11:05 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> >> Hi Marek,
> >> 
> >> On Mon, Nov 28, 2011 at 9:21 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> >> >> Hi Marek,
> >> >> 
> >> >> On Fri, Nov 25, 2011 at 10:53 AM, Marek Vasut <marek.vasut@gmail.com>
> > 
> > wrote:
> >> >> > The board is unmaintained and maintainer doesn't respond.
> >> >> 
> >> >> Should this and the other patches be version 2, or perhaps 3?
> >> > 
> >> > Probably.
> >> > 
> >> >> Also I like Mike's suggested phrasing (something like "The board
> >> >> doesn't build and maintainer doesn't respond") since if it built OK
> >> >> we would presumably just leave it.
> >> > 
> >> > I think they don't build, at least that's how it was when I recently
> >> > tried. And since I don't see any opposing force, let's drop them.
> >> 
> >> OK, so does that mean you will change the commit message along these
> >> lines and issue a new version?
> > 
> > Wasn't this already pulled in tho?
> 
> Yes, sorry. For some reason I didn't see the 'Applied' message to the
> mailing list.
> 
Naw, that's ok. I think I actually changed the commit message before that. 
Anyway, I'll consider this next time :)

M

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2011-11-28 19:33 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-25 18:53 [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board Marek Vasut
2011-11-25 18:53 ` [U-Boot] [PATCH 2/4] PXA: Drop CRADLE board Marek Vasut
2011-11-25 18:53 ` [U-Boot] [PATCH 3/4] PXA: Drop PLEB2 board Marek Vasut
2011-11-25 18:53 ` [U-Boot] [PATCH 4/4] PXA: Drop XM250 board Marek Vasut
2011-11-28 17:12 ` [U-Boot] [PATCH 1/4] PXA: Drop CERF250 board Simon Glass
2011-11-28 17:21   ` Marek Vasut
2011-11-28 17:23     ` Simon Glass
2011-11-28 19:05       ` Marek Vasut
2011-11-28 19:22         ` Simon Glass
2011-11-28 19:33           ` Marek Vasut

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox