From 15eee175fd6c073e75db12aa24e732145bf245d4 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Fri, 23 Oct 2009 15:47:35 +0200
Subject: Initial import of U-Boot environment image creator

---
 Makefile     |  25 +++++++
 crc32.c      |  74 ++++++++++++++++++++
 crc32.h      |   6 ++
 mkubootenv.c | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 329 insertions(+)
 create mode 100644 Makefile
 create mode 100644 crc32.c
 create mode 100644 crc32.h
 create mode 100644 mkubootenv.c

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..9c2bd53
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,25 @@
+
+MKUBOOTENV = mkubootenv
+MKUBOOTENV_OBJS = mkubootenv.o crc32.o
+
+CFLAGS += -W -Wall -Wextra -Wstrict-prototypes -Wsign-compare -Wshadow \
+	  -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+	  -Wpointer-arith -Wcast-align
+
+all: $(MKUBOOTENV)
+
+$(MKUBOOTENV): $(MKUBOOTENV_OBJS)
+	@echo "  LD $@"
+	@$(CC) $(LDFLAGS) -o $@ $^
+
+%.o: %.c %.h
+	@echo "  CC $@"
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+%.o: %.c
+	@echo "  CC $@"
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+clean:
+	@echo "  CLEAN"
+	@rm -f *.o $(MKUBOOTENV)
diff --git a/crc32.c b/crc32.c
new file mode 100644
index 0000000..5d41211
--- /dev/null
+++ b/crc32.c
@@ -0,0 +1,74 @@
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "crc32.h"
+
+#define BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
+
+/* Table computed with Mark Adler's makecrc.c utility.  */
+static const uint32_t crc32_table[256] = {
+	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+	0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+	0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+	0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+	0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+	0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+	0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+	0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+	0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+	0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+	0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+	0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+	0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+	0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+	0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+	0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+	0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+	0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+	0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+	0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+	0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+	0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+	0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+	0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+	0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+	0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+	0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+	0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+	0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+	0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+	0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+	0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+	0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+	0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+	0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+	0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+	0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+	0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+	0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+	0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+	0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+	0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+	0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+	0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+	0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+	0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+	0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+	0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+	0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+	0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+	0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+	0x2d02ef8d
+};
+
+uint32_t crc32(uint32_t crc, unsigned char *buf, size_t len)
+{
+	unsigned char *end;
+
+	crc = ~crc;
+	for (end = buf + len; buf < end; ++buf)
+		crc = crc32_table[(crc ^ *buf) & BIT_MASK(8)] ^ (crc >> 8);
+
+	return ~crc;
+}
+
diff --git a/crc32.h b/crc32.h
new file mode 100644
index 0000000..72da4e0
--- /dev/null
+++ b/crc32.h
@@ -0,0 +1,6 @@
+#ifndef _CRC32_H_
+#define _CRC32_H_
+
+extern uint32_t crc32(uint32_t crc, unsigned char *buf, size_t len);
+
+#endif /* _CRC32_H_ */
diff --git a/mkubootenv.c b/mkubootenv.c
new file mode 100644
index 0000000..f2b94ec
--- /dev/null
+++ b/mkubootenv.c
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2009, Zurich University of Applied Science
+ * Copyright (c) 2009, Tobias Klauser <klto@zhaw.ch>
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+#include "crc32.h"
+
+#define DEBUG
+
+#define CMD_NAME		"mkenv"
+#define DEFAULT_IMG_TYPE	"binary"
+
+#define CRC32_SIZE		sizeof(uint32_t)
+/* minimum trailing null bytes */
+#define TRAILER_SIZE		sizeof(uint16_t)
+
+#define err(fmt, args...)	fprintf(stderr, "%s: Error: " fmt, CMD_NAME, ##args)
+#ifdef DEBUG
+# define dbg(fmt, args...)	fprintf(stdout, fmt, ##args)
+#else
+# define dbg(fmt, args...)
+#endif
+
+/* file "object" */
+struct file {
+	char *name;
+	int fd;
+	uint8_t *ptr;
+	struct stat sbuf;
+};
+
+static void usage_and_exit(int status) __attribute__((noreturn));
+
+static void usage_and_exit(int status)
+{
+	printf("usage: mkenv [-t <type>] [-s <size>] <source file> <target image file>\n"
+	       "  -s <size>  set size of the target image file to <size> bytes. If <size> is\n"
+	       "             bigger than the source file, the target image gets padded with null\n"
+	       "             bytes. If <size> is smaller than the source file, an error is emitted.\n"
+	       "  -t <type>  set type of the target image, where <type> is one of:\n"
+	       "             - binary (default if -t is not specified)\n"
+	       "             - srec\n"
+	       "  -r         reverse operation: get source file from target image file\n");
+	exit(status);
+}
+
+int main(int argc, char **argv)
+{
+	int i;
+	int status = EXIT_FAILURE;
+	struct file s, t;	/* source and target file */
+	ssize_t img_size = -1;
+	ssize_t min_img_size;
+	char img_type[7];
+	bool reverse = false;
+	uint8_t *p, *q;
+	uint32_t *crc;
+
+	if (argc < 2)
+		usage_and_exit(EXIT_FAILURE);
+
+	snprintf(img_type, sizeof(img_type), "%s", DEFAULT_IMG_TYPE);
+
+	/* parse commandline options */
+	for (i = 1; (i + 1 < argc) && (argv[i][0] == '-'); i++) {
+		switch (argv[i][1]) {
+		case 's':
+			img_size = strtol(argv[++i], NULL, 10);
+			break;
+		case 't':
+			snprintf(img_type, sizeof(img_type), "%s", argv[++i]);
+			break;
+		case 'r':
+			reverse = true;
+			break;
+		case 'h':
+			status = EXIT_SUCCESS;
+			/* fall through */
+		default:
+			usage_and_exit(status);
+			break;
+		}
+	}
+
+	/* we expect two filenames */
+	if (i + 2 > argc)
+		usage_and_exit(EXIT_FAILURE);
+
+	s.name = argv[i];
+	t.name = argv[++i];
+
+	s.fd = open(s.name, O_RDONLY);
+	if (s.fd < 0) {
+		err("Can't open source file '%s': %s\n", s.name,
+				strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
+	if (fstat(s.fd, &s.sbuf) < 0) {
+		err("Can't stat source file '%s': %s\n", s.name,
+				strerror(errno));
+		goto err_out_close_s;
+	}
+
+	s.ptr = mmap(NULL, s.sbuf.st_size, PROT_READ, MAP_SHARED, s.fd, 0);
+	if (s.ptr == MAP_FAILED) {
+		err("Can't mmap source image file '%s': %s\n", s.name,
+				strerror(errno));
+		goto err_out_close_s;
+	}
+
+	/* TODO: Check source file format:
+	 *	var=value\n
+	 */
+
+	/* check whether the size hasn't been set or whether the source file +
+	 * CRC + trailer fits into the specified size.
+	 */
+	min_img_size = CRC32_SIZE + s.sbuf.st_size + TRAILER_SIZE;
+	if (img_size < 0)
+		img_size = min_img_size;
+	else if (img_size < min_img_size) {
+		err("Specified size (%zd) is too small for the source file to "
+				"fit into. Must be at least %zd bytes.\n",
+				img_size, min_img_size);
+		goto err_out_munmap_s;
+	}
+
+	t.fd = open(t.name, O_RDWR|O_CREAT|O_TRUNC, 0666);
+	if (t.fd < 0) {
+		err("Can't open target image file '%s': %s\n", t.name,
+				strerror(errno));
+		goto err_out_munmap_s;
+	}
+
+	/* seek to the end of the target file to write a byte */
+	if (lseek(t.fd, img_size - 1, SEEK_SET) < 0) {
+		err("Can't seek in target image file '%s': %s\n", t.name,
+				strerror(errno));
+		goto err_out_close_t;
+	}
+
+	if (write(t.fd, "", 1) < 0) {
+		err("Can't write to target image file '%s': %s\n", t.name,
+				strerror(errno));
+		goto err_out_close_t;
+	}
+
+	t.ptr = mmap(NULL, img_size, PROT_READ|PROT_WRITE, MAP_SHARED, t.fd, 0);
+	if (t.ptr == MAP_FAILED) {
+		err("Can't mmap target image file '%s': %s\n", t.name,
+				strerror(errno));
+		goto err_out_close_t;
+	}
+
+	printf("source file:       %s\n", s.name);
+	printf("target image file: %s\n", t.name);
+	printf("size:              %zd\n", img_size);
+	printf("type:              %s\n", img_type);
+
+	/* CRC32 placeholder, will be filled later */
+	dbg("writing crc...\n");
+	for (p = t.ptr; p < t.ptr + CRC32_SIZE; p++)
+		*p = 0;
+
+	/* copy the source file, replacing \n by \0 */
+	dbg("writing data...\n");
+	for (q = s.ptr; q < s.ptr + s.sbuf.st_size; q++, p++) {
+		uint8_t c = (*q == '\n') ? '\0' : *q;
+
+		*p = c;
+	}
+
+	/* trailer */
+	dbg("writing trailer...\n");
+	for (q = s.ptr + s.sbuf.st_size; q < s.ptr + img_size; q++)
+		*p = 0;
+
+	/* now for the real CRC32 */
+	dbg("calculating crc...\n");
+	crc = (uint32_t *) t.ptr;
+	*crc = crc32(0, t.ptr + CRC32_SIZE, img_size - CRC32_SIZE);
+	dbg("crc: %08x\n", *crc);
+
+	status = EXIT_SUCCESS;
+
+	munmap(t.ptr, img_size);
+err_out_close_t:
+	close(t.fd);
+err_out_munmap_s:
+	munmap(s.ptr, s.sbuf.st_size);
+err_out_close_s:
+	close(s.fd);
+
+	exit(status);
+}
-- 
cgit v1.2.3-54-g00ecf


From 44700036b19c3674a5268d474aac9d3d9a97c5ea Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Fri, 23 Oct 2009 15:56:27 +0200
Subject: Remove -t commandline parameter, cleanup

---
 mkubootenv.c | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/mkubootenv.c b/mkubootenv.c
index f2b94ec..7c9922c 100644
--- a/mkubootenv.c
+++ b/mkubootenv.c
@@ -35,12 +35,11 @@
 
 #define DEBUG
 
-#define CMD_NAME		"mkenv"
-#define DEFAULT_IMG_TYPE	"binary"
+#define CMD_NAME		"mkubootenv"
 
 #define CRC32_SIZE		sizeof(uint32_t)
 /* minimum trailing null bytes */
-#define TRAILER_SIZE		sizeof(uint16_t)
+#define TRAILER_SIZE		2
 
 #define err(fmt, args...)	fprintf(stderr, "%s: Error: " fmt, CMD_NAME, ##args)
 #ifdef DEBUG
@@ -65,9 +64,6 @@ static void usage_and_exit(int status)
 	       "  -s <size>  set size of the target image file to <size> bytes. If <size> is\n"
 	       "             bigger than the source file, the target image gets padded with null\n"
 	       "             bytes. If <size> is smaller than the source file, an error is emitted.\n"
-	       "  -t <type>  set type of the target image, where <type> is one of:\n"
-	       "             - binary (default if -t is not specified)\n"
-	       "             - srec\n"
 	       "  -r         reverse operation: get source file from target image file\n");
 	exit(status);
 }
