]> git.sur5r.net Git - u-boot/commitdiff
remove MVS1 board
authorAndre Schwarz <andre.schwarz@matrix-vision.de>
Mon, 18 Aug 2008 11:35:27 +0000 (13:35 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 26 Aug 2008 21:58:46 +0000 (23:58 +0200)
MVS1 board has reached end-of-life and can be removed completely.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
MAINTAINERS
MAKEALL
Makefile
board/mvs1/Makefile [deleted file]
board/mvs1/README [deleted file]
board/mvs1/config.mk [deleted file]
board/mvs1/flash.c [deleted file]
board/mvs1/mvs1.c [deleted file]
board/mvs1/u-boot.lds [deleted file]
board/mvs1/u-boot.lds.debug [deleted file]

index 277ffad4aaa11da2c79270d99c4e4bf13c88cd52..1b3b80230f7b750cba2ac002745c0df4ce4c4373 100644 (file)
@@ -189,10 +189,6 @@ Wolfgang Grandegger <wg@denx.de>
        IPHASE4539      MPC8260
        SCM             MPC8260
 
-Howard Gray <mvsensor@matrix-vision.de>
-
-       MVS1            MPC823
-
 Joe Hamman <joe.hamman@embeddedspecialties.com>
 
        sbc8548         MPC8548
diff --git a/MAKEALL b/MAKEALL
index edfee90f2e58069d68e76f06475090f800242f79..e807063333a8a17ace6abc9809d41f3902616616 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -114,7 +114,6 @@ LIST_8xx="          \
        MHPC            \
        MPC86xADS       \
        MPC885ADS       \
-       MVS1            \
        NETPHONE        \
        NETTA           \
        NETTA2          \
index 66d91046a358d42aea0968fc0ad5d14c8763ca23..cb07788e203223a9ed25af7bf7f24b50f8b2d355 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -914,9 +914,6 @@ mgsuvd_config:              unconfig
 MHPC_config:           unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx mhpc eltec
 
-MVS1_config :          unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx mvs1
-
 xtract_NETVIA = $(subst _V2,,$(subst _config,,$1))
 
 NETVIA_V2_config \
diff --git a/board/mvs1/Makefile b/board/mvs1/Makefile
deleted file mode 100644 (file)
index cf07cf4..0000000
+++ /dev/null
@@ -1,44 +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).a
-
-COBJS  = $(BOARD).o flash.o
-
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
-SOBJS  := $(addprefix $(obj),$(SOBJS))
-
-$(LIB):        $(obj).depend $(OBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS)
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/mvs1/README b/board/mvs1/README
deleted file mode 100644 (file)
index 69520bd..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-This port is for the MATRIX Vision mvSensor.
-It is an mpc823-based universal image processing board
-with CMOS or CCD sensor, 4MB FLASH and 16-64MB RAM.
-
-See http://www.matrix-vision.de for more details or mail...
-
-mvsensor@matrix-vision.de
-
-Howard Gray
-MATRIX Vision GmbH
-Talstr. 16
-D-71570
-Oppenweiler
-Germany
diff --git a/board/mvs1/config.mk b/board/mvs1/config.mk
deleted file mode 100644 (file)
index 9d6080b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# (C) Copyright 2000
-# 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
-#
-
-#
-# TQM8xxL boards
-#
-
-TEXT_BASE = 0x40000000
diff --git a/board/mvs1/flash.c b/board/mvs1/flash.c
deleted file mode 100644 (file)
index a52fe55..0000000
+++ /dev/null
@@ -1,719 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * Changes for MATRIX Vision MVsensor (C) Copyright 2001
- * MATRIX Vision GmbH / hg, info@matrix-vision.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>
-
-#undef MVDEBUG
-#ifdef MVDEBUG
-#define mvdebug debug
-#else
-#define mvdebug(p) do {} while (0)
-#endif
-
-
-flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
-
-
-#ifdef CONFIG_MVS_16BIT_FLASH
-       #define FLASH_DATA_MASK 0xffff
-       #define FLASH_SHIFT 0
-#else
-       #define FLASH_DATA_MASK 0xffffffff
-       #define FLASH_SHIFT 1
-#endif
-
-
-/*-----------------------------------------------------------------------
- * Functions
- */
-static ulong flash_get_size (vu_long *address, flash_info_t *info);
-static int write_word (flash_info_t *info, ulong dest, ulong data);
-static void flash_get_offsets (ulong base, flash_info_t *info);
-
-/*-----------------------------------------------------------------------
- */
-
-unsigned long flash_init (void)
-{
-       volatile immap_t     *immap  = (immap_t *)CFG_IMMR;
-       volatile memctl8xx_t *memctl = &immap->im_memctl;
-       unsigned long size_b0, size_b1;
-       int i;
-
-       /* Init: no FLASHes known */
-       for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
-               flash_info[i].flash_id = FLASH_UNKNOWN;
-       }
-
-       /* Static FLASH Bank configuration here - FIXME XXX */
-
-       size_b0 = flash_get_size((vu_long *)FLASH_BASE0_PRELIM, &flash_info[0]);
-
-       if (flash_info[0].flash_id == FLASH_UNKNOWN) {
-               printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",
-                       size_b0, size_b0<<20);
-       }
-
-#if defined (FLASH_BASE1_PRELIM)
-       size_b1 = flash_get_size((vu_long *)FLASH_BASE1_PRELIM, &flash_info[1]);
-
-       if (size_b1 > size_b0) {
-               printf ("## ERROR: "
-                       "Bank 1 (0x%08lx = %ld MB) > Bank 0 (0x%08lx = %ld MB)\n",
-                       size_b1, size_b1<<20,
-                       size_b0, size_b0<<20
-               );
-               flash_info[0].flash_id  = FLASH_UNKNOWN;
-               flash_info[1].flash_id  = FLASH_UNKNOWN;
-               flash_info[0].sector_count      = -1;
-               flash_info[1].sector_count      = -1;
-               flash_info[0].size              = 0;
-               flash_info[1].size              = 0;
-               return (0);
-       }
-#else
-       size_b1 = 0;
-#endif
-
-       /* Remap FLASH according to real size */
-       memctl->memc_or0 = CFG_OR_TIMING_FLASH | (-size_b0 & 0xFFFF8000);
-#ifdef CONFIG_MVS_16BIT_FLASH
-       memctl->memc_br0 = (CFG_FLASH_BASE & BR_BA_MSK) | BR_PS_16 | BR_MS_GPCM | BR_V;
-#else
-       memctl->memc_br0 = (CFG_FLASH_BASE & BR_BA_MSK) | BR_PS_32 | BR_MS_GPCM | BR_V;
-#endif
-
-       /* Re-do sizing to get full correct info */
-       size_b0 = flash_get_size((vu_long *)CFG_FLASH_BASE, &flash_info[0]);
-
-       flash_get_offsets (CFG_FLASH_BASE, &flash_info[0]);
-
-       /* monitor protection ON by default */
-       flash_protect(FLAG_PROTECT_SET,
-                     CFG_FLASH_BASE,
-                     CFG_FLASH_BASE+monitor_flash_len-1,
-                     &flash_info[0]);
-
-       if (size_b1) {
-               memctl->memc_or1 = CFG_OR_TIMING_FLASH | (-size_b1 & 0xFFFF8000);
-#ifdef CONFIG_MVS_16BIT_FLASH
-               memctl->memc_br1 = ((CFG_FLASH_BASE + size_b0) & BR_BA_MSK) |
-                                   BR_PS_16 | BR_MS_GPCM | BR_V;
-#else
-               memctl->memc_br1 = ((CFG_FLASH_BASE + size_b0) & BR_BA_MSK) |
-                                   BR_PS_32 | BR_MS_GPCM | BR_V;
-#endif
-               /* Re-do sizing to get full correct info */
-               size_b1 = flash_get_size((vu_long *)(CFG_FLASH_BASE + size_b0),
-                                         &flash_info[1]);
-
-               flash_get_offsets (CFG_FLASH_BASE + size_b0, &flash_info[1]);
-
-               /* monitor protection ON by default */
-               flash_protect(FLAG_PROTECT_SET,
-                             CFG_FLASH_BASE,
-                             CFG_FLASH_BASE+monitor_flash_len-1,
-                             &flash_info[1]);
-       } else {
-               memctl->memc_br1 = 0;           /* invalidate bank */
-
-               flash_info[1].flash_id = FLASH_UNKNOWN;
-               flash_info[1].sector_count = -1;
-       }
-
-       flash_info[0].size = size_b0;
-       flash_info[1].size = size_b1;
-
-       return (size_b0 + size_b1);
-}
-
-/*-----------------------------------------------------------------------
- */
-static void flash_get_offsets (ulong base, flash_info_t *info)
-{
-       int i;
-
-       /* set up sector start address table */
-       if (info->flash_id & FLASH_BTYPE)
-       {       /* bottom boot sector types - these are the useful ones! */
-               /* set sector offsets for bottom boot block type */
-               if ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM320B)
-               {       /* AMDLV320B has 8 x 8k bottom boot sectors */
-                       for (i = 0; i < 8; i++)                                                                                         /* +8k          */
-                               info->start[i] = base + (i * (0x00002000 << FLASH_SHIFT));
-                       for (; i < info->sector_count; i++)                                                                     /* +64k         */
-                               info->start[i] = base + (i * (0x00010000 << FLASH_SHIFT)) - (0x00070000 << FLASH_SHIFT);
-               }
-               else
-               {       /* other types have 4 bottom boot sectors (16,8,8,32) */
-                       i = 0;
-                       info->start[i++] = base +  0x00000000;                                                          /* -            */
-                       info->start[i++] = base + (0x00004000 << FLASH_SHIFT);                          /* +16k         */
-                       info->start[i++] = base + (0x00006000 << FLASH_SHIFT);                          /* +8k          */
-                       info->start[i++] = base + (0x00008000 << FLASH_SHIFT);                          /* +8k          */
-                       info->start[i++] = base + (0x00010000 << FLASH_SHIFT);                          /* +32k         */
-                       for (; i < info->sector_count; i++)                                                                     /* +64k         */
-                               info->start[i] = base + (i * (0x00010000 << FLASH_SHIFT)) - (0x00030000 << FLASH_SHIFT);
-               }
-       }
-       else
-       {       /* top boot sector types - not so useful */
-               /* set sector offsets for top boot block type */
-               if ((info->flash_id & FLASH_TYPEMASK) == FLASH_AM320T)
-               {       /* AMDLV320T has 8 x 8k top boot sectors */
-                       for (i = 0; i < info->sector_count - 8; i++)                                            /* +64k         */
-                               info->start[i] = base + (i * (0x00010000 << FLASH_SHIFT));
-                       for (; i < info->sector_count; i++)                                                                     /* +8k          */
-                               info->start[i] = base + (i * (0x00002000 << FLASH_SHIFT));
-               }
-               else
-               {       /* other types have 4 top boot sectors (32,8,8,16) */
-                       for (i = 0; i < info->sector_count - 4; i++)                                            /* +64k         */
-                               info->start[i] = base + (i * (0x00010000 << FLASH_SHIFT));
-
-                       info->start[i++] = base + info->size - (0x00010000 << FLASH_SHIFT);     /* -32k         */
-                       info->start[i++] = base + info->size - (0x00008000 << FLASH_SHIFT);     /* -8k          */
-                       info->start[i++] = base + info->size - (0x00006000 << FLASH_SHIFT);     /* -8k          */
-                       info->start[i]   = base + info->size - (0x00004000 << FLASH_SHIFT);     /* -16k         */
-               }
-       }
-}
-
-/*-----------------------------------------------------------------------
- */
-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_AMD:     printf ("AMD ");                break;
-       case FLASH_MAN_FUJ:     printf ("FUJITSU ");    break;
-       case FLASH_MAN_STM:     printf ("ST ");                 break;
-       default:                printf ("Unknown Vendor ");     break;
-       }
-
-       switch (info->flash_id & FLASH_TYPEMASK) {
-       case FLASH_AM160B:      printf ("AM29LV160B (16 Mbit, bottom boot sect)\n");
-                               break;
-       case FLASH_AM160T:      printf ("AM29LV160T (16 Mbit, top boot sector)\n");
-                               break;
-       case FLASH_AM320B:      printf ("AM29LV320B (32 Mbit, bottom boot sect)\n");
-                               break;
-       case FLASH_AM320T:      printf ("AM29LV320T (32 Mbit, top boot sector)\n");
-                               break;
-       case FLASH_STMW320DB:   printf ("M29W320B (32 Mbit, bottom boot sect)\n");
-                               break;
-       case FLASH_STMW320DT:   printf ("M29W320T (32 Mbit, top boot sector)\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");
-}
-
-/*-----------------------------------------------------------------------
- */
-
-
-/*-----------------------------------------------------------------------
- */
-
-/*
- * The following code cannot be run from FLASH!
- */
-
-#define        AMD_ID_LV160T_MVS       (AMD_ID_LV160T & FLASH_DATA_MASK)
-#define AMD_ID_LV160B_MVS      (AMD_ID_LV160B & FLASH_DATA_MASK)
-#define AMD_ID_LV320T_MVS      (AMD_ID_LV320T & FLASH_DATA_MASK)
-#define AMD_ID_LV320B_MVS      (AMD_ID_LV320B & FLASH_DATA_MASK)
-#define STM_ID_W320DT_MVS      (STM_ID_29W320DT & FLASH_DATA_MASK)
-#define STM_ID_W320DB_MVS      (STM_ID_29W320DB & FLASH_DATA_MASK)
-#define AMD_MANUFACT_MVS       (AMD_MANUFACT  & FLASH_DATA_MASK)
-#define FUJ_MANUFACT_MVS       (FUJ_MANUFACT  & FLASH_DATA_MASK)
-#define STM_MANUFACT_MVS       (STM_MANUFACT  & FLASH_DATA_MASK)
-
-#define AUTOSELECT_ADDR1       0x0555
-#define AUTOSELECT_ADDR2       0x02AA
-#define AUTOSELECT_ADDR3       AUTOSELECT_ADDR1
-
-#define AUTOSELECT_DATA1       (0x00AA00AA & FLASH_DATA_MASK)
-#define AUTOSELECT_DATA2       (0x00550055 & FLASH_DATA_MASK)
-#define AUTOSELECT_DATA3       (0x00900090 & FLASH_DATA_MASK)
-
-#define RESET_BANK_DATA                (0x00F000F0 & FLASH_DATA_MASK)
-
-static ulong flash_get_size (vu_long *address, flash_info_t *info)
-{
-       short i;
-#ifdef CONFIG_MVS_16BIT_FLASH
-       ushort value;
-       vu_short *addr = (vu_short *)address;
-#else
-       ulong value;
-       vu_long *addr = (vu_long *)address;
-#endif
-       ulong base = (ulong)address;
-
-       /* Write auto select command: read Manufacturer ID */
-       addr[AUTOSELECT_ADDR1] = AUTOSELECT_DATA1;
-       addr[AUTOSELECT_ADDR2] = AUTOSELECT_DATA2;
-       addr[AUTOSELECT_ADDR3] = AUTOSELECT_DATA3;
-
-       value = addr[0];                        /* manufacturer ID      */
-       switch (value) {
-       case AMD_MANUFACT_MVS:
-               info->flash_id = FLASH_MAN_AMD;
-               break;
-       case FUJ_MANUFACT_MVS:
-               info->flash_id = FLASH_MAN_FUJ;
-               break;
-       case STM_MANUFACT_MVS:
-               info->flash_id = FLASH_MAN_STM;
-               break;
-       default:
-               info->flash_id = FLASH_UNKNOWN;
-               info->sector_count = 0;
-               info->size = 0;
-               return (0);                     /* no or unknown flash  */
-       }
-
-       value = addr[1];                        /* device ID            */
-       switch (value) {
-       case AMD_ID_LV160T_MVS:
-               info->flash_id += FLASH_AM160T;
-               info->sector_count = 37;
-               info->size = (0x00200000 << FLASH_SHIFT);
-               break;                          /* => 2 or 4 MB         */
-
-       case AMD_ID_LV160B_MVS:
-               info->flash_id += FLASH_AM160B;
-               info->sector_count = 37;
-               info->size = (0x00200000 << FLASH_SHIFT);
-               break;                          /* => 2 or 4 MB         */
-
-       case AMD_ID_LV320T_MVS:
-               info->flash_id += FLASH_AM320T;
-               info->sector_count = 71;
-               info->size = (0x00400000 << FLASH_SHIFT);
-               break;                          /* => 4 or 8 MB         */
-
-       case AMD_ID_LV320B_MVS:
-               info->flash_id += FLASH_AM320B;
-               info->sector_count = 71;
-               info->size = (0x00400000 << FLASH_SHIFT);
-               break;                          /* => 4 or 8MB          */
-
-       case STM_ID_W320DT_MVS:
-               info->flash_id += FLASH_STMW320DT;
-               info->sector_count = 67;
-               info->size = (0x00400000 << FLASH_SHIFT);
-               break;                          /* => 4 or 8 MB         */
-
-       case STM_ID_W320DB_MVS:
-               info->flash_id += FLASH_STMW320DB;
-               info->sector_count = 67;
-               info->size = (0x00400000 << FLASH_SHIFT);
-               break;                          /* => 4 or 8MB          */
-
-       default:
-               info->flash_id = FLASH_UNKNOWN;
-               return (0);                     /* => no or unknown flash */
-
-       }
-
-       /* set up sector start address table */
-       flash_get_offsets (base, info);
-
-       /* check for protected sectors */
-       for (i = 0; i < info->sector_count; i++) {
-               /* read sector protection at sector address, (A7 .. A0) = 0x02 */
-               /* D0 = 1 if protected */
-#ifdef CONFIG_MVS_16BIT_FLASH
-               addr = (vu_short *)(info->start[i]);
-#else
-               addr = (vu_long *)(info->start[i]);
-#endif
-               info->protect[i] = addr[2] & 1;
-       }
-
-       /*
-        * Prevent writes to uninitialized FLASH.
-        */
-       if (info->flash_id != FLASH_UNKNOWN) {
-#ifdef CONFIG_MVS_16BIT_FLASH
-               addr = (vu_short *)info->start[0];
-#else
-               addr = (vu_long *)info->start[0];
-#endif
-               *addr = RESET_BANK_DATA;        /* reset bank */
-       }
-
-       return (info->size);
-}
-
-
-/*-----------------------------------------------------------------------
- */
-
-#define ERASE_ADDR1 0x0555
-#define ERASE_ADDR2 0x02AA
-#define ERASE_ADDR3 ERASE_ADDR1
-#define ERASE_ADDR4 ERASE_ADDR1
-#define ERASE_ADDR5 ERASE_ADDR2
-
-#define ERASE_DATA1 (0x00AA00AA & FLASH_DATA_MASK)
-#define ERASE_DATA2 (0x00550055 & FLASH_DATA_MASK)
-#define ERASE_DATA3 (0x00800080 & FLASH_DATA_MASK)
-#define ERASE_DATA4 ERASE_DATA1
-#define ERASE_DATA5 ERASE_DATA2
-
-#define ERASE_SECTOR_DATA (0x00300030 & FLASH_DATA_MASK)
-#define ERASE_CHIP_DATA (0x00100010 & FLASH_DATA_MASK)
-#define ERASE_CONFIRM_DATA (0x00800080 & FLASH_DATA_MASK)
-
-int    flash_erase (flash_info_t *info, int s_first, int s_last)
-{
-#ifdef CONFIG_MVS_16BIT_FLASH
-       vu_short *addr = (vu_short *)(info->start[0]);
-#else
-       vu_long *addr = (vu_long *)(info->start[0]);
-#endif
-       int flag, prot, sect, l_sect;
-       ulong start, now, last;
-
-       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;
-       }
-
-       if ((info->flash_id == FLASH_UNKNOWN) ||
-           (info->flash_id > FLASH_AMD_COMP)) {
-               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");
-       }
-
-       l_sect = -1;
-
-       /* Disable interrupts which might cause a timeout here */
-       flag = disable_interrupts();
-
-       addr[ERASE_ADDR1] = ERASE_DATA1;
-       addr[ERASE_ADDR2] = ERASE_DATA2;
-       addr[ERASE_ADDR3] = ERASE_DATA3;
-       addr[ERASE_ADDR4] = ERASE_DATA4;
-       addr[ERASE_ADDR5] = ERASE_DATA5;
-
-       /* Start erase on unprotected sectors */
-       for (sect = s_first; sect<=s_last; sect++) {
-               if (info->protect[sect] == 0) { /* not protected */
-#ifdef CONFIG_MVS_16BIT_FLASH
-                       addr = (vu_short *)(info->start[sect]);
-#else
-                       addr = (vu_long *)(info->start[sect]);
-#endif
-                       addr[0] = ERASE_SECTOR_DATA;
-                       l_sect = sect;
-               }
-       }
-
-       /* re-enable interrupts if necessary */
-       if (flag)
-               enable_interrupts();
-
-       /* wait at least 80us - let's wait 1 ms */
-       udelay (1000);
-
-       /*
-        * We wait for the last triggered sector
-        */
-       if (l_sect < 0)
-               goto DONE;
-
-       start = get_timer (0);
-       last  = start;
-#ifdef CONFIG_MVS_16BIT_FLASH
-       addr = (vu_short *)(info->start[l_sect]);
-#else
-       addr = (vu_long *)(info->start[l_sect]);
-#endif
-       while ((addr[0] & ERASE_CONFIRM_DATA) != ERASE_CONFIRM_DATA) {
-               if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
-                       printf ("Timeout\n");
-                       return 1;
-               }
-               /* show that we're waiting */
-               if ((now - last) > 1000) {      /* every second */
-                       putc ('.');
-                       last = now;
-               }
-       }
-
-DONE:
-       /* reset to read mode */
-#ifdef CONFIG_MVS_16BIT_FLASH
-       addr = (vu_short *)info->start[0];
-#else
-       addr = (vu_long *)info->start[0];
-#endif
-       addr[0] = RESET_BANK_DATA;      /* reset bank */
-
-       printf (" done\n");
-       return 0;
-}
-
-
-/*-----------------------------------------------------------------------
- * 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)
-{
-#define BUFF_INC 4
-       ulong cp, wp, data;
-       int i, l, rc;
-
-       mvdebug (("+write_buff %p ==> 0x%08lx, count = 0x%08lx\n", src, addr, cnt));
-
-       wp = (addr & ~3);       /* get lower word aligned address */
-       /*
-        * handle unaligned start bytes
-        */
-       if ((l = addr - wp) != 0) {
-               mvdebug ((" handle unaligned start bytes (cnt = 0x%08%lx)\n", cnt));
-               data = 0;
-               for (i=0, cp=wp; i<l; ++i, ++cp) {
-                       data = (data << 8) | (*(uchar *)cp);
-               }
-               for (; i<BUFF_INC && cnt>0; ++i) {
-                       data = (data << 8) | *src++;
-                       --cnt;
-                       ++cp;
-               }
-               for (; cnt==0 && i<BUFF_INC; ++i, ++cp) {
-                       data = (data << 8) | (*(uchar *)cp);
-               }
-
-               if ((rc = write_word(info, wp, data)) != 0) {
-                       return (rc);
-               }
-               wp += BUFF_INC;
-       }
-
-       /*
-        * handle (half)word aligned part
-        */
-       mvdebug ((" handle word aligned part (cnt = 0x%08%lx)\n", cnt));
-       while (cnt >= BUFF_INC) {
-               data = 0;
-               for (i=0; i<BUFF_INC; ++i) {
-                       data = (data << 8) | *src++;
-               }
-               if ((rc = write_word(info, wp, data)) != 0) {
-                       return (rc);
-               }
-               wp  += BUFF_INC;
-               cnt -= BUFF_INC;
-       }
-
-       if (cnt == 0) {
-               return (0);
-       }
-
-       /*
-        * handle unaligned tail bytes
-        */
-       mvdebug ((" handle unaligned tail bytes (cnt = 0x%08%lx)\n", cnt));
-       data = 0;
-       for (i=0, cp=wp; i<BUFF_INC && cnt>0; ++i, ++cp) {
-               data = (data << 8) | *src++;
-               --cnt;
-       }
-       for (; i<BUFF_INC; ++i, ++cp) {
-               data = (data << 8) | (*(uchar *)cp);
-       }
-
-       return (write_word(info, wp, data));
-}
-
-#define WRITE_ADDR1 0x0555
-#define WRITE_ADDR2 0x02AA
-#define WRITE_ADDR3 WRITE_ADDR1
-
-#define WRITE_DATA1 (0x00AA00AA & FLASH_DATA_MASK)
-#define WRITE_DATA2 (0x00550055 & FLASH_DATA_MASK)
-#define WRITE_DATA3 (0x00A000A0 & FLASH_DATA_MASK)
-
-#define WRITE_CONFIRM_DATA ERASE_CONFIRM_DATA
-
-#ifndef CONFIG_MVS_16BIT_FLASH
-/*-----------------------------------------------------------------------
- * Write a word to Flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-static int write_word (flash_info_t *info, ulong dest, ulong data)
-{
-       vu_long *addr = (vu_long *)(info->start[0]);
-       ulong start;
-       int flag;
-
-       mvdebug (("+write_word (to 0x%08lx)\n", dest));
-       /* Check if Flash is (sufficiently) erased */
-       if ((*((vu_long *)dest) & data) != data) {
-               return (2);
-       }
-       /* Disable interrupts which might cause a timeout here */
-       flag = disable_interrupts();
-
-       addr[WRITE_ADDR1] = WRITE_DATA1;
-       addr[WRITE_ADDR2] = WRITE_DATA2;
-       addr[WRITE_ADDR3] = WRITE_DATA3;
-
-       *((vu_long *)dest) = data;
-
-       /* re-enable interrupts if necessary */
-       if (flag)
-               enable_interrupts();
-
-       /* data polling for D7 */
-       start = get_timer (0);
-       addr = (vu_long *)dest;
-       while ((*addr & WRITE_CONFIRM_DATA) != (data & WRITE_CONFIRM_DATA)) {
-               if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
-                       return (1);
-               }
-       }
-
-       mvdebug (("-write_word\n"));
-       return (0);
-}
-#else /* CONFIG_MVS_16BIT_FLASH */
-/*-----------------------------------------------------------------------
- * Write a halfword to Flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-static int write_halfword (flash_info_t *info, ulong dest, ushort data)
-{
-       vu_short *addr = (vu_short *)(info->start[0]);
-       ulong start;
-       int flag;
-
-       mvdebug (("+write_halfword (to 0x%08lx)\n", dest));
-       /* Check if Flash is (sufficiently) erased */
-       if ((*((vu_short *)dest) & data) != data) {
-               return (2);
-       }
-       /* Disable interrupts which might cause a timeout here */
-       flag = disable_interrupts();
-
-       addr[WRITE_ADDR1] = WRITE_DATA1;
-       addr[WRITE_ADDR2] = WRITE_DATA2;
-       addr[WRITE_ADDR3] = WRITE_DATA3;
-
-       *((vu_short *)dest) = data;
-
-       /* re-enable interrupts if necessary */
-       if (flag)
-               enable_interrupts();
-
-       /* data polling for D7 */
-       start = get_timer (0);
-       addr = (vu_short *)dest;
-       while ((*addr & WRITE_CONFIRM_DATA) != (data & WRITE_CONFIRM_DATA)) {
-               if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
-                       return (1);
-               }
-       }
-       mvdebug (("-write_halfword\n"));
-       return (0);
-}
-
-
-/*-----------------------------------------------------------------------
- * Write a word to Flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-static int write_word (flash_info_t *info, ulong dest, ulong data)
-{
-       int result = 0;
-
-       if (write_halfword (info, dest, (data & ~FLASH_DATA_MASK) >> 16) == 0)
-       {
-               dest += 2;
-               data = data & FLASH_DATA_MASK;
-               result = write_halfword (info, dest, data);
-       }
-       return result;
-}
-#endif
-/*-----------------------------------------------------------------------
- */
diff --git a/board/mvs1/mvs1.c b/board/mvs1/mvs1.c
deleted file mode 100644 (file)
index 58b84f5..0000000
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * Changes for MATRIX Vision MVsensor (C) Copyright 2001
- * MATRIX Vision GmbH / hg, info@matrix-vision.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>
-
-/* ------------------------------------------------------------------------- */
-
-static long int dram_size (long int, long int *, long int);
-
-/* ------------------------------------------------------------------------- */
-
-#define        _NOT_USED_      0xFFFFFFFF
-
-const uint sdram_table[] =
-{
-       /*
-        * Single Read. (Offset 0 in UPMA RAM)
-        */
-       0x1F0DFC04, 0xEEAFBC04, 0x11AF7C04, 0xEFBAFC00,
-       0x1FF5FC47, /* last */
-       /*
-        * SDRAM Initialization (offset 5 in UPMA RAM)
-        *
-        * This is no UPM entry point. The following definition uses
-        * the remaining space to establish an initialization
-        * sequence, which is executed by a RUN command.
-        *
-        */
-                   0x1FF5FC34, 0xEFEABC34, 0x1FB57C35, /* last */
-       /*
-        * Burst Read. (Offset 8 in UPMA RAM)
-        */
-       0x1F0DFC04, 0xEEAFBC04, 0x10AF7C04, 0xF0AFFC00,
-       0xF0AFFC00, 0xF1AFFC00, 0xEFBAFC00, 0x1FF5FC47, /* last */
-       _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
-       _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
-       /*
-        * Single Write. (Offset 18 in UPMA RAM)
-        */
-       0x1F0DFC04 /*0x1F2DFC04??*/, 0xEEABBC00, 0x01B27C04, 0x1FF5FC47, /* last */
-       _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
-       /*
-        * Burst Write. (Offset 20 in UPMA RAM)
-        */
-       0x1F0DFC04, 0xEEABBC00, 0x10A77C00, 0xF0AFFC00,
-       0xF0AFFC00, 0xE1BAFC04, 0x1FF5FC47, /* last */
-                                           _NOT_USED_,
-       _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
-       _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
-       /*
-        * Refresh  (Offset 30 in UPMA RAM)
-        */
-       0x1FFD7C84, 0xFFFFFC04, 0xFFFFFC04, 0xFFFFFC04,
-       0xFFFFFC84, 0xFFFFFC07, /* last */
-                               _NOT_USED_, _NOT_USED_,
-       _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
-       /*
-        * Exception. (Offset 3c in UPMA RAM)
-        */
-       0x7FFFFC07, /* last */
-                   _NOT_USED_, _NOT_USED_, _NOT_USED_,
-};
-
-/* ------------------------------------------------------------------------- */
-
-
-/*
- * Check Board Identity:
- */
-
-int checkboard (void)
-{
-       puts ("Board: MATRIX Vision MVsensor\n");
-       return 0;
-}
-
-
-#ifdef DO_RAM_TEST
-/* ------------------------------------------------------------------------- */
-
-/*
- * Test SDRAM by writing its address to itself and reading several times
-*/
-#define READ_RUNS 4
-static void test_dram (unsigned long *start, unsigned long *end)
-{
-       unsigned long *addr;
-       unsigned long value;
-       int read_runs, errors, addr_errors;
-
-       printf ("\nChecking SDRAM from %p to %p\n", start, end);
-       udelay (1000000);
-       for (addr = start; addr < end; addr++)
-               *addr = (unsigned long) addr;
-
-       for (addr = start, addr_errors = 0; addr < end; addr++) {
-               for (read_runs = READ_RUNS, errors = 0; read_runs > 0; read_runs--) {
-                       if ((value = *addr) != (unsigned long) addr)
-                               errors++;
-               }
-               if (errors > 0) {
-                       addr_errors++;
-                       printf ("SDRAM errors (%d) at %p, last read  = %ld\n",
-                                       errors, addr, value);
-                       udelay (10000);
-               }
-       }
-       printf ("SDRAM check finished, total errors = %d\n", addr_errors);
-}
-#endif                                                 /*  DO_RAM_TEST */
-
-
-/* ------------------------------------------------------------------------- */
-
-phys_size_t initdram (int board_type)
-{
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
-       volatile memctl8xx_t *memctl = &immap->im_memctl;
-       long int size_b0, size_b1, size8, size9;
-
-       upmconfig (UPMA, (uint *) sdram_table,
-                          sizeof (sdram_table) / sizeof (uint));
-
-       /*
-        * Preliminary prescaler for refresh (depends on number of
-        * banks): This value is selected for four cycles every 62.4 us
-        * with two SDRAM banks or four cycles every 31.2 us with one
-        * bank. It will be adjusted after memory sizing.
-        */
-       memctl->memc_mptpr = CFG_MPTPR_2BK_8K;
-
-       memctl->memc_mar = 0x00000088;
-
-       /*
-        * Map controller banks 2 and 3 to the SDRAM banks 2 and 3 at
-        * preliminary addresses - these have to be modified after the
-        * SDRAM size has been determined.
-        */
-       memctl->memc_or2 = CFG_OR2_PRELIM;
-       memctl->memc_br2 = CFG_BR2_PRELIM;
-
-#if defined (CFG_OR3_PRELIM) && defined (CFG_BR3_PRELIM)
-       if (board_type == 0) {          /* "L" type boards have only one bank SDRAM */
-               memctl->memc_or3 = CFG_OR3_PRELIM;
-               memctl->memc_br3 = CFG_BR3_PRELIM;
-       }
-#endif
-
-       memctl->memc_mamr = CFG_MAMR_8COL & (~(MAMR_PTAE));     /* no refresh yet */
-
-       udelay (200);
-
-       /* perform SDRAM initializsation sequence */
-
-       memctl->memc_mcr = 0x80004105;  /* SDRAM bank 0 */
-       udelay (1);
-       memctl->memc_mcr = 0x80004230;  /* SDRAM bank 0 - execute twice */
-       udelay (1);
-
-       if (board_type == 0) {          /* "L" type boards have only one bank SDRAM */
-               memctl->memc_mcr = 0x80006105;  /* SDRAM bank 1 */
-               udelay (1);
-               memctl->memc_mcr = 0x80006230;  /* SDRAM bank 1 - execute twice */
-               udelay (1);
-       }
-
-       memctl->memc_mamr |= MAMR_PTAE; /* enable refresh */
-
-       udelay (1000);
-
-       /*
-        * Check Bank 0 Memory Size for re-configuration
-        *
-        * try 8 column mode
-        */
-       size8 = dram_size (CFG_MAMR_8COL, SDRAM_BASE2_PRELIM,
-                                          SDRAM_MAX_SIZE);
-
-       udelay (1000);
-       /*
-        * try 9 column mode
-        */
-       size9 = dram_size (CFG_MAMR_9COL, SDRAM_BASE2_PRELIM,
-                                          SDRAM_MAX_SIZE);
-
-       if (size8 < size9) {            /* leave configuration at 9 columns */
-               size_b0 = size9;
-       } else {                                        /* back to 8 columns            */
-               size_b0 = size8;
-               memctl->memc_mamr = CFG_MAMR_8COL;
-               udelay (500);
-       }
-
-       if (board_type == 0) {          /* "L" type boards have only one bank SDRAM */
-               /*
-                * Check Bank 1 Memory Size
-                * use current column settings
-                * [9 column SDRAM may also be used in 8 column mode,
-                *  but then only half the real size will be used.]
-                */
-#if defined (SDRAM_BASE3_PRELIM)
-               size_b1 =
-                               dram_size (memctl->memc_mamr, (ulong *) SDRAM_BASE3_PRELIM,
-                                                  SDRAM_MAX_SIZE);
-#else
-               size_b1 = 0;
-#endif
-       } else {
-               size_b1 = 0;
-       }
-
-       udelay (1000);
-
-       /*
-        * Adjust refresh rate depending on SDRAM type, both banks
-        * For types > 128 MBit leave it at the current (fast) rate
-        */
-       if ((size_b0 < 0x02000000) && (size_b1 < 0x02000000)) {
-               /* reduce to 15.6 us (62.4 us / quad) */
-               memctl->memc_mptpr = CFG_MPTPR_2BK_4K;
-               udelay (1000);
-       }
-
-       /*
-        * Final mapping: map bigger bank first
-        */
-       if (size_b1 > size_b0) {        /* SDRAM Bank 1 is bigger - map first   */
-
-               memctl->memc_or3 = ((-size_b1) & 0xFFFF0000) | CFG_OR_TIMING_SDRAM;
-               memctl->memc_br3 =
-                               (CFG_SDRAM_BASE & BR_BA_MSK) | BR_MS_UPMA | BR_V;
-
-               if (size_b0 > 0) {
-                       /*
-                        * Position Bank 0 immediately above Bank 1
-                        */
-                       memctl->memc_or2 =
-                                       ((-size_b0) & 0xFFFF0000) | CFG_OR_TIMING_SDRAM;
-                       memctl->memc_br2 =
-                                       ((CFG_SDRAM_BASE & BR_BA_MSK) | BR_MS_UPMA | BR_V)
-                                       + size_b1;
-               } else {
-                       unsigned long reg;
-
-                       /*
-                        * No bank 0
-                        *
-                        * invalidate bank
-                        */
-                       memctl->memc_br2 = 0;
-
-                       /* adjust refresh rate depending on SDRAM type, one bank */
-                       reg = memctl->memc_mptpr;
-                       reg >>= 1;                      /* reduce to CFG_MPTPR_1BK_8K / _4K */
-                       memctl->memc_mptpr = reg;
-               }
-
-       } else {                                        /* SDRAM Bank 0 is bigger - map first   */
-
-               memctl->memc_or2 = ((-size_b0) & 0xFFFF0000) | CFG_OR_TIMING_SDRAM;
-               memctl->memc_br2 =
-                               (CFG_SDRAM_BASE & BR_BA_MSK) | BR_MS_UPMA | BR_V;
-
-               if (size_b1 > 0) {
-                       /*
-                        * Position Bank 1 immediately above Bank 0
-                        */
-                       memctl->memc_or3 =
-                                       ((-size_b1) & 0xFFFF0000) | CFG_OR_TIMING_SDRAM;
-                       memctl->memc_br3 =
-                                       ((CFG_SDRAM_BASE & BR_BA_MSK) | BR_MS_UPMA | BR_V)
-                                       + size_b0;
-               } else {
-                       unsigned long reg;
-
-                       /*
-                        * No bank 1
-                        *
-                        * invalidate bank
-                        */
-                       memctl->memc_br3 = 0;
-
-                       /* adjust refresh rate depending on SDRAM type, one bank */
-                       reg = memctl->memc_mptpr;
-                       reg >>= 1;                      /* reduce to CFG_MPTPR_1BK_8K / _4K */
-                       memctl->memc_mptpr = reg;
-               }
-       }
-
-       udelay (10000);
-
-#ifdef DO_RAM_TEST
-       if (size_b0 > 0)
-               test_dram ((unsigned long *) CFG_SDRAM_BASE,
-                                  (unsigned long *) (CFG_SDRAM_BASE + size_b0));
-#endif
-
-       return (size_b0 + size_b1);
-}
-
-/* ------------------------------------------------------------------------- */
-
-/*
- * Check memory range for valid RAM. A simple memory test determines
- * the actually available RAM size between addresses `base' and
- * `base + maxsize'. Some (not all) hardware errors are detected:
- * - short between address lines
- * - short between data lines
- */
-
-static long int dram_size (long int mamr_value, long int *base,
-                                                  long int maxsize)
-{
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
-       volatile memctl8xx_t *memctl = &immap->im_memctl;
-
-       memctl->memc_mamr = mamr_value;
-
-       return (get_ram_size(base, maxsize));
-}
-
-
-/* ------------------------------------------------------------------------- */
-
-u8 *dhcp_vendorex_prep (u8 * e)
-{
-       char *ptr;
-
-/* DHCP vendor-class-identifier = 60 */
-       if ((ptr = getenv ("dhcp_vendor-class-identifier"))) {
-               *e++ = 60;
-               *e++ = strlen (ptr);
-               while (*ptr)
-                       *e++ = *ptr++;
-       }
-/* my DHCP_CLIENT_IDENTIFIER = 61 */
-       if ((ptr = getenv ("dhcp_client_id"))) {
-               *e++ = 61;
-               *e++ = strlen (ptr);
-               while (*ptr)
-                       *e++ = *ptr++;
-       }
-
-       return e;
-}
-
-
-/* ------------------------------------------------------------------------- */
-u8 *dhcp_vendorex_proc (u8 * popt)
-{
-       return NULL;
-}
diff --git a/board/mvs1/u-boot.lds b/board/mvs1/u-boot.lds
deleted file mode 100644 (file)
index 55a9c3a..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * (C) Copyright 2000
- * 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
- */
-
-OUTPUT_ARCH(powerpc)
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = + SIZEOF_HEADERS;
-  .interp : { *(.interp) }
-  .hash          : { *(.hash)          }
-  .dynsym        : { *(.dynsym)                }
-  .dynstr        : { *(.dynstr)                }
-  .rel.text      : { *(.rel.text)      }
-  .rela.text     : { *(.rela.text)     }
-  .rel.data      : { *(.rel.data)      }
-  .rela.data     : { *(.rela.data)     }
-  .rel.rodata    : { *(.rel.rodata)    }
-  .rela.rodata   : { *(.rela.rodata)   }
-  .rel.got       : { *(.rel.got)       }
-  .rela.got      : { *(.rela.got)      }
-  .rel.ctors     : { *(.rel.ctors)     }
-  .rela.ctors    : { *(.rela.ctors)    }
-  .rel.dtors     : { *(.rel.dtors)     }
-  .rela.dtors    : { *(.rela.dtors)    }
-  .rel.bss       : { *(.rel.bss)       }
-  .rela.bss      : { *(.rela.bss)      }
-  .rel.plt       : { *(.rel.plt)       }
-  .rela.plt      : { *(.rela.plt)      }
-  .init          : { *(.init)          }
-  .plt : { *(.plt) }
-  .text      :
-  {
-    /* WARNING - the following is hand-optimized to fit within */
-    /* the sector layout of our flash chips!   XXX FIXME XXX   */
-
-    cpu/mpc8xx/start.o         (.text)
-    common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
-    lib_generic/ctype.o                (.text)
-    lib_generic/string.o       (.text)
-    lib_ppc/extable.o          (.text)
-    lib_ppc/kgdb.o             (.text)
-
-  . = env_offset;
-    common/environment.o(.text)
-
-    *(.text)
-    *(.fixup)
-    *(.got1)
-  }
-  _etext = .;
-  PROVIDE (etext = .);
-  .rodata    :
-  {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
-    *(.eh_frame)
-  }
-  .fini      : { *(.fini)    } =0
-  .ctors     : { *(.ctors)   }
-  .dtors     : { *(.dtors)   }
-
-  /* Read-write section, merged into data segment: */
-  . = (. + 0x00FF) & 0xFFFFFF00;
-  _erotext = .;
-  PROVIDE (erotext = .);
-  .reloc   :
-  {
-    *(.got)
-    _GOT2_TABLE_ = .;
-    *(.got2)
-    _FIXUP_TABLE_ = .;
-    *(.fixup)
-  }
-  __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2;
-  __fixup_entries = (. - _FIXUP_TABLE_)>>2;
-
-  .data    :
-  {
-    *(.data)
-    *(.data1)
-    *(.sdata)
-    *(.sdata2)
-    *(.dynamic)
-    CONSTRUCTORS
-  }
-  _edata  =  .;
-  PROVIDE (edata = .);
-
-  . = .;
-  __u_boot_cmd_start = .;
-  .u_boot_cmd : { *(.u_boot_cmd) }
-  __u_boot_cmd_end = .;
-
-
-  . = .;
-  __start___ex_table = .;
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
-
-  . = ALIGN(256);
-  __init_begin = .;
-  .text.init : { *(.text.init) }
-  .data.init : { *(.data.init) }
-  . = ALIGN(256);
-  __init_end = .;
-
-  __bss_start = .;
-  .bss (NOLOAD)       :
-  {
-   *(.sbss) *(.scommon)
-   *(.dynbss)
-   *(.bss)
-   *(COMMON)
-  }
-  _end = . ;
-  PROVIDE (end = .);
-}
diff --git a/board/mvs1/u-boot.lds.debug b/board/mvs1/u-boot.lds.debug
deleted file mode 100644 (file)
index c33581d..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * (C) Copyright 2000
- * 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
- */
-
-OUTPUT_ARCH(powerpc)
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = + SIZEOF_HEADERS;
-  .interp : { *(.interp) }
-  .hash          : { *(.hash)          }
-  .dynsym        : { *(.dynsym)                }
-  .dynstr        : { *(.dynstr)                }
-  .rel.text      : { *(.rel.text)              }
-  .rela.text     : { *(.rela.text)     }
-  .rel.data      : { *(.rel.data)              }
-  .rela.data     : { *(.rela.data)     }
-  .rel.rodata    : { *(.rel.rodata)    }
-  .rela.rodata   : { *(.rela.rodata)   }
-  .rel.got       : { *(.rel.got)               }
-  .rela.got      : { *(.rela.got)              }
-  .rel.ctors     : { *(.rel.ctors)     }
-  .rela.ctors    : { *(.rela.ctors)    }
-  .rel.dtors     : { *(.rel.dtors)     }
-  .rela.dtors    : { *(.rela.dtors)    }
-  .rel.bss       : { *(.rel.bss)               }
-  .rela.bss      : { *(.rela.bss)              }
-  .rel.plt       : { *(.rel.plt)               }
-  .rela.plt      : { *(.rela.plt)              }
-  .init          : { *(.init)  }
-  .plt : { *(.plt) }
-  .text      :
-  {
-    /* WARNING - the following is hand-optimized to fit within */
-    /* the sector layout of our flash chips!   XXX FIXME XXX   */
-
-    cpu/mpc8xx/start.o (.text)
-    common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-
-    . = env_offset;
-    common/environment.o(.text)
-
-    *(.text)
-    *(.fixup)
-    *(.got1)
-  }
-  _etext = .;
-  PROVIDE (etext = .);
-  .rodata    :
-  {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
-    *(.eh_frame)
-  }
-  .fini      : { *(.fini)    } =0
-  .ctors     : { *(.ctors)   }
-  .dtors     : { *(.dtors)   }
-
-  /* Read-write section, merged into data segment: */
-  . = (. + 0x0FFF) & 0xFFFFF000;
-  _erotext = .;
-  PROVIDE (erotext = .);
-  .reloc   :
-  {
-    *(.got)
-    _GOT2_TABLE_ = .;
-    *(.got2)
-    _FIXUP_TABLE_ = .;
-    *(.fixup)
-  }
-  __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2;
-  __fixup_entries = (. - _FIXUP_TABLE_)>>2;
-
-  .data    :
-  {
-    *(.data)
-    *(.data1)
-    *(.sdata)
-    *(.sdata2)
-    *(.dynamic)
-    CONSTRUCTORS
-  }
-  _edata  =  .;
-  PROVIDE (edata = .);
-
-  __u_boot_cmd_start = .;
-  .u_boot_cmd : { *(.u_boot_cmd) }
-  __u_boot_cmd_end = .;
-
-
-  __start___ex_table = .;
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
-
-  . = ALIGN(4096);
-  __init_begin = .;
-  .text.init : { *(.text.init) }
-  .data.init : { *(.data.init) }
-  . = ALIGN(4096);
-  __init_end = .;
-
-  __bss_start = .;
-  .bss       :
-  {
-   *(.sbss) *(.scommon)
-   *(.dynbss)
-   *(.bss)
-   *(COMMON)
-  }
-  _end = . ;
-  PROVIDE (end = .);
-}