Merge patch series "configs: apple: Switch to standard boot + small adjustments"

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

diff --git a/tools/envcrc.c b/tools/envcrc.c
index 4334cdf746d987378ff5a780d64b347612871856..550f31038bd7887dd8e8c44f4a0f946e3aa88bb0 100644 (file)
--- a/tools/envcrc.c
+++ b/tools/envcrc.c
@@ -1,31 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), [email protected]
- *
- * 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 <errno.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
+#include <u-boot/crc.h>
 #include <unistd.h>
 
+#include <linux/kconfig.h>
+
 #ifndef __ASSEMBLY__
 #define        __ASSEMBLY__                    /* Dirty trick to get only #defines     */
 #endif
@@ -35,26 +23,20 @@
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
 # ifndef  CONFIG_ENV_ADDR
-#  define CONFIG_ENV_ADDR      (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
+#  define CONFIG_ENV_ADDR      (CFG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
 # endif
 # ifndef  CONFIG_ENV_OFFSET
-#  define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE)
+#  define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_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)
+#  define CONFIG_ENV_ADDR_REDUND       (CFG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET_REDUND)
 # endif
 # ifndef  CONFIG_ENV_SIZE
 #  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE
 # endif
-# if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND)
-#  define CONFIG_ENV_SIZE_REDUND       CONFIG_ENV_SIZE
-# endif
 # 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
-# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
-#  define CONFIG_SYS_REDUNDAND_ENVIRONMENT     1
+#  define ENV_IS_EMBEDDED
 # endif
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 
@@ -67,29 +49,68 @@
 #define ENV_SIZE (CONFIG_ENV_SIZE - ENV_HEADER_SIZE)
 
 
-extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int);
-
-#ifdef ENV_IS_EMBEDDED
+#ifdef ENV_IS_EMBEDDED
+# include <env_internal.h>
 extern unsigned int env_size;
-extern unsigned char environment;
+extern env_t embedded_environment;
 #endif /* ENV_IS_EMBEDDED */
 
+extern uint32_t crc32(uint32_t, const unsigned char *, unsigned int);
+
 int main (int argc, char **argv)
 {
-#ifdef ENV_IS_EMBEDDED
+#ifdef ENV_IS_EMBEDDED
+       unsigned char pad = 0x00;
        uint32_t crc;
-       unsigned char *envptr = &environment,
+       unsigned char *envptr = (unsigned char *)&embedded_environment,
                *dataptr = envptr + ENV_HEADER_SIZE;
        unsigned int datasize = ENV_SIZE;
+       unsigned int eoe;
+
+       if (argv[1] && !strncmp(argv[1], "--binary", 8)) {
+               int ipad = 0xff;
+               if (argv[1][8] == '=')
+                       sscanf(argv[1] + 9, "%i", &ipad);
+               pad = ipad;
+       }
+
+       if (pad) {
+               /* find the end of env */
+               for (eoe = 0; eoe < datasize - 1; ++eoe)
+                       if (!dataptr[eoe] && !dataptr[eoe+1]) {
+                               eoe += 2;
+                               break;
+                       }
+               if (eoe < datasize - 1)
+                       memset(dataptr + eoe, pad, datasize - eoe);
+       }
 
-       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);
+               if (!strncmp(argv[1], "--binary", 8)) {
+                       int le = (argc > 2 ? !strcmp(argv[2], "le") : 1);
+                       size_t i, start, end, step;
+                       if (le) {
+                               start = 0;
+                               end = ENV_HEADER_SIZE;
+                               step = 1;
+                       } else {
+                               start = ENV_HEADER_SIZE - 1;
+                               end = -1;
+                               step = -1;
+                       }
+                       for (i = start; i != end; i += step)
+                               printf("%c", (crc & (0xFF << (i * 8))) >> (i * 8));
+                       if (fwrite(dataptr, 1, datasize, stdout) != datasize)
+                               fprintf(stderr, "fwrite() failed: %s\n", strerror(errno));
+               } else {
+                       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);
        }