]> git.sur5r.net Git - u-boot/commitdiff
board: altera: delete unused source files
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Mon, 31 Mar 2014 04:06:38 +0000 (13:06 +0900)
committerTom Rini <trini@ti.com>
Thu, 17 Apr 2014 18:38:30 +0000 (14:38 -0400)
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Scott McNutt <smcnutt@psyent.com>
board/altera/common/AMDLV065D.c [deleted file]
board/altera/common/flash.c [deleted file]

diff --git a/board/altera/common/AMDLV065D.c b/board/altera/common/AMDLV065D.c
deleted file mode 100644 (file)
index eaa6b98..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-
-#include <common.h>
-#if defined(CONFIG_NIOS)
-#include <nios.h>
-#else
-#include <asm/io.h>
-#endif
-
-#define SECTSZ         (64 * 1024)
-flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
-
-/*----------------------------------------------------------------------*/
-unsigned long flash_init (void)
-{
-       int i;
-       unsigned long addr;
-       flash_info_t *fli = &flash_info[0];
-
-       fli->size = CONFIG_SYS_FLASH_SIZE;
-       fli->sector_count = CONFIG_SYS_MAX_FLASH_SECT;
-       fli->flash_id = FLASH_MAN_AMD + FLASH_AMDLV065D;
-
-       addr = CONFIG_SYS_FLASH_BASE;
-       for (i = 0; i < fli->sector_count; ++i) {
-               fli->start[i] = addr;
-               addr += SECTSZ;
-               fli->protect[i] = 1;
-       }
-
-       return (CONFIG_SYS_FLASH_SIZE);
-}
-/*--------------------------------------------------------------------*/
-void flash_print_info (flash_info_t * info)
-{
-       int i, k;
-       int erased;
-       unsigned long *addr;
-
-       printf ("  Size: %ld KB in %d Sectors\n",
-               info->size >> 10, info->sector_count);
-       printf ("  Sector Start Addresses:");
-       for (i = 0; i < info->sector_count; ++i) {
-
-               /* Check if whole sector is erased */
-               erased = 1;
-               addr = (unsigned long *) info->start[i];
-               for (k = 0; k < SECTSZ/sizeof(unsigned long); k++) {
-                       if ( readl(addr++) != (unsigned long)-1) {
-                               erased = 0;
-                               break;
-                       }
-               }
-
-               /* Print the info */
-               if ((i % 5) == 0)
-                       printf ("\n   ");
-               printf (" %08lX%s%s",
-                       info->start[i],
-                       erased ? " E" : "  ",
-                       info->protect[i] ? "RO " : "   ");
-       }
-       printf ("\n");
-}
-
-/*-------------------------------------------------------------------*/
-
-
-int flash_erase (flash_info_t * info, int s_first, int s_last)
-{
-       unsigned char *addr = (unsigned char *) info->start[0];
-       unsigned char *addr2;
-       int prot, sect;
-       ulong start;
-
-       /* Some sanity checking */
-       if ((s_first < 0) || (s_first > s_last)) {
-               printf ("- no sectors to erase\n");
-               return 1;
-       }
-
-       prot = 0;
-       for (sect = s_first; sect <= s_last; ++sect) {
-               if (info->protect[sect]) {
-                       prot++;
-               }
-       }
-       if (prot) {
-               printf ("- Warning: %d protected sectors will not be erased!\n",
-                       prot);
-       } else {
-               printf ("\n");
-       }
-
-       /* It's ok to erase multiple sectors provided we don't delay more
-        * than 50 usec between cmds ... at which point the erase time-out
-        * occurs. So don't go and put printf() calls in the loop ... it
-        * won't be very helpful ;-)
-        */
-       for (sect = s_first; sect <= s_last; sect++) {
-               if (info->protect[sect] == 0) { /* not protected */
-                       addr2 = (unsigned char *) info->start[sect];
-                       writeb (0xaa, addr);
-                       writeb (0x55, addr);
-                       writeb (0x80, addr);
-                       writeb (0xaa, addr);
-                       writeb (0x55, addr);
-                       writeb (0x30, addr2);
-                       /* Now just wait for 0xff & provide some user
-                        * feedback while we wait.
-                        */
-                       start = get_timer (0);
-                       while ( readb (addr2) != 0xff) {
-                               udelay (1000 * 1000);
-                               putc ('.');
-                               if (get_timer (start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
-                                       printf ("timeout\n");
-                                       return 1;
-                               }
-                       }
-               }
-       }
-       printf ("\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)
-{
-
-       vu_char *cmd = (vu_char *) info->start[0];
-       vu_char *dst = (vu_char *) addr;
-       unsigned char b;
-       ulong start;
-
-       while (cnt) {
-               /* Check for sufficient erase */
-               b = *src;
-               if ((readb (dst) & b) != b) {
-                       printf ("%02x : %02x\n", readb (dst), b);
-                       return (2);
-               }
-
-               writeb (0xaa, cmd);
-               writeb (0x55, cmd);
-               writeb (0xa0, cmd);
-               writeb (b, dst);
-
-               /* Verify write */
-               start = get_timer (0);
-               while (readb (dst) != b) {
-                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
-                               return 1;
-                       }
-               }
-               dst++;
-               src++;
-               cnt--;
-       }
-
-       return (0);
-}
diff --git a/board/altera/common/flash.c b/board/altera/common/flash.c
deleted file mode 100644 (file)
index 8f56a30..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-
-#include <common.h>
-#include <nios.h>
-
-flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
-
-/*--------------------------------------------------------------------*/
-void flash_print_info (flash_info_t * info)
-{
-       int i, k;
-       unsigned long size;
-       int erased;
-       volatile unsigned char *flash;
-
-       printf ("  Size: %ld KB in %d Sectors\n",
-               info->size >> 10, info->sector_count);
-       printf ("  Sector Start Addresses:");
-       for (i = 0; i < info->sector_count; ++i) {
-
-               /* Check if whole sector is erased */
-               if (i != (info->sector_count - 1))
-                       size = info->start[i + 1] - info->start[i];
-               else
-                       size = info->start[0] + info->size - info->start[i];
-               erased = 1;
-               flash = (volatile unsigned char *) info->start[i];
-               for (k = 0; k < size; k++) {
-                       if (*flash++ != 0xff) {
-                               erased = 0;
-                               break;
-                       }
-               }
-
-               /* Print the info */
-               if ((i % 5) == 0)
-                       printf ("\n   ");
-               printf (" %08lX%s%s", info->start[i], erased ? " E" : "  ",
-                       info->protect[i] ? "RO " : "   ");
-       }
-       printf ("\n");
-}
-
-/*-------------------------------------------------------------------*/
-
-
-int flash_erase (flash_info_t * info, int s_first, int s_last)
-{
-       volatile CONFIG_SYS_FLASH_WORD_SIZE *addr = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[0]);
-       volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2;
-       int prot, sect;
-       unsigned oldpri;
-       ulong start;
-
-       /* Some sanity checking */
-       if ((s_first < 0) || (s_first > s_last)) {
-               printf ("- no sectors to erase\n");
-               return 1;
-       }
-
-       prot = 0;
-       for (sect = s_first; sect <= s_last; ++sect) {
-               if (info->protect[sect]) {
-                       prot++;
-               }
-       }
-       if (prot) {
-               printf ("- Warning: %d protected sectors will not be erased!\n",
-                       prot);
-       } else {
-               printf ("\n");
-       }
-
-#ifdef DEBUG
-       for (sect = s_first; sect <= s_last; sect++) {
-               printf("- Erase: Sect: %i @ 0x%08x\n", sect,  info->start[sect]);
-       }
-#endif
-
-       /* NOTE: disabling interrupts on Nios can be very bad since it
-        * also disables the LO_LIMIT exception. It's better here to
-        * set the interrupt priority to 3 & restore it when we're done.
-        */
-       oldpri = ipri (3);
-
-       /* It's ok to erase multiple sectors provided we don't delay more
-        * than 50 usec between cmds ... at which point the erase time-out
-        * occurs. So don't go and put printf() calls in the loop ... it
-        * won't be very helpful ;-)
-        */
-       for (sect = s_first; sect <= s_last; sect++) {
-               if (info->protect[sect] == 0) { /* not protected */
-                       addr2 = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[sect]);
-                       *addr = 0xaa;
-                       *addr = 0x55;
-                       *addr = 0x80;
-                       *addr = 0xaa;
-                       *addr = 0x55;
-                       *addr2 = 0x30;
-                       /* Now just wait for 0xff & provide some user
-                        * feedback while we wait. Here we have to grant
-                        * timer interrupts. Otherwise get_timer() can't
-                        * work right. */
-                       ipri(oldpri);
-                       start = get_timer (0);
-                       while (*addr2 != 0xff) {
-                               udelay (1000 * 1000);
-                               putc ('.');
-                               if (get_timer (start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
-                                       printf ("timeout\n");
-                                       return 1;
-                               }
-                       }
-                       oldpri = ipri (3); /* disallow non important irqs again */
-               }
-       }
-
-       printf ("\n");
-
-       /* Restore interrupt priority */
-       ipri (oldpri);
-
-       return 0;
-}
-
-/*-----------------------------------------------------------------------
- * Copy memory to flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-
-int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
-{
-
-       vu_char *cmd = (vu_char *) info->start[0];
-       vu_char *dst = (vu_char *) addr;
-       unsigned char b;
-       unsigned oldpri;
-       ulong start;
-
-       while (cnt) {
-               /* Check for sufficient erase */
-               b = *src;
-               if ((*dst & b) != b) {
-                       printf ("%02x : %02x\n", *dst, b);
-                       return (2);
-               }
-
-               /* Disable interrupts other than window underflow
-                * (interrupt priority 2)
-                */
-               oldpri = ipri (3);
-               *cmd = 0xaa;
-               *cmd = 0x55;
-               *cmd = 0xa0;
-               *dst = b;
-
-               /* Verify write */
-               start = get_timer (0);
-               while (*dst != b) {
-                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
-                               ipri (oldpri);
-                               return 1;
-                       }
-               }
-               dst++;
-               src++;
-               cnt--;
-               ipri (oldpri);
-       }
-
-       return (0);
-}