]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
atstk100x: switch to common cfi driver
authorAndreas Bießmann <biessmann@corscience.de>
Tue, 28 Jun 2011 04:15:58 +0000 (04:15 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 4 Jul 2011 08:55:27 +0000 (10:55 +0200)
This patch removes the board implemenatation for flash driver which can now
safely switched to the common cfi driver.

Compile tested for all atstk100x boards, runtime tested on atstk1002.

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
board/atmel/atstk1000/Makefile
board/atmel/atstk1000/flash.c [deleted file]
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h

index ae47396970774718a34001470479e0682b1d0b53..a02ccf18c243e47cc361bba541bc0e771353ef00 100644 (file)
@@ -27,7 +27,6 @@ include $(TOPDIR)/config.mk
 LIB                    := $(obj)lib$(BOARD).o
 
 COBJS-y                        += $(BOARD).o
-COBJS-y                        += flash.o
 
 SRCS                   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS                   := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
diff --git a/board/atmel/atstk1000/flash.c b/board/atmel/atstk1000/flash.c
deleted file mode 100644 (file)
index 0ba06dd..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (C) 2005-2006 Atmel Corporation
- *
- * 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>
-
-#ifdef CONFIG_ATSTK1000_EXT_FLASH
-#include <asm/arch/cacheflush.h>
-#include <asm/io.h>
-#include <asm/sections.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-flash_info_t flash_info[1];
-
-static void flash_identify(uint16_t *flash, flash_info_t *info)
-{
-       unsigned long flags;
-
-       flags = disable_interrupts();
-
-       dcache_flush_unlocked();
-
-       writew(0xaa, flash + 0x555);
-       writew(0x55, flash + 0xaaa);
-       writew(0x90, flash + 0x555);
-       info->flash_id = readl(flash);
-       writew(0xff, flash);
-
-       readw(flash);
-
-       if (flags)
-               enable_interrupts();
-}
-
-unsigned long flash_init(void)
-{
-       unsigned long addr;
-       unsigned int i;
-
-       flash_info[0].size = CONFIG_SYS_FLASH_SIZE;
-       flash_info[0].sector_count = 135;
-
-       flash_identify(uncached((void *)CONFIG_SYS_FLASH_BASE), &flash_info[0]);
-
-       for (i = 0, addr = 0; i < 8; i++, addr += 0x2000)
-               flash_info[0].start[i] = addr;
-       for (; i < flash_info[0].sector_count; i++, addr += 0x10000)
-               flash_info[0].start[i] = addr;
-
-       return CONFIG_SYS_FLASH_SIZE;
-}
-
-void flash_print_info(flash_info_t *info)
-{
-       printf("Flash: Vendor ID: 0x%02lx, Product ID: 0x%02lx\n",
-              info->flash_id >> 16, info->flash_id & 0xffff);
-       printf("Size: %ld MB in %d sectors\n",
-              info->size >> 10, info->sector_count);
-}
-
-int flash_erase(flash_info_t *info, int s_first, int s_last)
-{
-       unsigned long flags;
-       unsigned long start_time;
-       uint16_t *fb, *sb;
-       unsigned int i;
-       int ret;
-       uint16_t status;
-
-       if ((s_first < 0) || (s_first > s_last)
-           || (s_last >= info->sector_count)) {
-               puts("Error: first and/or last sector out of range\n");
-               return ERR_INVAL;
-       }
-
-       for (i = s_first; i < s_last; i++)
-               if (info->protect[i]) {
-                       printf("Error: sector %d is protected\n", i);
-                       return ERR_PROTECTED;
-               }
-
-       fb = (uint16_t *)uncached(info->start[0]);
-
-       dcache_flush_unlocked();
-
-       for (i = s_first; (i <= s_last) && !ctrlc(); i++) {
-               printf("Erasing sector %3d...", i);
-
-               sb = (uint16_t *)uncached(info->start[i]);
-
-               flags = disable_interrupts();
-
-               start_time = get_timer(0);
-
-               /* Unlock sector */
-               writew(0xaa, fb + 0x555);
-               writew(0x70, sb);
-
-               /* Erase sector */
-               writew(0xaa, fb + 0x555);
-               writew(0x55, fb + 0xaaa);
-               writew(0x80, fb + 0x555);
-               writew(0xaa, fb + 0x555);
-               writew(0x55, fb + 0xaaa);
-               writew(0x30, sb);
-
-               /* Wait for completion */
-               ret = ERR_OK;
-               do {
-                       /* TODO: Timeout */
-                       status = readw(sb);
-               } while ((status != 0xffff) && !(status & 0x28));
-
-               writew(0xf0, fb);
-
-               /*
-                * Make sure the command actually makes it to the bus
-                * before we re-enable interrupts.
-                */
-               readw(fb);
-
-               if (flags)
-                       enable_interrupts();
-
-               if (status != 0xffff) {
-                       printf("Flash erase error at address 0x%p: 0x%02x\n",
-                              sb, status);
-                       ret = ERR_PROG_ERROR;
-                       break;
-               }
-       }
-
-       if (ctrlc())
-               printf("User interrupt!\n");
-
-       return ERR_OK;
-}
-
-int write_buff(flash_info_t *info, uchar *src,
-                          ulong addr, ulong count)
-{
-       unsigned long flags;
-       uint16_t *base, *p, *s, *end;
-       uint16_t word, status, status1;
-       int ret = ERR_OK;
-
-       if (addr < info->start[0]
-           || (addr + count) > (info->start[0] + info->size)
-           || (addr + count) < addr) {
-               puts("Error: invalid address range\n");
-               return ERR_INVAL;
-       }
-
-       if (addr & 1 || count & 1 || (unsigned int)src & 1) {
-               puts("Error: misaligned source, destination or count\n");
-               return ERR_ALIGN;
-       }
-
-       base = (uint16_t *)uncached(info->start[0]);
-       end = (uint16_t *)uncached(addr + count);
-
-       flags = disable_interrupts();
-
-       dcache_flush_unlocked();
-       sync_write_buffer();
-
-       for (p = (uint16_t *)uncached(addr), s = (uint16_t *)src;
-            p < end && !ctrlc(); p++, s++) {
-               word = *s;
-
-               writew(0xaa, base + 0x555);
-               writew(0x55, base + 0xaaa);
-               writew(0xa0, base + 0x555);
-               writew(word, p);
-
-               sync_write_buffer();
-
-               /* Wait for completion */
-               status1 = readw(p);
-               do {
-                       /* TODO: Timeout */
-                       status = status1;
-                       status1 = readw(p);
-               } while (((status ^ status1) & 0x40)    /* toggled */
-                        && !(status1 & 0x28));         /* error bits */
-
-               /*
-                * We'll need to check once again for toggle bit
-                * because the toggle bit may stop toggling as I/O5
-                * changes to "1" (ref at49bv642.pdf p9)
-                */
-               status1 = readw(p);
-               status = readw(p);
-               if ((status ^ status1) & 0x40) {
-                       printf("Flash write error at address 0x%p: "
-                              "0x%02x != 0x%02x\n",
-                              p, status,word);
-                       ret = ERR_PROG_ERROR;
-                       writew(0xf0, base);
-                       readw(base);
-                       break;
-               }
-
-               writew(0xf0, base);
-               readw(base);
-       }
-
-       if (flags)
-               enable_interrupts();
-
-       return ret;
-}
-
-#endif /* CONFIG_ATSTK1000_EXT_FLASH */
index c17d10718d891ef3d55637ca901c5e0d9a74b420..f24452be3309fbec35119298a1c384fb6e07a830 100644 (file)
@@ -32,8 +32,6 @@
 #define CONFIG_ATSTK1002
 #define CONFIG_ATSTK1000
 
-#define CONFIG_ATSTK1000_EXT_FLASH
-
 /*
  * Timer clock frequency. We're using the CPU-internal COUNT register
  * for this, so this is equivalent to the CPU core clock frequency
 
 #define CONFIG_NR_DRAM_BANKS           1
 
-/* External flash on STK1000 */
-#if 0
-#define CONFIG_SYS_FLASH_CFI                   1
-#define CONFIG_FLASH_CFI_DRIVER                1
-#endif
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
 
 #define CONFIG_SYS_FLASH_BASE                  0x00000000
 #define CONFIG_SYS_FLASH_SIZE                  0x800000
index a77d52ef22824a657f745ba6e7866ca78d4bd963..c5e357f6d0c24987b699fd318dc7e8bc38f13ab3 100644 (file)
@@ -32,8 +32,6 @@
 #define CONFIG_ATSTK1003
 #define CONFIG_ATSTK1000
 
-#define CONFIG_ATSTK1000_EXT_FLASH
-
 /*
  * Timer clock frequency. We're using the CPU-internal COUNT register
  * for this, so this is equivalent to the CPU core clock frequency
 
 #define CONFIG_NR_DRAM_BANKS           1
 
-/* External flash on STK1000 */
-#if 0
-#define CONFIG_SYS_FLASH_CFI                   1
-#define CONFIG_FLASH_CFI_DRIVER                1
-#endif
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
 
 #define CONFIG_SYS_FLASH_BASE                  0x00000000
 #define CONFIG_SYS_FLASH_SIZE                  0x800000
index cc00a0a665f7cf5dd571addd89209c3ff390a60d..3814732b3ad735e65d5c9f8ed8adf2e90132eaf2 100644 (file)
@@ -32,8 +32,6 @@
 #define CONFIG_ATSTK1004
 #define CONFIG_ATSTK1000
 
-#define CONFIG_ATSTK1000_EXT_FLASH
-
 /*
  * Timer clock frequency. We're using the CPU-internal COUNT register
  * for this, so this is equivalent to the CPU core clock frequency
 
 #define CONFIG_NR_DRAM_BANKS           1
 
-/* External flash on STK1000 */
-#if 0
-#define CONFIG_SYS_FLASH_CFI                   1
-#define CONFIG_FLASH_CFI_DRIVER                1
-#endif
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
 
 #define CONFIG_SYS_FLASH_BASE                  0x00000000
 #define CONFIG_SYS_FLASH_SIZE                  0x800000
index 2cff140d442b7f5953fa1d610ab416178a3c6d7d..26c08e2128db0d757d8427ce404d598198b42778 100644 (file)
@@ -32,8 +32,6 @@
 #define CONFIG_ATSTK1006
 #define CONFIG_ATSTK1000
 
-#define CONFIG_ATSTK1000_EXT_FLASH
-
 /*
  * Timer clock frequency. We're using the CPU-internal COUNT register
  * for this, so this is equivalent to the CPU core clock frequency
 
 #define CONFIG_NR_DRAM_BANKS           1
 
-/* External flash on STK1000 */
-#if 0
-#define CONFIG_SYS_FLASH_CFI                   1
-#define CONFIG_FLASH_CFI_DRIVER                1
-#endif
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
 
 #define CONFIG_SYS_FLASH_BASE                  0x00000000
 #define CONFIG_SYS_FLASH_SIZE                  0x800000