@@ -79,7 +75,6 @@ int main(int argc, char **argv)
 	struct file s, t;	/* source and target file */
 	ssize_t img_size = -1;
 	ssize_t min_img_size;
-	char img_type[7];
 	bool reverse = false;
 	uint8_t *p, *q;
 	uint32_t *crc;
@@ -87,17 +82,12 @@ int main(int argc, char **argv)
 	if (argc < 2)
 		usage_and_exit(EXIT_FAILURE);
 
-	snprintf(img_type, sizeof(img_type), "%s", DEFAULT_IMG_TYPE);
-
 	/* parse commandline options */
 	for (i = 1; (i + 1 < argc) && (argv[i][0] == '-'); i++) {
 		switch (argv[i][1]) {
 		case 's':
 			img_size = strtol(argv[++i], NULL, 10);
 			break;
-		case 't':
-			snprintf(img_type, sizeof(img_type), "%s", argv[++i]);
-			break;
 		case 'r':
 			reverse = true;
 			break;
@@ -181,10 +171,9 @@ int main(int argc, char **argv)
 		goto err_out_close_t;
 	}
 
-	printf("source file:       %s\n", s.name);
-	printf("target image file: %s\n", t.name);
-	printf("size:              %zd\n", img_size);
-	printf("type:              %s\n", img_type);
+	dbg("source file:       %s\n", s.name);
+	dbg("target image file: %s\n", t.name);
+	dbg("size:              %zd\n", img_size);
 
 	/* CRC32 placeholder, will be filled later */
 	dbg("writing crc...\n");
-- 
cgit v1.2.3-54-g00ecf


From c5b2f669a1da34e43a1964cf24a6f22442cdcbba Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Fri, 23 Oct 2009 16:16:15 +0200
Subject: More verbose comments, simplify copying code a bit

---
 mkubootenv.c | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/mkubootenv.c b/mkubootenv.c
index 7c9922c..156e12d 100644
--- a/mkubootenv.c
+++ b/mkubootenv.c
@@ -1,4 +1,19 @@
 /*
+ * mkubootenv.c
+ *
+ * Create a U-Boot environment image suitable for flashing.
+ *
+ * The input is a text file containing environment variable
+ * definitions in the following format (variables separated by
+ * newline):
+ *
+ * baudrate=115200
+ * bootdelay=5
+ * ethaddr=00:15:12:00:00:01
+ * kernel_addr=4050000
+ * boot_ram=bootm ${kernel_addr}
+ * bootcmd=run boot_ram
+ *
  * Copyright (c) 2009, Zurich University of Applied Science
  * Copyright (c) 2009, Tobias Klauser <klto@zhaw.ch>
  *
@@ -131,7 +146,8 @@ int main(int argc, char **argv)
 	 *	var=value\n
 	 */
 
-	/* check whether the size hasn't been set or whether the source file +
+	/*
+	 * check whether the size hasn't been set or whether the source file +
 	 * CRC + trailer fits into the specified size.
 	 */
 	min_img_size = CRC32_SIZE + s.sbuf.st_size + TRAILER_SIZE;
@@ -151,7 +167,10 @@ int main(int argc, char **argv)
 		goto err_out_munmap_s;
 	}
 
