From: Piotr Dymacz <pepe2k@gmail.com>
Date: Tue, 30 Aug 2016 21:22:16 +0000 (+0200)
Subject: Remove header checksum validation from bootstrap stage
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0b21ffe293819d60c79205d94841e6a8d8d998c2;p=oweals%2Fu-boot_mod.git

Remove header checksum validation from bootstrap stage

It doesn't make sense to check compressed image header
checksum if we just hang anyway if the checksum is not
valid. That will save some code size and speed up boot
time.
---

diff --git a/u-boot/lib_bootstrap/Makefile b/u-boot/lib_bootstrap/Makefile
index 015dbf6..c3e1095 100644
--- a/u-boot/lib_bootstrap/Makefile
+++ b/u-boot/lib_bootstrap/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= libbootstrap.a
 
-OBJS	= bootstrap_board.o LzmaDecode.o string.o crc32.o LzmaWrapper.o
+OBJS	= bootstrap_board.o LzmaDecode.o string.o LzmaWrapper.o
 
 CFLAGS += -DCONFIG_LZMA=1
 
diff --git a/u-boot/lib_bootstrap/bootstrap_board.c b/u-boot/lib_bootstrap/bootstrap_board.c
index ab1797c..8e34e20 100644
--- a/u-boot/lib_bootstrap/bootstrap_board.c
+++ b/u-boot/lib_bootstrap/bootstrap_board.c
@@ -28,7 +28,6 @@
 #include <version.h>
 #include <net.h>
 #include <environment.h>
-#include <tinf.h>
 #include "LzmaWrapper.h"
 
 /*#define DEBUG_ENABLE_BOOTSTRAP_PRINTF*/
@@ -82,11 +81,6 @@ void *malloc(unsigned int size)
 	return NULL;
 }
 
-void *realloc(void *src, unsigned int size)
-{
-	return NULL;
-}
-
 void free(void *src)
 {
 	return;
@@ -223,7 +217,7 @@ void bootstrap_board_init_r(gd_t *id, ulong dest_addr)
 {
 	int i;
 	ulong addr;
-	ulong data, len, checksum;
+	ulong data, len;
 	image_header_t header;
 	image_header_t *hdr = &header;
 	unsigned int destLen;
@@ -238,15 +232,6 @@ void bootstrap_board_init_r(gd_t *id, ulong dest_addr)
 	if (ntohl(hdr->ih_magic) != IH_MAGIC)
 		return;
 
-	data = (ulong)&header;
-	len = sizeof(image_header_t);
-
-	checksum = ntohl(hdr->ih_hcrc);
-	hdr->ih_hcrc = 0;
-
-	if (tinf_crc32((unsigned char *)data, len) != checksum)
-		return;
-
 	data = addr + sizeof(image_header_t);
 	len = ntohl(hdr->ih_size);
 
diff --git a/u-boot/lib_bootstrap/crc32.c b/u-boot/lib_bootstrap/crc32.c
deleted file mode 100644
index fce7d33..0000000
--- a/u-boot/lib_bootstrap/crc32.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * CRC32 checksum
- *
- * Copyright (c) 1998-2003 by Joergen Ibsen / Jibz
- * All Rights Reserved
- *
- * http://www.ibsensoftware.com/
- *
- * This software is provided 'as-is', without any express
- * or implied warranty.  In no event will the authors be
- * held liable for any damages arising from the use of
- * this software.
- *
- * Permission is granted to anyone to use this software
- * for any purpose, including commercial applications,
- * and to alter it and redistribute it freely, subject to
- * the following restrictions:
- *
- * 1. The origin of this software must not be
- *    misrepresented; you must not claim that you
- *    wrote the original software. If you use this
- *    software in a product, an acknowledgment in
- *    the product documentation would be appreciated
- *    but is not required.
- *
- * 2. Altered source versions must be plainly marked
- *    as such, and must not be misrepresented as
- *    being the original software.
- *
- * 3. This notice may not be removed or altered from
- *    any source distribution.
- */
-
-/*
- * CRC32 algorithm taken from the zlib source, which is
- * Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
- */
-
-#include "tinf.h"
-
-static const unsigned int tinf_crc32tab[16] = {
-   0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190,
-   0x6b6b51f4, 0x4db26158, 0x5005713c, 0xedb88320, 0xf00f9344,
-   0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278,
-   0xbdbdf21c
-};
-
-unsigned int tinf_crc32(const void *data, unsigned int length)
-{
-   const unsigned char *buf = (const unsigned char *)data;
-   unsigned int crc = 0xffffffff;
-   unsigned int i;
-
-   if (length == 0) return 0;
-
-   for (i = 0; i < length; ++i)
-   {
-      crc ^= buf[i];
-      crc = tinf_crc32tab[crc & 0x0f] ^ (crc >> 4);
-      crc = tinf_crc32tab[crc & 0x0f] ^ (crc >> 4);
-   }
-
-   return crc ^ 0xffffffff;
-}