Signed-off-by: Wolfgang Denk <w...@denx.de>
Cc: Gary Jennejohn <ga...@denx.de>
---
 MAINTAINERS                            |    4 -
 MAKEALL                                |    1 -
 board/samsung/smdk2400/Makefile        |   51 ----
 board/samsung/smdk2400/config.mk       |   25 --
 board/samsung/smdk2400/flash.c         |  490 --------------------------------
 board/samsung/smdk2400/lowlevel_init.S |  163 -----------
 board/samsung/smdk2400/smdk2400.c      |  125 --------
 boards.cfg                             |    1 -
 doc/README.scrapyard                   |    1 +
 include/configs/smdk2400.h             |  189 ------------
 10 files changed, 1 insertions(+), 1049 deletions(-)
 delete mode 100644 board/samsung/smdk2400/Makefile
 delete mode 100644 board/samsung/smdk2400/config.mk
 delete mode 100644 board/samsung/smdk2400/flash.c
 delete mode 100644 board/samsung/smdk2400/lowlevel_init.S
 delete mode 100644 board/samsung/smdk2400/smdk2400.c
 delete mode 100644 include/configs/smdk2400.h

diff --git a/MAINTAINERS b/MAINTAINERS
index f3e8579..82281b0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -661,10 +661,6 @@ Grazvydas Ignotas <nota...@gmail.com>
 
        omap3_pandora   ARM ARMV7 (OMAP3xx SoC)
 
-Gary Jennejohn <ga...@denx.de>
-
-       smdk2400        ARM920T
-
 Matthias Kaehlcke <matth...@kaehlcke.net>
        edb9301                 ARM920T (EP9301)
        edb9302                 ARM920T (EP9302)