-	/* seek to the end of the target file to write a byte */
+	/*
+	 * seek to the end of the target file to write a byte, so we have the
+	 * whole target image size mapped for writing
+	 */
 	if (lseek(t.fd, img_size - 1, SEEK_SET) < 0) {
 		err("Can't seek in target image file '%s': %s\n", t.name,
 				strerror(errno));
@@ -176,17 +195,14 @@ int main(int argc, char **argv)
 	dbg("size:              %zd\n", img_size);
 
 	/* CRC32 placeholder, will be filled later */
-	dbg("writing crc...\n");
+	dbg("writing crc dummy...\n");
 	for (p = t.ptr; p < t.ptr + CRC32_SIZE; p++)
 		*p = 0;
 
 	/* copy the source file, replacing \n by \0 */
 	dbg("writing data...\n");
-	for (q = s.ptr; q < s.ptr + s.sbuf.st_size; q++, p++) {
-		uint8_t c = (*q == '\n') ? '\0' : *q;
-
-		*p = c;
-	}
+	for (q = s.ptr; q < s.ptr + s.sbuf.st_size; q++, p++)
+		*p = (*q == '\n') ? '\0' : *q;
 
 	/* trailer */
 	dbg("writing trailer...\n");
-- 
cgit v1.2.3-54-g00ecf


From 0ec89ae925aa63355a530f8b83b51914e8aa0756 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Fri, 23 Oct 2009 16:20:06 +0200
Subject: Use C99 type for byte in crc32.c

---
 crc32.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/crc32.c b/crc32.c
index 5d41211..4ee251a 100644
--- a/crc32.c
+++ b/crc32.c
@@ -61,14 +61,13 @@ static const uint32_t crc32_table[256] = {
 	0x2d02ef8d
 };
 
-uint32_t crc32(uint32_t crc, unsigned char *buf, size_t len)
+uint32_t crc32(uint32_t crc, uint8_t *buf, size_t len)
 {
-	unsigned char *end;
+	uint8_t *end;
 
 	crc = ~crc;
-	for (end = buf + len; buf < end; ++buf)
+	for (end = buf + len; buf < end; buf++)
 		crc = crc32_table[(crc ^ *buf) & BIT_MASK(8)] ^ (crc >> 8);
 
 	return ~crc;
 }
-
-- 
cgit v1.2.3-54-g00ecf


From 29157750c7a566405a4b148e9087b107db478033 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Fri, 23 Oct 2009 17:50:55 +0200
Subject: Implement reverse operation

---
 mkubootenv.c | 298 +++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 196 insertions(+), 102 deletions(-)

diff --git a/mkubootenv.c b/mkubootenv.c
index 156e12d..4294b76 100644
--- a/mkubootenv.c
+++ b/mkubootenv.c
@@ -57,6 +57,7 @@
 #define TRAILER_SIZE		2
 
 #define err(fmt, args...)	fprintf(stderr, "%s: Error: " fmt, CMD_NAME, ##args)
+#define warn(fmt, args...)	fprintf(stderr, "%s: Warning: " fmt, CMD_NAME, ##args)
 #ifdef DEBUG
 # define dbg(fmt, args...)	fprintf(stdout, fmt, ##args)
 #else
@@ -65,165 +66,258 @@
 
 /* file "object" */
 struct file {
-	char *name;
+	const char *name;
 	int fd;
 	uint8_t *ptr;
-	struct stat sbuf;
+	size_t size;
 };
 
 static void usage_and_exit(int status) __attribute__((noreturn));
 
-static void usage_and_exit(int status)
+static inline void uboot_env_init_file(struct file *f)
 {
-	printf("usage: mkenv [-t <type>] [-s <size>] <source file> <target image file>\n"
-	       "  -s <size>  set size of the target image file to <size> bytes. If <size> is\n"
-	       "             bigger than the source file, the target image gets padded with null\n"
-	       "             bytes. If <size> is smaller than the source file, an error is emitted.\n"
-	       "  -r         reverse operation: get source file from target image file\n");
-	exit(status);
+	memset(f, 0, sizeof(struct file));
+	f->ptr = MAP_FAILED;
 }
 
-int main(int argc, char **argv)
+static int uboot_env_prepare_source(struct file *s)
 {
-	int i;
-	int status = EXIT_FAILURE;
-	struct file s, t;	/* source and target file */
-	ssize_t img_size = -1;
-	ssize_t min_img_size;
-	bool reverse = false;
-	uint8_t *p, *q;
-	uint32_t *crc;
-
-	if (argc < 2)
-		usage_and_exit(EXIT_FAILURE);
-
-	/* parse commandline options */
-	for (i = 1; (i + 1 < argc) && (argv[i][0] == '-'); i++) {
-		switch (argv[i][1]) {
-		case 's':
-			img_size = strtol(argv[++i], NULL, 10);
-			break;
-		case 'r':
-			reverse = true;
-			break;
-		case 'h':
-			status = EXIT_SUCCESS;
-			/* fall through */
-		default:
-			usage_and_exit(status);
-			break;
-		}
-	}
-
-	/* we expect two filenames */
-	if (i + 2 > argc)
-		usage_and_exit(EXIT_FAILURE);
-
-	s.name = argv[i];
-	t.name = argv[++i];
+	struct stat sbuf;
 
-	s.fd = open(s.name, O_RDONLY);
-	if (s.fd < 0) {
-		err("Can't open source file '%s': %s\n", s.name,
+	s->fd = open(s->name, O_RDONLY);
+	if (s->fd < 0) {
+		err("Can't open source file '%s': %s\n", s->name,
 				strerror(errno));
-		exit(EXIT_FAILURE);
+		return EXIT_FAILURE;
 	}
 
-	if (fstat(s.fd, &s.sbuf) < 0) {
-		err("Can't stat source file '%s': %s\n", s.name,
+	if (fstat(s->fd, &sbuf) < 0) {
+		err("Can't stat source file '%s': %s\n", s->name,
 				strerror(errno));
-		goto err_out_close_s;
+		close(s->fd);
+		return -1;
 	}
 
-	s.ptr = mmap(NULL, s.sbuf.st_size, PROT_READ, MAP_SHARED, s.fd, 0);
-	if (s.ptr == MAP_FAILED) {
-		err("Can't mmap source image file '%s': %s\n", s.name,
+	s->ptr = mmap(NULL, sbuf.st_size, PROT_READ, MAP_SHARED, s->fd, 0);
+	if (s->ptr == MAP_FAILED) {
+		err("Can't mmap source image file '%s': %s\n", s->name,
 				strerror(errno));
-		goto err_out_close_s;
+		close(s->fd);
+		return -1;
 	}
 
-	/* TODO: Check source file format:
-	 *	var=value\n
-	 */
+	s->size = sbuf.st_size;
 
-	/*
-	 * check whether the size hasn't been set or whether the source file +
-	 * CRC + trailer fits into the specified size.
-	 */
-	min_img_size = CRC32_SIZE + s.sbuf.st_size + TRAILER_SIZE;
-	if (img_size < 0)
-		img_size = min_img_size;
-	else if (img_size < min_img_size) {
-		err("Specified size (%zd) is too small for the source file to "
-				"fit into. Must be at least %zd bytes.\n",
-				img_size, min_img_size);
-		goto err_out_munmap_s;
-	}
+	return 0;
+}
 
-	t.fd = open(t.name, O_RDWR|O_CREAT|O_TRUNC, 0666);
-	if (t.fd < 0) {
-		err("Can't open target image file '%s': %s\n", t.name,
+static int uboot_env_prepare_target(struct file *t)
+{
+	t->fd = open(t->name, O_RDWR|O_CREAT|O_TRUNC, 0666);
+	if (t->fd < 0) {
+		err("Can't open target image file '%s': %s\n", t->name,
 				strerror(errno));
-		goto err_out_munmap_s;
+		return -1;
 	}
 
 	/*
 	 * seek to the end of the target file to write a byte, so we have the
 	 * whole target image size mapped for writing
 	 */
-	if (lseek(t.fd, img_size - 1, SEEK_SET) < 0) {
-		err("Can't seek in target image file '%s': %s\n", t.name,
+	if (lseek(t->fd, t->size - 1, SEEK_SET) < 0) {
+		err("Can't seek in target image file '%s': %s\n", t->name,
 				strerror(errno));
-		goto err_out_close_t;
+		close(t->fd);
+		return -1;
 	}
 
-	if (write(t.fd, "", 1) < 0) {
-		err("Can't write to target image file '%s': %s\n", t.name,
+	if (write(t->fd, "", 1) < 0) {
+		err("Can't write to target image file '%s': %s\n", t->name,
 				strerror(errno));
-		goto err_out_close_t;
+		close(t->fd);
+		return -1;
 	}
 
-	t.ptr = mmap(NULL, img_size, PROT_READ|PROT_WRITE, MAP_SHARED, t.fd, 0);
-	if (t.ptr == MAP_FAILED) {
-		err("Can't mmap target image file '%s': %s\n", t.name,
+	t->ptr = mmap(NULL, t->size, PROT_READ|PROT_WRITE, MAP_SHARED, t->fd, 0);
+	if (t->ptr == MAP_FAILED) {
+		err("Can't mmap target image file '%s': %s\n", t->name,
 				strerror(errno));
-		goto err_out_close_t;
+		close(t->fd);
+		return -1;
 	}
 
-	dbg("source file:       %s\n", s.name);
-	dbg("target image file: %s\n", t.name);
-	dbg("size:              %zd\n", img_size);
+	return 0;
+}
+
+static void uboot_env_cleanup_file(struct file *f)
+{
+	if (f->ptr != MAP_FAILED)
+		munmap(f->ptr, f->size);
+	if (f->fd > 0)
+		close(f->fd);
+}
+
+static void uboot_env_to_img(struct file *s, struct file *t)
+{
+	uint8_t *p, *q, *end;
+	uint32_t *crc;
+
+	dbg("source file (env):       %s\n", s->name);
+	dbg("target image file (bin): %s\n", t->name);
+	dbg("target size:             %zd\n", t->size);
 
 	/* CRC32 placeholder, will be filled later */
 	dbg("writing crc dummy...\n");
-	for (p = t.ptr; p < t.ptr + CRC32_SIZE; p++)
+	end = t->ptr + CRC32_SIZE;
+	for (p = t->ptr; p < end; p++)
 		*p = 0;
 
 	/* copy the source file, replacing \n by \0 */
 	dbg("writing data...\n");
-	for (q = s.ptr; q < s.ptr + s.sbuf.st_size; q++, p++)
+	end = s->ptr + s->size;
+	for (q = s->ptr; q < end; q++, p++)
 		*p = (*q == '\n') ? '\0' : *q;
 
 	/* trailer */
 	dbg("writing trailer...\n");
-	for (q = s.ptr + s.sbuf.st_size; q < s.ptr + img_size; q++)
+	end = s->ptr + t->size;
+	for (q = s->ptr + s->size; q < end; q++)
 		*p = 0;
 
 	/* now for the real CRC32 */
 	dbg("calculating crc...\n");
-	crc = (uint32_t *) t.ptr;
-	*crc = crc32(0, t.ptr + CRC32_SIZE, img_size - CRC32_SIZE);
+	crc = (uint32_t *) t->ptr;
+	*crc = crc32(0, t->ptr + CRC32_SIZE, t->size - CRC32_SIZE);
 	dbg("crc: %08x\n", *crc);
+}
+
+static void uboot_img_to_env(struct file *s, struct file *t)
+{
+	uint8_t *p, *q, *end;
+	uint32_t *crc;
+
+	dbg("source file (bin):       %s\n", s->name);
+	dbg("target image file (env): %s\n", t->name);
+	dbg("target size:             %zd\n", t->size);
+
+	/* TODO: check CRC */
+
+	p = t->ptr;
+	end = s->ptr + CRC32_SIZE + t->size;
+	for (q = s->ptr + CRC32_SIZE; q < end; p++, q++)
+		*p = (*q == '\0') ? '\n' : *q;
+}
+
+static void usage_and_exit(int status)
+{
+	printf("usage: mkenv [-t <type>] [-s <size>] <source file> <target file>\n"
+	       "  -s <size>  set size of the target image file to <size> bytes. If <size> is\n"
+	       "             bigger than the source file, the target image gets padded with null\n"
+	       "             bytes. If <size> is smaller than the source file, an error is emitted.\n"
+	       "  -r         reverse operation: get plaintext env file (target) from binary image\n"
+	       "             file (source)\n");
+	exit(status);
+}
+
+int main(int argc, char **argv)
+{
+	int i;
+	int status = EXIT_FAILURE;
+	ssize_t img_size = -1;
+	bool reverse = false;
+	struct file s, t;	/* source and target file */
+
+	if (argc < 2)
+		usage_and_exit(EXIT_FAILURE);
+
+	/* parse commandline options */
+	for (i = 1; (i + 1 < argc) && (argv[i][0] == '-'); i++) {
+		switch (argv[i][1]) {
+		case 's':
+			img_size = strtol(argv[++i], NULL, 10);
+			if (img_size <= 0) {
+				err("Invalid target image size: %zd. Must be greater than 0.\n", img_size);
+				exit(EXIT_FAILURE);
+			}
+			break;
+		case 'r':
+			reverse = true;
+			break;
+		case 'h':
+			status = EXIT_SUCCESS;
+			/* fall through */
+		default:
+			usage_and_exit(status);
+			break;
+		}
+	}
+
+	/* we expect two filenames */
+	if (i + 2 > argc)
+		usage_and_exit(EXIT_FAILURE);
+
+	if (reverse && img_size >= 0)
+		warn("Image size specified in reverse mode will be ignored\n");
+
+	uboot_env_init_file(&s);
+	uboot_env_init_file(&t);
+	s.name = argv[i];
+	t.name = argv[i+1];
+
+	if (uboot_env_prepare_source(&s))
+		exit(EXIT_FAILURE);
+
+	if (!reverse) {
+		ssize_t min_img_size = CRC32_SIZE + s.size + TRAILER_SIZE;
+
+		/* TODO: Check source file format:
+		 *	var=value\n
+		 */
+
+		/*
+		 * check whether the size hasn't been set or whether the source file +
+		 * CRC + trailer fits into the specified size.
+		 */
+		if (img_size < 0)
+			img_size = min_img_size;
+		else if (img_size < min_img_size) {
+			err("Specified size (%zd) is too small for the source file to "
+					"fit into. Must be at least %zd bytes.\n",
+					img_size, min_img_size);
+			goto cleanup_source;
+		}
+
+		t.size = img_size;
+		if (uboot_env_prepare_target(&t))
+			goto cleanup_source;
+
+		uboot_env_to_img(&s, &t);
+	} else {
+		uint8_t *p;
+		uint8_t *end;
+		bool found_data_end = false;
+
+		/* get the length of the data part */
+		end = s.ptr + CRC32_SIZE + s.size;
+		for (p = s.ptr + CRC32_SIZE; (p < end - 1) && (!found_data_end); p++) {
+			/* two null bytes mark the end of the data section */
+			if (*p == '\0' && *(p + 1) == '\0')
+				found_data_end = true;
+		}
+
+		/* calculate the plain text file size */
+		t.size = p - (s.ptr + CRC32_SIZE);
+		if (uboot_env_prepare_target(&t))
+			goto cleanup_source;
+
+		uboot_img_to_env(&s, &t);
+	}
 
 	status = EXIT_SUCCESS;
 
-	munmap(t.ptr, img_size);
-err_out_close_t:
-	close(t.fd);
-err_out_munmap_s:
-	munmap(s.ptr, s.sbuf.st_size);
-err_out_close_s:
-	close(s.fd);
+	uboot_env_cleanup_file(&t);
+cleanup_source:
+	uboot_env_cleanup_file(&s);
 
 	exit(status);
 }
-- 
cgit v1.2.3-54-g00ecf


From cd1ec1120f97557237b8f978de1aef7f399c8ef3 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Fri, 23 Oct 2009 18:05:37 +0200
Subject: Implement CRC checking in reverese mode

---
 mkubootenv.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mkubootenv.c b/mkubootenv.c
index 4294b76..f8b0bbc 100644
--- a/mkubootenv.c
+++ b/mkubootenv.c
@@ -200,7 +200,10 @@ static void uboot_img_to_env(struct file *s, struct file *t)
 	dbg("target image file (env): %s\n", t->name);
 	dbg("target size:             %zd\n", t->size);
 
-	/* TODO: check CRC */
+	/* check CRC */
+	crc = (uint32_t *) s->ptr;
+	if (*crc != crc32(0, s->ptr + CRC32_SIZE, s->size - CRC32_SIZE))
+		warn("source image with bad CRC\n");
 
 	p = t->ptr;
 	end = s->ptr + CRC32_SIZE + t->size;
-- 
cgit v1.2.3-54-g00ecf


From 68a702f97d226d16a14a8795fa228601bd0fd44a Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Mon, 26 Oct 2009 09:00:36 +0100
Subject: Rework Makfile, add install/uninstall targets

---
 Makefile | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 9c2bd53..a0cbf46 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,16 @@
+prefix = $(HOME)
 
-MKUBOOTENV = mkubootenv
-MKUBOOTENV_OBJS = mkubootenv.o crc32.o
+P	 = mkubootenv
+OBJS	 = mkubootenv.o crc32.o
+WHERE	 = $(prefix)/bin/$(P)
 
-CFLAGS += -W -Wall -Wextra -Wstrict-prototypes -Wsign-compare -Wshadow \
-	  -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-	  -Wpointer-arith -Wcast-align
+CFLAGS	+= -W -Wall -Wextra -Wstrict-prototypes -Wsign-compare -Wshadow \
+	   -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+	   -Wpointer-arith -Wcast-align
 
-all: $(MKUBOOTENV)
+all: $(P)
 
-$(MKUBOOTENV): $(MKUBOOTENV_OBJS)
+$(P): $(OBJS)
 	@echo "  LD $@"
 	@$(CC) $(LDFLAGS) -o $@ $^
 
@@ -20,6 +22,14 @@ $(MKUBOOTENV): $(MKUBOOTENV_OBJS)
 	@echo "  CC $@"
 	@$(CC) $(CFLAGS) -c $< -o $@
 
+install:
+	@echo "  INSTALL $(WHERE)"
+	@install -m755 -D $(P) $(WHERE)
+
+uninstall:
+	@echo "  UNINSTALL $(WHERE)"
+	@rm -f $(WHERE)
+
 clean:
 	@echo "  CLEAN"
-	@rm -f *.o $(MKUBOOTENV)
+	@rm -f $(OBJS) $(P)
-- 
cgit v1.2.3-54-g00ecf


From dbefbdaaa6b97d28a3fa6b0ca37fcdbc07594ba6 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Mon, 26 Oct 2009 09:01:30 +0100
Subject: Emit warning in case no end of data is encountered

---
 mkubootenv.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mkubootenv.c b/mkubootenv.c
index f8b0bbc..598d95a 100644
--- a/mkubootenv.c
+++ b/mkubootenv.c
@@ -308,6 +308,9 @@ int main(int argc, char **argv)
 				found_data_end = true;
 		}
 
+		if (!found_data_end)
+			warn("No end of list delimiter found in source file\n");
+
 		/* calculate the plain text file size */
 		t.size = p - (s.ptr + CRC32_SIZE);
 		if (uboot_env_prepare_target(&t))
-- 
cgit v1.2.3-54-g00ecf


From f83fca77fa4366462bb443f2cff50af9f3e4bfb7 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Mon, 26 Oct 2009 09:02:00 +0100
Subject: Add .gitignore

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c3f689a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+mkubootenv
+*.o
+*.bin
+*.env
-- 
cgit v1.2.3-54-g00ecf


From 3198bdc4357c2256b62ba58b6c7e6a1aa593d168 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Mon, 26 Oct 2009 13:46:40 +0100
Subject: Support specifying image size in hex

---
 mkubootenv.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/mkubootenv.c b/mkubootenv.c
index 598d95a..2ccaa7b 100644
--- a/mkubootenv.c
+++ b/mkubootenv.c
@@ -236,13 +236,23 @@ int main(int argc, char **argv)
 	/* parse commandline options */
 	for (i = 1; (i + 1 < argc) && (argv[i][0] == '-'); i++) {
 		switch (argv[i][1]) {
-		case 's':
-			img_size = strtol(argv[++i], NULL, 10);
-			if (img_size <= 0) {
-				err("Invalid target image size: %zd. Must be greater than 0.\n", img_size);
-				exit(EXIT_FAILURE);
+		case 's': {
+			char *opt = argv[++i];
+
+			if (strlen(opt) > 2 && opt[0] == '0' &&
+					(opt[1] == 'x' || opt[1] == 'X')) {
+				img_size = strtol(opt, NULL, 16);
+			} else {
+				img_size = strtol(opt, NULL, 10);
+
+				if (img_size <= 0) {
+					err("Invalid target image size: %zd. Must be greater than 0.\n", img_size);
+					exit(EXIT_FAILURE);
+				}
 			}
+			dbg("img_size: %d\n", img_size);
 			break;
+		}
 		case 'r':
 			reverse = true;
 			break;
-- 
cgit v1.2.3-54-g00ecf


From 82267229ea33f0c21b92cee90832be978eed028f Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Mon, 26 Oct 2009 14:12:01 +0100
Subject: Disable debugging, update comment

---
 mkubootenv.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/mkubootenv.c b/mkubootenv.c
index 2ccaa7b..fce3b1f 100644
--- a/mkubootenv.c
+++ b/mkubootenv.c
@@ -4,15 +4,12 @@
  * Create a U-Boot environment image suitable for flashing.
  *
  * The input is a text file containing environment variable
- * definitions in the following format (variables separated by
- * newline):
+ * definitions in the format "name=value", separeated by newlines.
  *
- * baudrate=115200
- * bootdelay=5
- * ethaddr=00:15:12:00:00:01
- * kernel_addr=4050000
- * boot_ram=bootm ${kernel_addr}
- * bootcmd=run boot_ram
+ * The "environment" (output) is stored as a list of '\0' terminated
+ * "name=value" strings. The end of the list is marked by a double '\0'.
+ *
+ * The environment is preceeded by a 32 bit CRC over the data part.
  *
  * Copyright (c) 2009, Zurich University of Applied Science
  * Copyright (c) 2009, Tobias Klauser <klto@zhaw.ch>
@@ -48,7 +45,7 @@
 
 #include "crc32.h"
 
-#define DEBUG
+#undef DEBUG
 
 #define CMD_NAME		"mkubootenv"
 
@@ -167,28 +164,23 @@ static void uboot_env_to_img(struct file *s, struct file *t)
 	dbg("target size:             %zd\n", t->size);
 
 	/* CRC32 placeholder, will be filled later */
-	dbg("writing crc dummy...\n");
 	end = t->ptr + CRC32_SIZE;
 	for (p = t->ptr; p < end; p++)
 		*p = 0;
 
 	/* copy the source file, replacing \n by \0 */
-	dbg("writing data...\n");
 	end = s->ptr + s->size;
 	for (q = s->ptr; q < end; q++, p++)
 		*p = (*q == '\n') ? '\0' : *q;
 
 	/* trailer */
-	dbg("writing trailer...\n");
 	end = s->ptr + t->size;
 	for (q = s->ptr + s->size; q < end; q++)
 		*p = 0;
 
 	/* now for the real CRC32 */
-	dbg("calculating crc...\n");
 	crc = (uint32_t *) t->ptr;
 	*crc = crc32(0, t->ptr + CRC32_SIZE, t->size - CRC32_SIZE);
-	dbg("crc: %08x\n", *crc);
 }
 
 static void uboot_img_to_env(struct file *s, struct file *t)
@@ -250,7 +242,6 @@ int main(int argc, char **argv)
 					exit(EXIT_FAILURE);
 				}
 			}
-			dbg("img_size: %d\n", img_size);
 			break;
 		}
 		case 'r':
-- 
cgit v1.2.3-54-g00ecf


From d944dd523f456b95afc6f7f829350cf107b6f665 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Tue, 27 Oct 2009 14:03:19 +0100
Subject: crc32: Coding style

---
 crc32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crc32.c b/crc32.c
index 4ee251a..14920a2 100644
--- a/crc32.c
+++ b/crc32.c
@@ -3,7 +3,7 @@
 
 #include "crc32.h"
 
-#define BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
+#define BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL << (n)) - 1))
 
 /* Table computed with Mark Adler's makecrc.c utility.  */
 static const uint32_t crc32_table[256] = {
-- 
cgit v1.2.3-54-g00ecf


From 1f96bb1eda77de338fcd8b2af1a70a3c2cf37f18 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Tue, 10 Nov 2009 14:13:24 +0100
Subject: Remove old option from usage (never implemented)

---
 mkubootenv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkubootenv.c b/mkubootenv.c
index fce3b1f..253ed9c 100644
--- a/mkubootenv.c
+++ b/mkubootenv.c
@@ -205,7 +205,7 @@ static void uboot_img_to_env(struct file *s, struct file *t)
 
 static void usage_and_exit(int status)
 {
-	printf("usage: mkenv [-t <type>] [-s <size>] <source file> <target file>\n"
+	printf("usage: mkenv [-s <size>] <source file> <target file>\n"
 	       "  -s <size>  set size of the target image file to <size> bytes. If <size> is\n"
 	       "             bigger than the source file, the target image gets padded with null\n"
 	       "             bytes. If <size> is smaller than the source file, an error is emitted.\n"
-- 
cgit v1.2.3-54-g00ecf


From 7ac7375df3cd40717b27e5c4fb92052ee6730c7b Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Thu, 10 Dec 2009 14:24:22 +0100
Subject: crc32: Remove useless BIT_MASK macro and replace only user by
 constant

---
 crc32.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/crc32.c b/crc32.c
index 14920a2..e07bbed 100644
--- a/crc32.c
+++ b/crc32.c
@@ -3,8 +3,6 @@
 
 #include "crc32.h"
 
-#define BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL << (n)) - 1))
-
 /* Table computed with Mark Adler's makecrc.c utility.  */
 static const uint32_t crc32_table[256] = {
 	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
@@ -67,7 +65,7 @@ uint32_t crc32(uint32_t crc, uint8_t *buf, size_t len)
 
 	crc = ~crc;
 	for (end = buf + len; buf < end; buf++)
-		crc = crc32_table[(crc ^ *buf) & BIT_MASK(8)] ^ (crc >> 8);
+		crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8);
 
 	return ~crc;
 }
-- 
cgit v1.2.3-54-g00ecf


From bc22fb970ec9f3725e5d46d467798897610354e4 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Mon, 14 Dec 2009 17:30:44 +0100
Subject: Typo in copyright header corrected

---
 mkubootenv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkubootenv.c b/mkubootenv.c
index 253ed9c..8a1b10c 100644
--- a/mkubootenv.c
+++ b/mkubootenv.c
@@ -11,7 +11,7 @@
  *
  * The environment is preceeded by a 32 bit CRC over the data part.
  *
- * Copyright (c) 2009, Zurich University of Applied Science
+ * Copyright (c) 2009, Zurich University of Applied Sciences
  * Copyright (c) 2009, Tobias Klauser <klto@zhaw.ch>
  *
  * This program is free software; you can redistribute it and/or
-- 
cgit v1.2.3-54-g00ecf


From 64b810b41989876099b3c461b3ac91d4b3813d9d Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Mon, 14 Dec 2009 17:50:35 +0100
Subject: Add README and example directory, correct usage

---
 README                |  45 +++++++++++++++++++++++++++++++++++++++++++++
 example/uboot_env.bin | Bin 0 -> 247 bytes
 example/uboot_env.env |  10 ++++++++++
 mkubootenv.c          |   2 +-
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 README
 create mode 100644 example/uboot_env.bin
 create mode 100644 example/uboot_env.env

diff --git a/README b/README
new file mode 100644
index 0000000..e63eba3
--- /dev/null
+++ b/README
@@ -0,0 +1,45 @@
+mkubootenv
+==========
+
+Create an U-Boot environmet image suitable for flashing. The input is a text
+file containing environment variable definitions in the format “name=value”,
+separeated by newlines.
+
+Usage
+-----
+
+usage: mkubootenv [-s <size>] <source file> <target file>
+
+Options:
+  -s <size>  set size of the target image file to <size> bytes. If <size> is
+             bigger than the source file, the target image gets padded with
+	     null bytes. If <size> is smaller than the source file, an error is
+	     emitted.
+  -r         reverse operation: get plaintext env file (target) from binary
+             image file (source)
+
+File formats
+------------
+
+The U-Boot environment is stored in a simple file format, described in
+include/environment.h of the U-Boot source tree as follows:
+
+/**************************************************************************
+ *
+ * The "environment" is stored as a list of '\0' terminated
+ * "name=value" strings. The end of the list is marked by a double
+ * '\0'. New entries are always added at the end. Deleting an entry
+ * shifts the remaining entries to the front. Replacing an entry is a
+ * combination of deleting the old value and adding the new one.
+ *
+ * The environment is preceeded by a 32 bit CRC over the data part.
+ *
+ **************************************************************************
+ */
+
+The input file format for mkubootenv is a simple text file containing
+'name=value' pairs, separated by newlines ('\n'). This means, there are _no
+newlines allowed_ inside the variable names or values.
+
+See the example/ directory for an example input file (uboot_env.env) and its
+corresponding output file (uboot_env.bin).
diff --git a/example/uboot_env.bin b/example/uboot_env.bin
new file mode 100644
index 0000000..9c4138c
Binary files /dev/null and b/example/uboot_env.bin differ
diff --git a/example/uboot_env.env b/example/uboot_env.env
new file mode 100644
index 0000000..35330e8
--- /dev/null
+++ b/example/uboot_env.env
@@ -0,0 +1,10 @@
+baudrate=115200
+kernel_addr=4050000
+bootcmd=run flash_ram
+ramargs=setenv bootargs root=/dev/ram rw panic=1
+bootdelay=3
+flash_ram=run set_mac;run ramargs;bootm ${kernel_addr}
+stdin=serial
+stdout=serial
+stderr=serial
+ethaddr=00:15:12:00:20:01
diff --git a/mkubootenv.c b/mkubootenv.c
index 8a1b10c..8e49cbb 100644
--- a/mkubootenv.c
+++ b/mkubootenv.c
@@ -205,7 +205,7 @@ static void uboot_img_to_env(struct file *s, struct file *t)
 
 static void usage_and_exit(int status)
 {
-	printf("usage: mkenv [-s <size>] <source file> <target file>\n"
+	printf("usage: mkubootenv [-s <size>] <source file> <target file>\n"
 	       "  -s <size>  set size of the target image file to <size> bytes. If <size> is\n"
 	       "             bigger than the source file, the target image gets padded with null\n"
 	       "             bytes. If <size> is smaller than the source file, an error is emitted.\n"
-- 
cgit v1.2.3-54-g00ecf


From c6e370e4a3a1c574e50240fecefe05965464aefd Mon Sep 17 00:00:00 2001
From: Tobias Klauser <klto@zhaw.ch>
Date: Tue, 15 Dec 2009 15:18:50 +0100
Subject: crc32: constify arguments

---
 crc32.c | 4 ++--
 crc32.h | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/crc32.c b/crc32.c
index e07bbed..6e0c87d 100644
--- a/crc32.c
+++ b/crc32.c
@@ -59,9 +59,9 @@ static const uint32_t crc32_table[256] = {
 	0x2d02ef8d
 };
 
-uint32_t crc32(uint32_t crc, uint8_t *buf, size_t len)
+uint32_t crc32(uint32_t crc, const uint8_t *buf, size_t len)
 {
-	uint8_t *end;
+	const uint8_t *end;
 
 	crc = ~crc;
 	for (end = buf + len; buf < end; buf++)
diff --git a/crc32.h b/crc32.h
index 72da4e0..6ea89b0 100644
--- a/crc32.h
+++ b/crc32.h
@@ -1,6 +1,8 @@
 #ifndef _CRC32_H_
 #define _CRC32_H_
 
-extern uint32_t crc32(uint32_t crc, unsigned char *buf, size_t len);
+#include <stdint.h>
+
+extern uint32_t crc32(uint32_t crc, const uint8_t *buf, size_t len);
 
 #endif /* _CRC32_H_ */
-- 
cgit v1.2.3-54-g00ecf