Drop ubsha1 tool

This seems to have been used by ppc4xx which was removed a while back.
The Kconfig does not exist so it is never built. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/Makefile b/Makefile
index 9337a1ffcd49c6c60a1249cb3feef085a32b9a4d..695b798a4aca2b41fa4b5a9b700621fd9019013c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1454,9 +1454,6 @@ u-boot-with-spl.kwb: u-boot.bin spl/u-boot-spl.bin FORCE
        $(call if_changed,mkimage)
        $(BOARD_SIZE_CHECK)
 
-u-boot.sha1:   u-boot.bin
-               tools/ubsha1 u-boot.bin
-
 u-boot.dis:    u-boot
                $(OBJDUMP) -d $< > $@
 

diff --git a/tools/.gitignore b/tools/.gitignore
index 28e8ce2a07ad49c024fa97077e3a5db75953d7c5..788ea260a070eb0740d7f1bd19997c86773498fc 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -33,7 +33,6 @@
 /relocate-rela
 /spl_size_limit
 /sunxi-spl-image-builder
-/ubsha1
 /update_octeon_header
 /version.h
 /xway-swap-bytes

diff --git a/tools/Makefile b/tools/Makefile
index 2ee43dff542f3fa9d4e8c38633fa0fbac8e43f9c..0eadd8154a7e4564ce07dd20618ea1695565dc93 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -29,7 +29,6 @@ CONFIG_CMD_LOADS = y
 CONFIG_CMD_NET = y
 CONFIG_XWAY_SWAP_BYTES = y
 CONFIG_NETCONSOLE = y
-CONFIG_SHA1_CHECK_UB_IMG = y
 CONFIG_ARCH_SUNXI = y
 endif
 
@@ -217,11 +216,6 @@ hostprogs-$(CONFIG_ARCH_SUNXI) += sunxi-spl-image-builder
 sunxi-spl-image-builder-objs := sunxi-spl-image-builder.o lib/bch.o
 
 hostprogs-$(CONFIG_NETCONSOLE) += ncb
-hostprogs-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1
-
-ubsha1-objs := os_support.o ubsha1.o lib/sha1.o
-
-HOSTCFLAGS_ubsha1.o := -pedantic
 
 hostprogs-$(CONFIG_ARCH_KIRKWOOD) += kwboot
 hostprogs-$(CONFIG_ARCH_MVEBU) += kwboot

diff --git a/tools/ubsha1.c b/tools/ubsha1.c
deleted file mode 100644 (file)
index 90a6f3f..0000000
--- a/tools/ubsha1.c
+++ /dev/null
@@ -1,83 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007
- * Heiko Schocher, DENX Software Engineering, <hs@denx.de>
- */
-
-#include "os_support.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <u-boot/sha1.h>
-
-int main (int argc, char **argv)
-{
-       unsigned char output[20];
-       int i, len;
-
-       char    *imagefile;
-       char    *cmdname = *argv;
-       unsigned char   *ptr;
-       unsigned char   *data;
-       struct stat sbuf;
-       unsigned char   *ptroff;
-       int     ifd;
-       int     off;
-
-       if (argc > 1) {
-               imagefile = argv[1];
-               ifd = open (imagefile, O_RDWR|O_BINARY);
-               if (ifd < 0) {
-                       fprintf (stderr, "%s: Can't open %s: %s\n",
-                               cmdname, imagefile, strerror(errno));
-                       exit (EXIT_FAILURE);
-               }
-               if (fstat (ifd, &sbuf) < 0) {
-                       fprintf (stderr, "%s: Can't stat %s: %s\n",
-                               cmdname, imagefile, strerror(errno));
-                       exit (EXIT_FAILURE);
-               }
-               len = sbuf.st_size;
-               ptr = (unsigned char *)mmap(0, len,
-                                   PROT_READ, MAP_SHARED, ifd, 0);
-               if (ptr == (unsigned char *)MAP_FAILED) {
-                       fprintf (stderr, "%s: Can't read %s: %s\n",
-                               cmdname, imagefile, strerror(errno));
-                       exit (EXIT_FAILURE);
-               }
-
-               /* create a copy, so we can blank out the sha1 sum */
-               data = malloc (len);
-               memcpy (data, ptr, len);
-               off = SHA1_SUM_POS;
-               ptroff = &data[len +  off];
-               for (i = 0; i < SHA1_SUM_LEN; i++) {
-                       ptroff[i] = 0;
-               }
-
-               sha1_csum ((unsigned char *) data, len, (unsigned char *)output);
-
-               printf ("U-Boot sum:\n");
-               for (i = 0; i < 20 ; i++) {
-                   printf ("%02X ", output[i]);
-               }
-               printf ("\n");
-               /* overwrite the sum in the bin file, with the actual */
-               lseek (ifd, SHA1_SUM_POS, SEEK_END);
-               if (write (ifd, output, SHA1_SUM_LEN) != SHA1_SUM_LEN) {
-                       fprintf (stderr, "%s: Can't write %s: %s\n",
-                               cmdname, imagefile, strerror(errno));
-                       exit (EXIT_FAILURE);
-               }
-
-               free (data);
-               (void) munmap((void *)ptr, len);
-               (void) close (ifd);
-       }
-
-       return EXIT_SUCCESS;
-}