]> git.sur5r.net Git - u-boot/blobdiff - board/innokom/flash.c
projects / u-boot / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
vision2: Place machine ID into board config
[u-boot] / board / innokom / flash.c
diff --git a/board/innokom/flash.c b/board/innokom/flash.c
index 29c9166484295bfb61b2de1088d4fd10e686f665..ed4b9872a2fbfa95165d969ed4310fa56f8d4839 100644 (file)
--- a/board/innokom/flash.c
+++ b/board/innokom/flash.c
@@ -35,10 +35,6 @@
 #include <common.h>
 #include <asm/arch/pxa-regs.h>
 
-#if defined CFG_JFFS_CUSTOM_PART
-#include <jffs2/jffs2.h>
-#endif
-
 /* Debugging macros ------------------------------------------------------  */
 
 #undef FLASH_DEBUG
@@ -76,180 +72,7 @@
 #define MAIN_SECT_SIZE  0x00020000     /* 128k per sector                  */
 #endif
 
-flash_info_t    flash_info[CFG_MAX_FLASH_BANKS];
-
-
-#if defined CFG_JFFS_CUSTOM_PART
-
-/**
- * jffs2_part_info - get information about a JFFS2 partition
- *
- * @part_num: number of the partition you want to get info about
- * @return:   struct part_info* in case of success, 0 if failure
- */
-
-static struct part_info part;
-static int current_part = -1;
-
-#ifdef CONFIG_MTD_INNOKOM_16MB
-#ifdef CONFIG_MTD_INNOKOM_64MB
-#error Please define only one CONFIG_MTD_INNOKOM_XXMB option.
-#endif
-struct part_info* jffs2_part_info(int part_num) {
-       void *jffs2_priv_saved = part.jffs2_priv;
-
-       PRINTK2("jffs2_part_info: part_num=%i\n",part_num);
-
-       if (current_part == part_num)
-               return &part;
-
-       /* u-boot partition                                                 */
-       if(part_num==0){
-               memset(&part, 0, sizeof(part));
-
-               part.offset=(char*)0x00000000;
-               part.size=256*1024;
-
-               /* Mark the struct as ready */
-               current_part = part_num;
-
-               PRINTK("part.offset = 0x%08x\n",(unsigned int)part.offset);
-               PRINTK("part.size   = 0x%08x\n",(unsigned int)part.size);
-       }
-
-       /* primary OS+firmware partition                                    */
-       if(part_num==1){
-               memset(&part, 0, sizeof(part));
-
-               part.offset=(char*)0x00040000;
-               part.size=768*1024;
-
-               /* Mark the struct as ready */
-               current_part = part_num;
-
-               PRINTK("part.offset = 0x%08x\n",(unsigned int)part.offset);
-               PRINTK("part.size   = 0x%08x\n",(unsigned int)part.size);
-       }
-
-       /* secondary OS+firmware partition                                  */
-       if(part_num==2){
-               memset(&part, 0, sizeof(part));
-
-               part.offset=(char*)0x00100000;
-               part.size=8*1024*1024;
-
-               /* Mark the struct as ready */
-               current_part = part_num;
-
-               PRINTK("part.offset = 0x%08x\n",(unsigned int)part.offset);
-               PRINTK("part.size   = 0x%08x\n",(unsigned int)part.size);
-       }
-
-       /* data partition */
-       if(part_num==3){
-               memset(&part, 0, sizeof(part));
-
-               part.offset=(char*)0x00900000;
-               part.size=7*1024*1024;
-
-               /* Mark the struct as ready */
-               current_part = part_num;
-
-               PRINTK("part.offset = 0x%08x\n",(unsigned int)part.offset);
-               PRINTK("part.size   = 0x%08x\n",(unsigned int)part.size);
-       }
-
-       if (current_part == part_num) {
-               part.usr_priv = &current_part;
-               part.jffs2_priv = jffs2_priv_saved;
-               return &part;
-       }
-
-       PRINTK("jffs2_part_info: end of partition table\n");
-       return 0;
-}
-#endif /* CONFIG_MTD_INNOKOM_16MB */
-
-#ifdef CONFIG_MTD_INNOKOM_64MB
-#ifdef CONFIG_MTD_INNOKOM_16MB
-#error Please define only one CONFIG_MTD_INNOKOM_XXMB option.
-#endif
-struct part_info* jffs2_part_info(int part_num) {
-       void *jffs2_priv_saved = part.jffs2_priv;
-
-       PRINTK2("jffs2_part_info: part_num=%i\n",part_num);
-
-       if (current_part == part_num)
-               return &part;
-
-       /* u-boot partition                                                 */
-       if(part_num==0){
-               memset(&part, 0, sizeof(part));
-
-               part.offset=(char*)0x00000000;
-               part.size=256*1024;
-
-               /* Mark the struct as ready */
-               current_part = part_num;
-
-               PRINTK("part.offset = 0x%08x\n",(unsigned int)part.offset);
-               PRINTK("part.size   = 0x%08x\n",(unsigned int)part.size);
-       }
-
-       /* primary OS+firmware partition                                    */
-       if(part_num==1){
-               memset(&part, 0, sizeof(part));
-
-               part.offset=(char*)0x00040000;
-               part.size=16*1024*1024-128*1024;
-
-               /* Mark the struct as ready */
-               current_part = part_num;
-
-               PRINTK("part.offset = 0x%08x\n",(unsigned int)part.offset);
-               PRINTK("part.size   = 0x%08x\n",(unsigned int)part.size);
-       }
-
-       /* secondary OS+firmware partition                                  */
-       if(part_num==2){
-               memset(&part, 0, sizeof(part));
-
-               part.offset=(char*)0x01020000;
-               part.size=16*1024*1024-128*1024;
-
-               /* Mark the struct as ready */
-               current_part = part_num;
-
-               PRINTK("part.offset = 0x%08x\n",(unsigned int)part.offset);
-               PRINTK("part.size   = 0x%08x\n",(unsigned int)part.size);
-       }
-
-       /* data partition */
-       if(part_num==3){
-               memset(&part, 0, sizeof(part));
-
-               part.offset=(char*)0x02000000;
-               part.size=32*1024*1024;
-
-               /* Mark the struct as ready */
-               current_part = part_num;
-
-               PRINTK("part.offset = 0x%08x\n",(unsigned int)part.offset);
-               PRINTK("part.size   = 0x%08x\n",(unsigned int)part.size);
-       }
-
-       if (current_part == part_num) {
-               part.usr_priv = &current_part;
-               part.jffs2_priv = jffs2_priv_saved;
-               return &part;
-       }
-
-       PRINTK("jffs2_part_info: end of partition table\n");
-       return 0;
-}
-#endif /* CONFIG_MTD_INNOKOM_64MB */
-#endif /* defined CFG_JFFS_CUSTOM_PART */
-
+flash_info_t    flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
 
 /**
  * flash_init: - initialize data structures for flash chips
@@ -262,14 +85,14 @@ ulong flash_init(void)
        int i, j;
        ulong size = 0;
 
-       for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) {
+       for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
                ulong flashbase = 0;
                flash_info[i].flash_id =
-                       (INTEL_MANUFACT & FLASH_VENDMASK) |
-                       (INTEL_ID_28F128J3 & FLASH_TYPEMASK);
+                       (INTEL_MANUFACT & FLASH_VENDMASK) |
+                       (INTEL_ID_28F128J3 & FLASH_TYPEMASK);
                flash_info[i].size = FLASH_BANK_SIZE;
-               flash_info[i].sector_count = CFG_MAX_FLASH_SECT;
-               memset(flash_info[i].protect, 0, CFG_MAX_FLASH_SECT);
+               flash_info[i].sector_count = CONFIG_SYS_MAX_FLASH_SECT;
+               memset(flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT);
 
                switch (i) {
                        case 0:
@@ -287,14 +110,14 @@ ulong flash_init(void)
 
        /* Protect u-boot sectors */
        flash_protect(FLAG_PROTECT_SET,
-                       CFG_FLASH_BASE,
-                       CFG_FLASH_BASE + (256*1024) - 1,
+                       CONFIG_SYS_FLASH_BASE,
+                       CONFIG_SYS_FLASH_BASE + (256*1024) - 1,
                        &flash_info[0]);
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
        flash_protect(FLAG_PROTECT_SET,
-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
                        &flash_info[0]);
 #endif
 
