imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / barco / flash.c

diff --git a/board/barco/flash.c b/board/barco/flash.c
index c13c56b8d6197bd26aede9a0656574239149f89f..9f19575eebb7f84d656f42a5252afc6fc7163a49 100755 (executable)
--- a/board/barco/flash.c
+++ b/board/barco/flash.c
@@ -9,8 +9,8 @@
  *
  * Last ChangeLog Entry
  * $Log$
- * Revision 1.1  2007-03-09 09:43:18  lothar
- * Initial revision
+ * Revision 1.1.5.1  2011-02-28 14:41:59  lothar
+ * imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01
  *
  * Revision 1.3  2005/02/21 12:48:58  mleeman
  * update of copyright years (feedback wd)
@@ -59,17 +59,17 @@
 #define ROM_CS0_START  0xFF800000
 #define ROM_CS1_START  0xFF000000
 
-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    */
 
-#if defined(CFG_ENV_IS_IN_FLASH)
-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR  (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR  (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
 # endif
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE  CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE  CONFIG_ENV_SECT_SIZE
 # endif
-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE
 # endif
 #endif
 
@@ -143,10 +143,10 @@ unsigned long flash_init(void)
 {
        unsigned long i;
        unsigned char j;
-       static const ulong flash_banks[] = CFG_FLASH_BANKS;
+       static const ulong flash_banks[] = CONFIG_SYS_FLASH_BANKS;
 
        /* Init: no FLASHes known */
-       for (i = 0; i < CFG_MAX_FLASH_BANKS; i++){
+       for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++){
                flash_info_t * const pflinfo = &flash_info[i];
                pflinfo->flash_id = FLASH_UNKNOWN;
                pflinfo->size = 0;
@@ -220,17 +220,17 @@ unsigned long flash_init(void)
                                break;
                }
                /* Protect monitor and environment sectors */
-#if CFG_MONITOR_BASE >= CFG_FLASH_BASE
+#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE
                flash_protect(FLAG_PROTECT_SET,
-                               CFG_MONITOR_BASE,
-                               CFG_MONITOR_BASE + monitor_flash_len - 1,
+                               CONFIG_SYS_MONITOR_BASE,
+                               CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1,
                                &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
                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
 
@@ -461,7 +461,7 @@ int flash_erase(flash_info_t *info, int s_first, int s_last)
        addr = (FLASH_WORD_SIZE *)(info->start[0] + (
                                (info->start[l_sect] - info->start[0]) << sh8b));
        while ((addr[0] & (FLASH_WORD_SIZE)0x00800080) != (FLASH_WORD_SIZE)0x00800080) {
-               if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
+               if ((now = get_timer(start)) > CONFIG_SYS_FLASH_ERASE_TOUT) {
                        printf ("Timeout\n");
                        return 1;
                }
@@ -602,7 +602,7 @@ static int write_word (flash_info_t *info, ulong dest, ulong data)
                start = get_timer (0);
                while ((dest2[i << sh8b] & (FLASH_WORD_SIZE)0x00800080) !=
                                (data2[i] & (FLASH_WORD_SIZE)0x00800080)) {
-                       if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+                       if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                                return (1);
                        }
                }