rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / board / mx1fs2 / flash.c

diff --git a/board/mx1fs2/flash.c b/board/mx1fs2/flash.c
index 3a79a9eb4b1daa9610bae5f679628ec82cd31e53..da4ebe6e751a96f5133a54b81d2754dd4fffd2bb 100644 (file)
--- a/board/mx1fs2/flash.c
+++ b/board/mx1fs2/flash.c
@@ -25,14 +25,10 @@
 
 #include <common.h>
 
-#if defined CFG_JFFS_CUSTOM_PART
-#include <jffs2/jffs2.h>
-#endif
-
 #define FLASH_BANK_SIZE MX1FS2_FLASH_BANK_SIZE
 #define MAIN_SECT_SIZE  MX1FS2_FLASH_SECT_SIZE
 
-flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips   */
+flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];   /* info for FLASH chips   */
 
 /*
  * NOTE - CONFIG_FLASH_16BIT means the CPU interface is 16-bit, it
@@ -66,71 +62,10 @@ static void flash_reset(flash_info_t * info);
 static int write_word_intel(flash_info_t * info, FPWV * dest, FPW data);
 static int write_word_amd(flash_info_t * info, FPWV * dest, FPW data);
 #define write_word(in, de, da)   write_word_amd(in, de, da)
-#ifdef CFG_FLASH_PROTECTION
+#ifdef CONFIG_SYS_FLASH_PROTECTION
 static void flash_sync_real_protect(flash_info_t * info);
 #endif
 
-#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;
-
-struct part_info *
-jffs2_part_info(int part_num)
-{
-       void *jffs2_priv_saved = part.jffs2_priv;
-
-       printf("jffs2_part_info: part_num=%i\n", part_num);
-
-       if (current_part == part_num)
-               return &part;
-
-       /* rootfs                                                 */
-       if (part_num == 0) {
-               memset(&part, 0, sizeof (part));
-
-               part.offset = (char *) MX1FS2_JFFS2_PART0_START;
-               part.size = MX1FS2_JFFS2_PART0_SIZE;
-
-               /* Mark the struct as ready */
-               current_part = part_num;
-
-               printf("part.offset = 0x%08x\n", (unsigned int) part.offset);
-               printf("part.size   = 0x%08x\n", (unsigned int) part.size);
-       }
-
-       /* userfs                                    */
-       if (part_num == 1) {
-               memset(&part, 0, sizeof (part));
-
-               part.offset = (char *) MX1FS2_JFFS2_PART1_START;
-               part.size = MX1FS2_JFFS2_PART1_SIZE;
-
-               /* Mark the struct as ready */
-               current_part = part_num;
-
-               printf("part.offset = 0x%08x\n", (unsigned int) part.offset);
-               printf("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;
-       }
-
-       printf("jffs2_part_info: end of partition table\n");
-       return 0;
-}
-#endif                         /* CFG_JFFS_CUSTOM_PART */
-
 /*-----------------------------------------------------------------------
  * flash_init()
  *
@@ -142,14 +77,14 @@ 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 =
                    (FLASH_MAN_AMD & FLASH_VENDMASK) |
                    (FLASH_AM640U & 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:
                        flashbase = MX1FS2_FLASH_BASE;
@@ -166,13 +101,13 @@ flash_init(void)
 
        /* Protect monitor and environment sectors */
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_FLASH_BASE,
-                     CFG_FLASH_BASE + _bss_start - _armboot_start,
+                     CONFIG_SYS_FLASH_BASE,
+                     CONFIG_SYS_FLASH_BASE + _bss_start - _armboot_start,
                      &flash_info[0]);
 
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
 
        return size;
 }
@@ -238,7 +173,7 @@ flash_print_info(flash_info_t * info)
        int i;
        uchar *boottype;
        uchar *bootletter;
-       uchar *fmt;
+       char *fmt;
        uchar botbootletter[] = "B";
        uchar topbootletter[] = "T";
        uchar botboottype[] = "bottom boot sector";
@@ -454,7 +389,7 @@ flash_get_size(FPWV * addr, flash_info_t * info)
 }
 #endif /* 0 */
 
-#ifdef CFG_FLASH_PROTECTION
+#ifdef CONFIG_SYS_FLASH_PROTECTION
 /*-----------------------------------------------------------------------
  */
 
@@ -593,7 +528,7 @@ flash_erase(flash_info_t * info, int s_first, int s_last)
                udelay(1000);
 
                while ((*addr & (FPW) 0x00800080) != (FPW) 0x00800080) {
-                       if ((now = get_timer(0)) - start > CFG_FLASH_ERASE_TOUT) {
+                       if ((now = get_timer(0)) - start > CONFIG_SYS_FLASH_ERASE_TOUT) {
                                printf("Timeout\n");
 
                                if (intel) {
@@ -677,7 +612,7 @@ bad_write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt)
  * @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
  */
@@ -785,7 +720,7 @@ write_word_amd(flash_info_t * info, FPWV * dest, FPW data)
        /* data polling for D7 */
        while (res == 0
               && (*dest & (FPW) 0x00800080) != (data & (FPW) 0x00800080)) {
-               if (get_timer(0) - start > CFG_FLASH_WRITE_TOUT) {
+               if (get_timer(0) - start > CONFIG_SYS_FLASH_WRITE_TOUT) {
                        *dest = (FPW) 0x00F000F0;       /* reset bank */
                        printf("SHA timeout\n");
                        res = 1;
@@ -833,7 +768,7 @@ write_word_intel(flash_info_t * info, FPWV * dest, FPW data)
        start = get_timer(0);
 
        while (res == 0 && (*dest & (FPW) 0x00800080) != (FPW) 0x00800080) {
-               if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+               if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                        *dest = (FPW) 0x00B000B0;       /* Suspend program      */
                        res = 1;
                }
@@ -848,7 +783,7 @@ write_word_intel(flash_info_t * info, FPWV * dest, FPW data)
        return (res);
 }
 
-#ifdef CFG_FLASH_PROTECTION
+#ifdef CONFIG_SYS_FLASH_PROTECTION
 /*-----------------------------------------------------------------------
  */
 int