@@ -312,7 +135,7 @@ void flash_print_info  (flash_info_t *info)
 {
        int i, j;
 
-       for (j=0; j<CFG_MAX_FLASH_BANKS; j++) {
+       for (j=0; j<CONFIG_SYS_MAX_FLASH_BANKS; j++) {
 
                switch (info->flash_id & FLASH_VENDMASK) {
 
@@ -359,6 +182,7 @@ int flash_erase(flash_info_t *info, int s_first, int s_last)
 {
        int flag, prot, sect;
        int rc = ERR_OK;
+       ulong start;
 
        if (info->flash_id == FLASH_UNKNOWN)
                return ERR_UNKNOWN_FLASH_TYPE;
@@ -395,7 +219,7 @@ int flash_erase(flash_info_t *info, int s_first, int s_last)
                PRINTK("\n");
 
                /* arm simple, non interrupt dependent timer */
-               reset_timer_masked();
+               start = get_timer(0);
 
                if (info->protect[sect] == 0) { /* not protected */
                        u16 * volatile addr = (u16 * volatile)(info->start[sect]);
@@ -412,7 +236,7 @@ int flash_erase(flash_info_t *info, int s_first, int s_last)
 
                        while ((*addr & 0x0080) != 0x0080) {
                                PRINTK(".");
-                               if (get_timer_masked() > CFG_FLASH_ERASE_TOUT) {
+                               if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
                                        *addr = 0x00B0; /* suspend erase*/
                                        *addr = 0x00FF; /* read mode    */
                                        rc = ERR_TIMOUT;
@@ -456,6 +280,7 @@ static int write_word (flash_info_t *info, ulong dest, ushort data)
        volatile u16 *addr = (u16 *)dest, val;
        int rc = ERR_OK;
        int flag;
+       ulong start;
 
        /* Check if Flash is (sufficiently) erased */
        if ((*addr & data) != data) return ERR_NOT_ERASED;
@@ -479,11 +304,11 @@ static int write_word (flash_info_t *info, ulong dest, ushort data)
        *addr = data;
 
        /* arm simple, non interrupt dependent timer */
-       reset_timer_masked();
+       start = get_timer(0);
 
        /* wait while polling the status register */
        while(((val = *addr) & 0x80) != 0x80) {
-               if (get_timer_masked() > CFG_FLASH_WRITE_TOUT) {
+               if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                        rc = ERR_TIMOUT;
                        *addr = 0xB0; /* suspend program command */
                        goto outahere;
@@ -527,7 +352,7 @@ static int write_word (flash_info_t *info, ulong dest, ushort data)
  * @param info:
  * @param src: source of copy transaction
  * @param addr:        where to copy to
- * @param cnt:         number of bytes to copy
+ * @param cnt: number of bytes to copy
  *
  * @return     error code
  */
Cloned from git://git.denx.de/u-boot.git