TQM85xx: adapt for new flash types

[platform/kernel/u-boot.git] / tools / envcrc.c

diff --git a/tools/envcrc.c b/tools/envcrc.c
index c59f7d5..4334cdf 100644 (file)
--- a/tools/envcrc.c
+++ b/tools/envcrc.c
@@ -22,30 +22,52 @@
  */
 
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#define        __ASSEMBLY__    /* Dirty trick to get only #defines */
+#ifndef __ASSEMBLY__
+#define        __ASSEMBLY__                    /* Dirty trick to get only #defines     */
+#endif
+#define        __ASM_STUB_PROCESSOR_H__        /* don't include asm/processor.         */
 #include <config.h>
 #undef __ASSEMBLY__
 
-#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  CONFIG_ENV_OFFSET
+#  define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE)
+# endif
+# if !defined(CONFIG_ENV_ADDR_REDUND) && defined(CONFIG_ENV_OFFSET_REDUND)
+#  define CONFIG_ENV_ADDR_REDUND       (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET_REDUND)
 # endif
-# ifndef  CFG_ENV_OFFSET
-#  define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE
 # endif
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND)
+#  define CONFIG_ENV_SIZE_REDUND       CONFIG_ENV_SIZE
 # endif
-# if ((CFG_ENV_ADDR >= CFG_MONITOR_BASE) && \
-     ((CFG_ENV_ADDR+CFG_ENV_SIZE) <= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)))
-#  define ENV_IS_EMBEDDED
+# if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \
+     ((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN))
+#  define ENV_IS_EMBEDDED      1
 # endif
-#endif /* CFG_ENV_IS_IN_FLASH */
+# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
+#  define CONFIG_SYS_REDUNDAND_ENVIRONMENT     1
+# endif
+#endif /* CONFIG_ENV_IS_IN_FLASH */
 
-extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned int);
+#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
+# define ENV_HEADER_SIZE       (sizeof(uint32_t) + 1)
+#else
+# define ENV_HEADER_SIZE       (sizeof(uint32_t))
+#endif
+
+#define ENV_SIZE (CONFIG_ENV_SIZE - ENV_HEADER_SIZE)
+
+
+extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int);
 
 #ifdef ENV_IS_EMBEDDED
 extern unsigned int env_size;
@@ -55,26 +77,24 @@ extern unsigned char environment;
 int main (int argc, char **argv)
 {
 #ifdef ENV_IS_EMBEDDED
-    int crc ;
-    unsigned char      *envptr         = &environment,
-                       *dataptr        = envptr + sizeof(unsigned int) + 1;
-    unsigned int       datasize        = env_size - (dataptr - envptr) ;
+       uint32_t crc;
+       unsigned char *envptr = &environment,
+               *dataptr = envptr + ENV_HEADER_SIZE;
+       unsigned int datasize = ENV_SIZE;
 
+       crc = crc32 (0, dataptr, datasize);
 
-    crc = crc32(0, dataptr, datasize) ;
-
-    /* Check if verbose mode is activated passing a parameter to the program */
-    if (argc > 1) {
-       printf("CRC32 from offset %08X to %08X of environment = %08X\n",
-           (unsigned int)(dataptr - envptr),
-           (unsigned int)(dataptr - envptr) + datasize,
-           crc);
-    } else {
-       printf("0x%08X\n", crc);
-    }
+       /* Check if verbose mode is activated passing a parameter to the program */
+       if (argc > 1) {
+               printf ("CRC32 from offset %08X to %08X of environment = %08X\n",
+                       (unsigned int) (dataptr - envptr),
+                       (unsigned int) (dataptr - envptr) + datasize,
+                       crc);
+       } else {
+               printf ("0x%08X\n", crc);
+       }
 #else
-       printf("0\n");
+       printf ("0\n");
 #endif
-    return EXIT_SUCCESS;
+       return EXIT_SUCCESS;
 }
-