Patchwork [U-Boot,02/10] ARM: remove broken "dnp1110" board.

login
register
mail settings
Submitter Wolfgang Denk
Date Sept. 5, 2011, 12:37 p.m.
Message ID <1315226254-16826-3-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/113350/
State Accepted
Commit fc5e5ceec4937773072a242cbef7a0f1e7db99e0
Headers show

Comments

Wolfgang Denk - Sept. 5, 2011, 12:37 p.m.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Alex Züpke <azu@sysgo.de>
---
 MAINTAINERS                   |    1 -
 board/dnp1110/Makefile        |   51 -----
 board/dnp1110/config.mk       |   17 --
 board/dnp1110/dnp1110.c       |   67 -------
 board/dnp1110/flash.c         |  422 -----------------------------------------
 board/dnp1110/lowlevel_init.S |  135 -------------
 boards.cfg                    |    1 -
 doc/README.scrapyard          |    1 +
 include/configs/dnp1110.h     |  162 ----------------
 9 files changed, 1 insertions(+), 856 deletions(-)
 delete mode 100644 board/dnp1110/Makefile
 delete mode 100644 board/dnp1110/config.mk
 delete mode 100644 board/dnp1110/dnp1110.c
 delete mode 100644 board/dnp1110/flash.c
 delete mode 100644 board/dnp1110/lowlevel_init.S
 delete mode 100644 include/configs/dnp1110.h
Wolfgang Denk - Sept. 7, 2011, 7:49 p.m.
Dear Wolfgang Denk,

In message <1315226254-16826-3-git-send-email-wd@denx.de> you wrote:
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> Cc: Alex Züpke <azu@sysgo.de>
> ---
>  MAINTAINERS                   |    1 -
>  board/dnp1110/Makefile        |   51 -----
>  board/dnp1110/config.mk       |   17 --
>  board/dnp1110/dnp1110.c       |   67 -------
>  board/dnp1110/flash.c         |  422 -----------------------------------------
>  board/dnp1110/lowlevel_init.S |  135 -------------
>  boards.cfg                    |    1 -
>  doc/README.scrapyard          |    1 +
>  include/configs/dnp1110.h     |  162 ----------------
>  9 files changed, 1 insertions(+), 856 deletions(-)
>  delete mode 100644 board/dnp1110/Makefile
>  delete mode 100644 board/dnp1110/config.mk
>  delete mode 100644 board/dnp1110/dnp1110.c
>  delete mode 100644 board/dnp1110/flash.c
>  delete mode 100644 board/dnp1110/lowlevel_init.S
>  delete mode 100644 include/configs/dnp1110.h

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 3bfe3fb..16edb67 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -903,7 +903,6 @@  Richard Woodruff <r-woodruff2@ti.com>
 Alex Züpke <azu@sysgo.de>
 
 	lart		SA1100
-	dnp1110		SA1110
 
 Syed Mohammed Khasim <sm.khasim@gmail.com>
 Sughosh Ganu <urwithsughosh@gmail.com>