diff --git a/MAKEALL b/MAKEALL
index 2b90d90..788c5b6 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -328,7 +328,6 @@ LIST_ARM9="                 \
        portl2                  \
        rd6281a                 \
        sheevaplug              \
-       smdk2400                \
        smdk2410                \
        spear300                \
        spear310                \
diff --git a/board/samsung/smdk2400/Makefile b/board/samsung/smdk2400/Makefile
deleted file mode 100644
index 0c45d02..0000000
--- a/board/samsung/smdk2400/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@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  := smdk2400.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/samsung/smdk2400/config.mk b/board/samsung/smdk2400/config.mk
deleted file mode 100644
index 4c27dc3..0000000
--- a/board/samsung/smdk2400/config.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <ga...@denx.de>
-#
-# SAMSUNG board with S3C2400X (ARM920T) CPU
-#
-# see http://www.samsung.com/ for more information on SAMSUNG
-#
-
-#
-# SAMSUNG has 1 bank of 32 MB DRAM
-#
-# 0C00'0000 to 0E00'0000
-#
-# Linux-Kernel is expected to be at 0cf0'0000, entry 0cf0'0000
-# optionally with a ramdisk at 0c80'0000
-#
-# we load ourself to 0CF80000 (must be high enough not to be
-# overwritten by the uncompessing Linux kernel)
-#
-# download area is 0C80'0000
-#
-
-
-CONFIG_SYS_TEXT_BASE = 0x0CF80000
diff --git a/board/samsung/smdk2400/flash.c b/board/samsung/smdk2400/flash.c
deleted file mode 100644
index fb69c21..0000000
--- a/board/samsung/smdk2400/flash.c
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroe...@sysgo.de>
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <ga...@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
- */
-
-/* #define DEBUG */
-
-#include <common.h>
-#include <environment.h>
-
-#define FLASH_BANK_SIZE 0x1000000      /* 2 x   8 MB */
-#define MAIN_SECT_SIZE  0x40000                /* 2 x 128 kB */
-
-flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
-
-
-#define CMD_READ_ARRAY         0x00FF00FF
-#define CMD_IDENTIFY           0x00900090
-#define CMD_ERASE_SETUP                0x00200020
-#define CMD_ERASE_CONFIRM      0x00D000D0
-#define CMD_PROGRAM            0x00400040
-#define CMD_RESUME             0x00D000D0
-#define CMD_SUSPEND            0x00B000B0
-#define CMD_STATUS_READ                0x00700070
-#define CMD_STATUS_RESET       0x00500050
-
-#define BIT_BUSY               0x00800080
-#define BIT_ERASE_SUSPEND      0x00400040
-#define BIT_ERASE_ERROR                0x00200020
-#define BIT_PROGRAM_ERROR      0x00100010
-#define BIT_VPP_RANGE_ERROR    0x00080008
-#define BIT_PROGRAM_SUSPEND    0x00040004
-#define BIT_PROTECT_ERROR      0x00020002
-#define BIT_UNDEFINED          0x00010001
-
-#define BIT_SEQUENCE_ERROR     0x00300030
-#define BIT_TIMEOUT            0x80000000
-
-/*-----------------------------------------------------------------------
- */
-
-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_28F640J3A & 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);
-               if (i == 0)
-                       flashbase = CONFIG_SYS_FLASH_BASE;
-               else
-                       panic ("configured too many flash banks!\n");
-               for (j = 0; j < flash_info[i].sector_count; j++) {
-                       flash_info[i].start[j] = flashbase;
-
-                       /* uniform sector size */
-                       flashbase += 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_SECT_SIZE - 1, 
&flash_info[0]);
-
-#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;
-}
-
-/*-----------------------------------------------------------------------
- */
-void flash_print_info (flash_info_t * info)
-{
-       int i;
-
-       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_28F640J3A & FLASH_TYPEMASK):
-               printf ("2x 28F640J3A (64Mbit)\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");
-
-Done:  ;
-}
-
-/*-----------------------------------------------------------------------
- */
-
-int flash_error (ulong code)
-{
-       /* Check bit patterns */
-       /* SR.7=0 is busy, SR.7=1 is ready */
-       /* all other flags indicate error on 1 */
-       /* SR.0 is undefined */
-       /* Timeout is our faked flag */
-
-       /* sequence is described in Intel 290644-005 document */
-
-       /* check Timeout */
-       if (code & BIT_TIMEOUT) {
-               puts ("Timeout\n");
-               return ERR_TIMOUT;
-       }
-
-       /* check Busy, SR.7 */
-       if (~code & BIT_BUSY) {
-               puts ("Busy\n");
-               return ERR_PROG_ERROR;
-       }
-
-       /* check Vpp low, SR.3 */
-       if (code & BIT_VPP_RANGE_ERROR) {
-               puts ("Vpp range error\n");
-               return ERR_PROG_ERROR;
-       }
-
-       /* check Device Protect Error, SR.1 */
-       if (code & BIT_PROTECT_ERROR) {
-               puts ("Device protect error\n");
-               return ERR_PROG_ERROR;
-       }
-
-       /* check Command Seq Error, SR.4 & SR.5 */
-       if (code & BIT_SEQUENCE_ERROR) {
-               puts ("Command seqence error\n");
-               return ERR_PROG_ERROR;
-       }
-
-       /* check Block Erase Error, SR.5 */
-       if (code & BIT_ERASE_ERROR) {
-               puts ("Block erase error\n");
-               return ERR_PROG_ERROR;
-       }
-
-       /* check Program Error, SR.4 */
-       if (code & BIT_PROGRAM_ERROR) {
-               puts ("Program error\n");
-               return ERR_PROG_ERROR;
-       }
-
-       /* check Block Erase Suspended, SR.6 */
-       if (code & BIT_ERASE_SUSPEND) {
-               puts ("Block erase suspended\n");
-               return ERR_PROG_ERROR;
-       }
-
-       /* check Program Suspended, SR.2 */
-       if (code & BIT_PROGRAM_SUSPEND) {
-               puts ("Program suspended\n");
-               return ERR_PROG_ERROR;
-       }
-
-       /* OK, no error */
-       return ERR_OK;
-}
-
-/*-----------------------------------------------------------------------
- */
-
-int flash_erase (flash_info_t * info, int s_first, int s_last)
-{
-       ulong result, result1;
-       int iflag, prot, sect;
-       int rc = ERR_OK;
-
-#ifdef USE_920T_MMU
-       int cflag;
-#endif
-
-       debug ("flash_erase: s_first %d  s_last %d\n", s_first, s_last);
-
-       /* first look for protection bits */
-
-       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) {
-               printf ("- Warning: %d protected sectors will not be erased!\n",
-                       prot);
-       } else {
-               printf ("\n");
-       }
-
-       /*
-        * 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.
-        */
-#ifdef USE_920T_MMU
-       cflag = dcache_status ();
-       dcache_disable ();
-#endif
-       iflag = disable_interrupts ();
-
-       /* Start erase on unprotected sectors */
-       for (sect = s_first; sect <= s_last && !ctrlc (); sect++) {
-
-               debug ("Erasing sector %2d @ %08lX... ",
-                       sect, info->start[sect]);
-
-               /* arm simple, non interrupt dependent timer */
-               reset_timer_masked ();
-
-               if (info->protect[sect] == 0) { /* not protected */
-                       vu_long *addr = (vu_long *) (info->start[sect]);
-                       ulong bsR7, bsR7_2, bsR5, bsR5_2;
-
-                       /* *addr = CMD_STATUS_RESET; */
-                       *addr = CMD_ERASE_SETUP;
-                       *addr = CMD_ERASE_CONFIRM;
-
-                       /* wait until flash is ready */
-                       do {
-                               /* check timeout */
-                               if (get_timer_masked () > 
CONFIG_SYS_FLASH_ERASE_TOUT) {
-                                       *addr = CMD_STATUS_RESET;
-                                       result = BIT_TIMEOUT;
-                                       break;
-                               }
-
-                               *addr = CMD_STATUS_READ;
-                               result = *addr;
-                               bsR7 = result & (1 << 7);
-                               bsR7_2 = result & (1 << 23);
-                       } while (!bsR7 | !bsR7_2);
-
-                       *addr = CMD_STATUS_READ;
-                       result1 = *addr;
-                       bsR5 = result1 & (1 << 5);
-                       bsR5_2 = result1 & (1 << 21);
-#ifdef SAMSUNG_FLASH_DEBUG
-                       printf ("bsR5 %lx bsR5_2 %lx\n", bsR5, bsR5_2);
-                       if (bsR5 != 0 && bsR5_2 != 0)
-                               printf ("bsR5 %lx bsR5_2 %lx\n", bsR5, bsR5_2);
-#endif
-
-                       *addr = CMD_READ_ARRAY;
-                       *addr = CMD_RESUME;
-
-                       if ((rc = flash_error (result)) != ERR_OK)
-                               goto outahere;
-#if 0
-                       printf ("ok.\n");
-               } else {                /* it was protected */
-
-                       printf ("protected!\n");
-#endif
-               }
-       }
-
-outahere:
-       /* allow flash to settle - wait 10 ms */
-       udelay_masked (10000);
-
-       if (iflag)
-               enable_interrupts ();
-
-#ifdef USE_920T_MMU
-       if (cflag)
-               dcache_enable ();
-#endif
-       return rc;
-}
-
-/*-----------------------------------------------------------------------
- * Copy memory to flash
- */
-
-static int write_word (flash_info_t * info, ulong dest, ulong data)
-{
-       vu_long *addr = (vu_long *) dest;
-       ulong result;
-       int rc = ERR_OK;
-       int iflag;
-
-#ifdef USE_920T_MMU
-       int cflag;
-#endif
-
-       /*
-        * Check if Flash is (sufficiently) erased
-        */
-       result = *addr;
-       if ((result & 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.
-        */
-#ifdef USE_920T_MMU
-       cflag = dcache_status ();
-       dcache_disable ();
-#endif
-       iflag = disable_interrupts ();
-
-       /* *addr = CMD_STATUS_RESET; */
-       *addr = CMD_PROGRAM;
-       *addr = data;
-
-       /* arm simple, non interrupt dependent timer */
-       reset_timer_masked ();
-
-       /* wait until flash is ready */
-       do {
-               /* check timeout */
-               if (get_timer_masked () > CONFIG_SYS_FLASH_ERASE_TOUT) {
-                       *addr = CMD_SUSPEND;
-                       result = BIT_TIMEOUT;
-                       break;
-               }
-
-               *addr = CMD_STATUS_READ;
-               result = *addr;
-       } while (~result & BIT_BUSY);
-
-       /* *addr = CMD_READ_ARRAY; */
-       *addr = CMD_STATUS_READ;
-       result = *addr;
-
-       rc = flash_error (result);
-
-       if (iflag)
-               enable_interrupts ();
-
-#ifdef USE_920T_MMU
-       if (cflag)
-               dcache_enable ();
-#endif
-       *addr = CMD_READ_ARRAY;
-       *addr = CMD_RESUME;
-       return rc;
-}
-
-/*-----------------------------------------------------------------------
- * Copy memory to flash.
- */
-
-int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
-{
-       ulong cp, wp, data;
-       int l;
-       int i, rc;
-
-       wp = (addr & ~3);                       /* 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 << 24);
-               }
-               for (; i < 4 && cnt > 0; ++i) {
-                       data = (data >> 8) | (*src++ << 24);
-                       --cnt;
-                       ++cp;
-               }
-               for (; cnt == 0 && i < 4; ++i, ++cp) {
-                       data = (data >> 8) | (*(uchar *) cp << 24);
-               }
-
-               if ((rc = write_word (info, wp, data)) != 0) {
-                       return (rc);
-               }
-               wp += 4;
-       }
-
-       /*
-        * handle word aligned part
-        */
-       while (cnt >= 4) {
-               data = *((vu_long *) src);
-               if ((rc = write_word (info, wp, data)) != 0) {
-                       return (rc);
-               }
-               src += 4;
-               wp += 4;
-               cnt -= 4;
-       }
-
-       if (cnt == 0) {
-               return ERR_OK;
-       }
-
-       /*
-        * handle unaligned tail bytes
-        */
-       data = 0;
-       for (i = 0, cp = wp; i < 4 && cnt > 0; ++i, ++cp) {
-               data = (data >> 8) | (*src++ << 24);
-               --cnt;
-       }
-       for (; i < 4; ++i, ++cp) {
-               data = (data >> 8) | (*(uchar *) cp << 24);
-       }
-
-       return write_word (info, wp, data);
-}
diff --git a/board/samsung/smdk2400/lowlevel_init.S 
b/board/samsung/smdk2400/lowlevel_init.S
deleted file mode 100644
index c275c07..0000000
--- a/board/samsung/smdk2400/lowlevel_init.S
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Memory Setup stuff - taken from blob memsetup.S
- *
- * Copyright (C) 1999 2000 2001 Erik Mouw (j.a.k.m...@its.tudelft.nl) and
- *                     Jan-Derk Bakker (j.d.bak...@its.tudelft.nl)
- *
- * Modified for the Samsung development board by
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <ga...@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 <config.h>
-#include <version.h>
-
-
-/* some parameters for the board */
-
-/*
- *
- * Taken from linux/arch/arm/boot/compressed/head-s3c2400.S
- *
- * Copyright (C) 2001 Samsung Electronics by chc, 010406
- *
- * S3C2400 specific tweaks.
- *
- */
-
-/* memory controller */
-#define BWSCON 0x14000000
-#define BANKCON3 0x14000010    /* for cs8900, ethernet */
-
-/* Bank0 */
-#define B0_Tacs        0x0     /* 0 clk */
-#define B0_Tcos        0x0     /* 0 clk */
-#define B0_Tacc        0x7     /* 14 clk */
-#define B0_Tcoh        0x0     /* 0 clk */
-#define B0_Tah 0x0     /* 0 clk */
-#define B0_Tacp        0x0
-#define B0_PMC 0x0     /* normal */
-
-/* Bank1 */
-#define B1_Tacs        0x0     /* 0 clk */
-#define B1_Tcos        0x0     /* 0 clk */
-#define B1_Tacc        0x7     /* 14 clk */
-#define B1_Tcoh        0x0     /* 0 clk */
-#define B1_Tah 0x0     /* 0 clk */
-#define B1_Tacp        0x0
-#define B1_PMC 0x0     /* normal */
-
-/* Bank2 */
-#define B2_Tacs        0x0     /* 0 clk */
-#define B2_Tcos        0x0     /* 0 clk */
-#define B2_Tacc        0x7     /* 14 clk */
-#define B2_Tcoh        0x0     /* 0 clk */
-#define B2_Tah 0x0     /* 0 clk */
-#define B2_Tacp        0x0
-#define B2_PMC 0x0     /* normal */
-
-/* Bank3 - setup for the cs8900 */
-#define B3_Tacs        0x0     /* 0 clk */
-#define B3_Tcos        0x3     /* 4 clk */
-#define B3_Tacc        0x7     /* 14 clk */
-#define B3_Tcoh        0x1     /* 1 clk */
-#define B3_Tah 0x0     /* 0 clk */
-#define B3_Tacp        0x3     /* 6 clk */
-#define B3_PMC 0x0     /* normal */
-
-/* Bank4 */
-#define B4_Tacs        0x0     /* 0 clk */
-#define B4_Tcos        0x0     /* 0 clk */
-#define B4_Tacc        0x7     /* 14 clk */
-#define B4_Tcoh        0x0     /* 0 clk */
-#define B4_Tah 0x0     /* 0 clk */
-#define B4_Tacp        0x0
-#define B4_PMC 0x0     /* normal */
-
-/* Bank5 */
-#define B5_Tacs        0x0     /* 0 clk */
-#define B5_Tcos        0x0     /* 0 clk */
-#define B5_Tacc        0x7     /* 14 clk */
-#define B5_Tcoh        0x0     /* 0 clk */
-#define B5_Tah 0x0     /* 0 clk */
-#define B5_Tacp        0x0
-#define B5_PMC 0x0     /* normal */
-
-/* Bank6 */
-#define        B6_MT   0x3     /* SDRAM */
-#define        B6_Trcd 0x1     /* 3clk */
-#define        B6_SCAN 0x1     /* 9 bit */
-
-/* Bank7 */
-#define        B7_MT   0x3     /* SDRAM */
-#define        B7_Trcd 0x1     /* 3clk */
-#define        B7_SCAN 0x1     /* 9 bit */
-
-/* refresh parameter */
-#define REFEN  0x1     /* enable refresh */
-#define TREFMD 0x0     /* CBR(CAS before RAS)/auto refresh */
-#define Trp    0x0     /* 2 clk */
-#define Trc    0x3     /* 7 clk */
-#define Tchr   0x2     /* 3 clk */
-
-#define REFCNT 1113    /* period=15.6 us, HCLK=60Mhz, (2048+1-15.6*66) */
-
-
-_TEXT_BASE:
-       .word   CONFIG_SYS_TEXT_BASE
-
-.globl lowlevel_init
-lowlevel_init:
-       /* memory control configuration */
-       /* make r0 relative the current location so that it */
-       /* reads SMRDATA out of FLASH rather than memory ! */
-       ldr     r0, =SMRDATA
-       ldr     r1, _TEXT_BASE
-       sub     r0, r0, r1
-       ldr     r1, =BWSCON     /* Bus Width Status Controller */
-       add     r2, r0, #52
-0:
-       ldr     r3, [r0], #4
-       str     r3, [r1], #4
-       cmp     r2, r0
-       bne     0b
-
-       /* everything is fine now */
-       mov     pc, lr
-
-       .ltorg
-/* the literal pools origin */
-
-SMRDATA:
-       .word   0x2211d114      /* d->Ethernet, BUSWIDTH=32 */
-       .word   
((B0_Tacs<<13)+(B0_Tcos<<11)+(B0_Tacc<<8)+(B0_Tcoh<<6)+(B0_Tah<<4)+(B0_Tacp<<2)+(B0_PMC))
 /* GCS0 */
-       .word   
((B1_Tacs<<13)+(B1_Tcos<<11)+(B1_Tacc<<8)+(B1_Tcoh<<6)+(B1_Tah<<4)+(B1_Tacp<<2)+(B1_PMC))
 /* GCS1 */
-       .word   
((B2_Tacs<<13)+(B2_Tcos<<11)+(B2_Tacc<<8)+(B2_Tcoh<<6)+(B2_Tah<<4)+(B2_Tacp<<2)+(B2_PMC))
 /* GCS2 */
-       .word   
((B3_Tacs<<13)+(B3_Tcos<<11)+(B3_Tacc<<8)+(B3_Tcoh<<6)+(B3_Tah<<4)+(B3_Tacp<<2)+(B3_PMC))
 /* GCS3 */
-       .word   
((B4_Tacs<<13)+(B4_Tcos<<11)+(B4_Tacc<<8)+(B4_Tcoh<<6)+(B4_Tah<<4)+(B4_Tacp<<2)+(B4_PMC))
 /* GCS4 */
-       .word   
((B5_Tacs<<13)+(B5_Tcos<<11)+(B5_Tacc<<8)+(B5_Tcoh<<6)+(B5_Tah<<4)+(B5_Tacp<<2)+(B5_PMC))
 /* GCS5 */
-       .word   ((B6_MT<<15)+(B6_Trcd<<2)+(B6_SCAN)) /* GCS6 */
-       .word   ((B7_MT<<15)+(B7_Trcd<<2)+(B7_SCAN)) /* GCS7 */
-       .word   ((REFEN<<23)+(TREFMD<<22)+(Trp<<20)+(Trc<<18)+(Tchr<<16)+REFCNT)
-       .word   0x10    /* BUSWIDTH=32, SCLK power saving mode, BANKSIZE 
32M/32M */
-       .word   0x30    /* MRSR6, CL=3clk */
-       .word   0x30    /* MRSR7 */
diff --git a/board/samsung/smdk2400/smdk2400.c 
b/board/samsung/smdk2400/smdk2400.c
deleted file mode 100644
index 895bd77..0000000
--- a/board/samsung/smdk2400/smdk2400.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroe...@sysgo.de>
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <ga...@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 <netdev.h>
-#include <asm/arch/s3c24x0_cpu.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#ifdef CONFIG_MODEM_SUPPORT
-static int key_pressed(void);
-int mdm_init (bd_t *);
-extern void disable_putc(void);
-extern void enable_putc(void);
-extern int hwflow_onoff(int);
-extern int do_mdm_init; /* defined in common/main.c */
-#endif /* CONFIG_MODEM_SUPPORT */
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-
-int board_init (void)
-{
-       struct s3c24x0_clock_power * const clk_power =
-                                       s3c24x0_get_base_clock_power();
-       struct s3c24x0_gpio * const gpio = s3c24x0_get_base_gpio();
-
-       /* memory and cpu-speed are setup before relocation */
-       /* change the clock to be 50 MHz 1:1:1 */
-       clk_power->mpllcon = 0x5c042;
-       clk_power->clkdivn = 0;
-       /* set up the I/O ports */
-       gpio->pacon = 0x3ffff;
-       gpio->pbcon = 0xaaaaaaaa;
-       gpio->pbup = 0xffff;
-       gpio->pecon = 0x0;
-       gpio->peup = 0x0;
-#ifdef CONFIG_HWFLOW
-       /*CTS[0] RTS[0] INPUT INPUT TXD[0] INPUT RXD[0] */
-       /*   10,   10,   00,   00,    10,   00,    10 */
-       gpio->pfcon = 0xa22;
-       /* Disable pull-up on Rx, Tx, CTS and RTS pins */
-       gpio->pfup = 0x35;
-#else
-       /*INPUT INPUT INPUT INPUT TXD[0] INPUT RXD[0] */
-       /*   00,   00,   00,   00,    10,   00,    10 */
-       gpio->pfcon = 0x22;
-       /* Disable pull-up on Rx and Tx pins */
-       gpio->pfup = 0x5;
-#endif /* CONFIG_HWFLOW */
-       gpio->pgcon = 0x0;
-       gpio->pgup = 0x0;
-       gpio->opencr = 0x0;
-
-       /* arch number of SAMSUNG-Board to MACH_TYPE_SMDK2400 */
-       gd->bd->bi_arch_number = MACH_TYPE_SMDK2400;
-
-       /* adress of boot parameters */
-       gd->bd->bi_boot_params = 0x0C000100;
-
-#ifdef CONFIG_MODEM_SUPPORT
-       if (key_pressed()) {
-               disable_putc(); /* modem doesn't understand banner etc */
-               do_mdm_init = 1;
-       }
-#endif /* CONFIG_MODEM_SUPPORT */
-
-       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_MODEM_SUPPORT
-static int key_pressed(void)
-{
-       int rc;
-       if (1) {        /* check for button push here, now just return 1 */
-               rc = 1;
-       }
-
-       return rc;
-}
-#endif /* CONFIG_MODEM_SUPPORT */
-
-#ifdef CONFIG_CMD_NET
-int board_eth_init(bd_t *bis)
-{
-       int rc = 0;
-#ifdef CONFIG_CS8900
-       rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
-#endif
-       return rc;
-}
-#endif
diff --git a/boards.cfg b/boards.cfg
index 084011a..7f54484 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -56,7 +56,6 @@ mx1ads                       arm         arm920t     -        
           -
 cm4008                       arm         arm920t     -                   -     
         ks8695
 cm41xx                       arm         arm920t     -                   -     
         ks8695
 VCMA9                        arm         arm920t     vcma9               mpl   
         s3c24x0
-smdk2400                     arm         arm920t     -                   
samsung        s3c24x0
 smdk2410                     arm         arm920t     -                   
samsung        s3c24x0
 voiceblue                    arm         arm925t
 omap1510inn                  arm         arm925t     -                   ti
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index a10edd0..b147fb6 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
 =============================================================================
+smdk2400 arm   arm920t -         2011-07-17    Gary Jennejohn <ga...@denx.de>
 scb9328        arm     arm920t -         2011-07-17    Konstantin Kletschke 
<kletsc...@synertronixx.de>
 sbc2410x arm   arm920t -         2011-07-17
 netstar        arm     arm925t -         2011-07-17
diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
deleted file mode 100644
index 064749e..0000000
--- a/include/configs/smdk2400.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * (C) Copyright 2002-2005
- * Wolfgang Denk, DENX Software Engineering, <w...@denx.de>
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroe...@sysgo.de>
- * Gary Jennejohn <ga...@denx.de>
- *
- * Configuation settings for the SAMSUNG 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_ARM920T 1       /* This is an ARM920T core      */
-#define CONFIG_S3C24X0 1       /* in a SAMSUNG S3C24x0-type SoC        */
-#define CONFIG_S3C2400 1       /* specifically a SAMSUNG S3C2400 SoC   */
-#define CONFIG_SMDK2400        1       /* on an SAMSUNG SMDK2400 Board */
-
-/* input clock of PLL */
-#define CONFIG_SYS_CLK_FREQ    12000000 /* SMDK2400 has 12 MHz input clock */
-#undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff  */
-
-#define CONFIG_CMDLINE_TAG      1      /* enable passing of ATAGs      */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG       1
-
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024)
-
-/*
- * Hardware drivers
- */
-#define CONFIG_NET_MULTI
-#define CONFIG_CS8900          /* we have a CS8900 on-board */
-#define CONFIG_CS8900_BASE     0x07000300 /* agrees with WIN CE PA */
-#define CONFIG_CS8900_BUS16    /* the Linux driver does accesses as shorts */
-
-/*
- * select serial console configuration
- */
-#define CONFIG_S3C24X0_SERIAL
-#define CONFIG_SERIAL1          1      /* we use SERIAL 1 on SAMSUNG */
-
-#undef CONFIG_HWFLOW                   /* include RTS/CTS flow control support 
*/
-
-#undef CONFIG_MODEM_SUPPORT            /* enable modem initialization stuff */
-
-/*
- * The following enables modem debugging stuff. The dbg() and
- * 'char screen[1024]' are used for debug printfs. Unfortunately,
- * it is usable only from BDI
- */
-#undef CONFIG_MODEM_SUPPORT_DEBUG
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
-#define CONFIG_BAUDRATE                115200
-
-#define        CONFIG_TIMESTAMP        1       /* Print timestamp info for 
images */
-
-/* Use s3c2400's RTC */
-#define CONFIG_RTC_S3C24X0     1
-
-
-/*
- * 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_DATE
-#define CONFIG_CMD_SNTP
-
-#if defined(CONFIG_HWFLOW)
-    #define CONFIG_CONFIG_HWFLOW
-#endif
-
-#if !defined(USE_920T_MMU)
-    #undef CONFIG_CMD_CACHE
-#endif
-
-
-#define CONFIG_BOOTDELAY       3
-#define CONFIG_NETMASK          255.255.255.0
-#define CONFIG_IPADDR          134.98.93.36
-#define CONFIG_SERVERIP                134.98.93.22
-
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_KGDB_BAUDRATE   115200          /* speed to run kgdb serial 
port */
-/* what's this ? it's not used anywhere */
-#define CONFIG_KGDB_SER_INDEX  1               /* which serial port to use */
-#endif
-
-/*
- * Miscellaneous configurable options
- */
-#define        CONFIG_SYS_LONGHELP                             /* undef to 
save memory         */
-#define        CONFIG_SYS_PROMPT               "SMDK2400 # "   /* 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       0x0c000000      /* memtest works on     
*/
-#define CONFIG_SYS_MEMTEST_END         0x0e000000      /* 32 MB in DRAM        
*/
-
-#define        CONFIG_SYS_LOAD_ADDR            0x0cf00000      /* default load 
address */
-
-#define        CONFIG_SYS_HZ                   1000
-
-/* 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           0x0c000000 /* SDRAM Bank #1 */
-#define PHYS_SDRAM_1_SIZE      0x02000000 /* 32 MB */
-
-#define CONFIG_SYS_FLASH_BASE          0x00000000 /* Flash Bank #1 */
-
-/*-----------------------------------------------------------------------
- * 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 */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    (5*CONFIG_SYS_HZ) /* Timeout for Flash 
Erase */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    (5*CONFIG_SYS_HZ) /* Timeout for Flash 
Write */
-
-#define        CONFIG_ENV_IS_IN_FLASH  1
-
-/* Address and size of Primary Environment Sector      */
-#define CONFIG_ENV_ADDR                (CONFIG_SYS_FLASH_BASE + 0x40000)
-#define CONFIG_ENV_SIZE                0x40000
-
-/* Address and size of Redundant Environment Sector    */
-#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
-
-#endif /* __CONFIG_H */
-- 
1.7.6

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to