diff --git a/board/dnp1110/Makefile b/board/dnp1110/Makefile
deleted file mode 100644
index 8a86c0f..0000000
--- a/board/dnp1110/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@ 
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-include $(TOPDIR)/config.mk
-
-LIB	= $(obj)lib$(BOARD).o
-
-COBJS	:= dnp1110.o flash.o
-SOBJS	:= lowlevel_init.o
-
-SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-SOBJS	:= $(addprefix $(obj),$(SOBJS))
-
-$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
-	$(call cmd_link_o_target, $(OBJS) $(SOBJS))
-
-clean:
-	rm -f $(SOBJS) $(OBJS)
-
-distclean:	clean
-	rm -f $(LIB) core *.bak $(obj).depend
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/dnp1110/config.mk b/board/dnp1110/config.mk
deleted file mode 100644
index ccf8277..0000000
--- a/board/dnp1110/config.mk
+++ /dev/null
@@ -1,17 +0,0 @@ 
-#
-# DNP/1110 board with SA1100 cpu
-#
-# http://www.dilnetpc.com
-#
-
-#
-# DILNETPC has 1 banks of 32 MB DRAM
-#
-# c000'0000
-#
-# Linux-Kernel is expected to be at c000'8000, entry c000'8000
-#
-# we load ourself to c1f8'0000, the upper 1 MB of the first (only) bank
-#
-
-CONFIG_SYS_TEXT_BASE = 0xc1f80000
diff --git a/board/dnp1110/dnp1110.c b/board/dnp1110/dnp1110.c
deleted file mode 100644
index c215f5f..0000000
--- a/board/dnp1110/dnp1110.c
+++ /dev/null
@@ -1,67 +0,0 @@ 
-/*
- * (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>
-#include <SA-1100.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Miscelaneous platform dependent initialisations
- */
-
-int board_init (void)
-{
-	/* memory and cpu-speed are setup before relocation */
-	/* so we do _nothing_ here */
-
-	/* arch number of DNP1110-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_DNP1110;
-
-	/* flash vpp on */
-	PPDR |= 0x80;	/* assumes LCD controller is off */
-	PPSR |= 0x80;
-
-	return 0;
-}
-
-int dram_init (void)
-{
-	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-
-	return (0);
-}
-
-#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/dnp1110/flash.c b/board/dnp1110/flash.c
deleted file mode 100644
index 53f89ee..0000000
--- a/board/dnp1110/flash.c
+++ /dev/null
@@ -1,422 +0,0 @@ 
-/*
- * (C) Copyright 2001
- * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net
- *
- * (C) Copyright 2001
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <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 */
-#undef FLASH_PORT_WIDTH32
-#define 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;
-	   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 = (FPW)0x00500050; /* clear status register cmd.   */
-			*addr = (FPW)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 (%x)\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 (start = 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/board/dnp1110/lowlevel_init.S b/board/dnp1110/lowlevel_init.S
deleted file mode 100644
index 7730be3..0000000
--- a/board/dnp1110/lowlevel_init.S
+++ /dev/null
@@ -1,135 +0,0 @@ 
-/*
- * Memory Setup stuff - taken from blob memsetup.S
- *
- * Copyright (C) 1999 2000 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl) and
- *                     Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl)
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-
-#include "config.h"
-#include "version.h"
-
-
-/* some parameters for the board */
-
-MEM_BASE:	.long	0xa0000000
-MEM_START:	.long	0xc0000000
-
-#define MDCNFG		0x00
-#define MDCAS00		0x04		/* CAS waveform rotate reg 0       */
-#define MDCAS01		0x08		/* CAS waveform rotate reg 1 bank  */
-#define MDCAS02		0x0C		/* CAS waveform rotate reg 2 bank  */
-#define MDREFR		0x1C		/* DRAM refresh control reg        */
-#define MDCAS20		0x20		/* CAS waveform rotate reg 0 bank  */
-#define MDCAS21		0x24		/* CAS waveform rotate reg 1 bank  */
-#define MDCAS22		0x28		/* CAS waveform rotate reg 2 bank  */
-#define MECR		0x18		/* Expansion memory (PCMCIA) bus configuration  register */
-#define MSC0		0x10		/* static memory control reg 0     */
-#define MSC1		0x14		/* static memory control reg 1     */
-#define MSC2		0x2C		/* static memory control reg 2     */
-#define SMCNFG		0x30		/* SMROM configuration reg         */
-
-mdcas00:	.long	0x5555557F
-mdcas01:	.long	0x55555555
-mdcas02:	.long	0x55555555
-mdcas20:	.long	0x5555557F
-mdcas21:	.long	0x55555555
-mdcas22:	.long	0x55555555
-mdcnfg:		.long	0x0000B25C
-mdrefr:		.long	0x007000C1
-mecr:		.long	0x10841084
-msc0:		.long	0x00004774
-msc1:		.long	0x00000000
-msc2:		.long	0x00000000
-smcnfg:		.long	0x00000000
-
-/* setting up the memory */
-
-.globl lowlevel_init
-lowlevel_init:
-
-	ldr	r0, MEM_BASE
-
-	/* Set up the DRAM */
-
-	/* MDCAS00 */
-	ldr	r1, mdcas00
-	str	r1, [r0, #MDCAS00]
-
-	/* MDCAS01 */
-	ldr	r1, mdcas01
-	str	r1, [r0, #MDCAS01]
-
-	/* MDCAS02 */
-	ldr	r1, mdcas02
-	str	r1, [r0, #MDCAS02]
-
-	/* MDCAS20 */
-	ldr	r1, mdcas20
-	str	r1, [r0, #MDCAS20]
-
-	/* MDCAS21 */
-	ldr	r1, mdcas21
-	str	r1, [r0, #MDCAS21]
-
-	/* MDCAS22 */
-	ldr	r1, mdcas22
-	str	r1, [r0, #MDCAS22]
-
-	/* MDREFR */
-	ldr	r1, mdrefr
-	str	r1, [r0, #MDREFR]
-
-	/* Set up PCMCIA space */
-	ldr	r1, mecr
-	str	r1, [r0, #MECR]
-
-	/* Setup the flash memory and other */
-	ldr	r1, msc0
-	str	r1, [r0, #MSC0]
-
-	ldr	r1, msc1
-	str	r1, [r0, #MSC1]
-
-	ldr	r1, msc2
-	str	r1, [r0, #MSC2]
-
-	ldr	r1, smcnfg
-	str	r1, [r0, #SMCNFG]
-
-	/* MDCNFG */
-	ldr	r1, mdcnfg
-	bic	r1, r1, #0x00000001
-	str	r1, [r0, #MDCNFG]
-
-	/* Load something to activate bank */
-	ldr	r2, MEM_START
-.rept	8
-	ldr	r1, [r2]
-.endr
-
-	/* MDCNFG */
-	ldr	r1, mdcnfg
-	orr	r1, r1, #0x00000001
-	str	r1, [r0, #MDCNFG]
-
-	/* everything is fine now */
-	mov	pc, lr
diff --git a/boards.cfg b/boards.cfg
index 54ead3e..c4ec13d 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -221,7 +221,6 @@  xaeniax                      arm         pxa
 xm250                        arm         pxa
 zipitz2                      arm         pxa
 zylonite                     arm         pxa
-dnp1110                      arm         sa1100
 gcplus                       arm         sa1100
 jornada                      arm         sa1100
 lart                         arm         sa1100
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index 72c3c30..a34c2ed 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
 =============================================================================
+dnp1110	arm	sa1100	-	  2011-09-05	Alex Züpke <azu@sysgo.de>
 SMN42	arm	arm720t	-	  2011-09-05
 at91rm9200dk arm arm920t 1c85752  2011-07-17
 m501sk	arm	arm920t	b1a2bd4	  2011-07-17
diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
deleted file mode 100644
index 7d79d57..0000000
--- a/include/configs/dnp1110.h
+++ /dev/null
@@ -1,162 +0,0 @@ 
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Rolf Offermanns <rof@sysgo.de>
- *
- * Configuation settings for the SSV DNP1110 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
-
-/*
- * If we are developing, we might want to start armboot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_SKIP_LOWLEVEL_INIT	1
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-#define CONFIG_SA1110		1	/* This is an SA1110 CPU	*/
-#define CONFIG_DNP1110		1	/* on an DNP/1110 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
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128*1024)
-
-/*
- * Hardware drivers
- */
-#define CONFIG_NET_MULTI
-#define CONFIG_SMC91111
-#define CONFIG_SMC91111_BASE 0x20000300
-
-
-/*
- * select serial console configuration
- */
-#define CONFIG_SA1100_SERIAL
-#define CONFIG_SERIAL1          1	/* we use SERIAL 1 */
-
-/* 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=ramfs devfs=mount console=ttySA0,115200"
-#define CONFIG_ETHADDR		02:80:ad:20:31:b8
-#define CONFIG_NETMASK          255.255.0.0
-#define CONFIG_IPADDR		172.22.2.23
-#define CONFIG_SERVERIP		172.22.2.22
-#define CONFIG_BOOTFILE		"dnp1110"
-#define CONFIG_BOOTCOMMAND	"tftp; bootm"
-
-#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_LONGHELP				/* undef to save memory		*/
-#define	CONFIG_SYS_PROMPT		"DNP1110 # "	/* 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	0xc0400000	/* memtest works on	*/
-#define CONFIG_SYS_MEMTEST_END		0xc0800000	/* 4 ... 8 MB in DRAM	*/
-
-#define	CONFIG_SYS_LOAD_ADDR		0xc0200000	/* default load address	*/
-
-#define	CONFIG_SYS_HZ			3686400		/* incrementer freq: 3.6864 MHz */
-#define CONFIG_SYS_CPUSPEED		0x0b		/* set core clock to 220 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 banks of DRAM */
-#define PHYS_SDRAM_1		0xc0000000 /* SDRAM Bank #1 */
-#define PHYS_SDRAM_1_SIZE	0x02000000 /* 32 MB */
-
-
-#define PHYS_FLASH_1		0x00000000 /* Flash Bank #1 */
-#define PHYS_FLASH_SIZE		0x01000000 /* 16 MB */
-#define PHYS_FLASH_BANK_SIZE    0x01000000 /* 32 MB Banks */
-#define PHYS_FLASH_SECT_SIZE    0x00020000 /* 256 KB sectors (x2) */
-
-#define CONFIG_SYS_FLASH_BASE		PHYS_FLASH_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_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_ADDR			(PHYS_FLASH_1 + 0xF80000)	/* Addr of Environment Sector	*/
-#define CONFIG_ENV_SIZE			0x20000						/* Total Size of Environment Sector	*/
-
-#endif	/* __CONFIG_H */