From: Jose V Beneyto <sepen@crux.nu>
Date: Mon, 17 Oct 2011 21:59:55 +0000 (+0200)
Subject: mkimage generated from make tools section in u-boot sourcecode
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=73bb00a3bb8f47f9cbdba7a6c3e07f82309f65e7;p=bootloader.git
mkimage generated from make tools section in u-boot sourcecode
---
diff --git a/Makefile b/Makefile
index 1fa003e..75c78fb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,11 @@
# uboot/Makefile
#
-TOPDIR = $(shell pwd)
+PWD = $(shell pwd)
WORK = $(PWD)/work
+UBOOT_VERSION = 2011.09
+
.PHONY: all mkimage clean dist-clean
all: mkimage
@@ -13,9 +15,22 @@ clean: mkimage-clean
dist-clean: mkimage-distclean
-$(WORK)/mkimage:
- $(CC) -Wall -o $(WORK)/mkimage -c $(WORK)/mkimage.c
- install -m 0755 $(WORK)/mkimage mkimage
+
+$(WORK)/u-boot-$(UBOOT_VERSION).tar.bz2:
+ wget -P $(WORK) ftp://ftp.denx.de/pub/u-boot/u-boot-$(UBOOT_VERSION).tar.bz2
+
+$(WORK)/u-boot-$(UBOOT_VERSION): $(WORK)/u-boot-$(UBOOT_VERSION).tar.bz2
+ tar -C $(WORK) -xjf $(WORK)/u-boot-$(UBOOT_VERSION).tar.bz2
+ cd $(WORK)/u-boot-$(UBOOT_VERSION) && \
+ patch -p1 -i $(WORK)/u-boot-2011.09.tools1.patch && \
+ patch -p1 -i $(WORK)/u-boot-2011.09.tools2.patch && \
+ patch -p1 -i $(WORK)/u-boot-2011.09.tools3.patch
+ touch $(WORK)/u-boot-$(UBOOT_VERSION)
+
+$(WORK)/mkimage: $(WORK)/u-boot-$(UBOOT_VERSION)
+ cd /crux-arm/uboot/work/u-boot-2011.09 && \
+ make tools && \
+ install -m 0755 $(WORK)/u-boot-$(UBOOT_VERSION)/tools/mkimage $(WORK)/mkimage
mkimage: $(WORK)/mkimage
diff --git a/work/image.h b/work/image.h
deleted file mode 100644
index cb62cde..0000000
--- a/work/image.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * (C) Copyright 2000-2005
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * 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
- *
- ********************************************************************
- * NOTE: This header file defines an interface to U-Boot. Including
- * this (unmodified) header file in another file is considered normal
- * use of U-Boot, and does *not* fall under the heading of "derived
- * work".
- ********************************************************************
- */
-
-#ifndef __IMAGE_H__
-#define __IMAGE_H__
-
-/*
- * Operating System Codes
- */
-#define IH_OS_INVALID 0 /* Invalid OS */
-#define IH_OS_OPENBSD 1 /* OpenBSD */
-#define IH_OS_NETBSD 2 /* NetBSD */
-#define IH_OS_FREEBSD 3 /* FreeBSD */
-#define IH_OS_4_4BSD 4 /* 4.4BSD */
-#define IH_OS_LINUX 5 /* Linux */
-#define IH_OS_SVR4 6 /* SVR4 */
-#define IH_OS_ESIX 7 /* Esix */
-#define IH_OS_SOLARIS 8 /* Solaris */
-#define IH_OS_IRIX 9 /* Irix */
-#define IH_OS_SCO 10 /* SCO */
-#define IH_OS_DELL 11 /* Dell */
-#define IH_OS_NCR 12 /* NCR */
-#define IH_OS_LYNXOS 13 /* LynxOS */
-#define IH_OS_VXWORKS 14 /* VxWorks */
-#define IH_OS_PSOS 15 /* pSOS */
-#define IH_OS_QNX 16 /* QNX */
-#define IH_OS_U_BOOT 17 /* Firmware */
-#define IH_OS_RTEMS 18 /* RTEMS */
-#define IH_OS_ARTOS 19 /* ARTOS */
-#define IH_OS_UNITY 20 /* Unity OS */
-
-/*
- * CPU Architecture Codes (supported by Linux)
- */
-#define IH_CPU_INVALID 0 /* Invalid CPU */
-#define IH_CPU_ALPHA 1 /* Alpha */
-#define IH_CPU_ARM 2 /* ARM */
-#define IH_CPU_I386 3 /* Intel x86 */
-#define IH_CPU_IA64 4 /* IA64 */
-#define IH_CPU_MIPS 5 /* MIPS */
-#define IH_CPU_MIPS64 6 /* MIPS 64 Bit */
-#define IH_CPU_PPC 7 /* PowerPC */
-#define IH_CPU_S390 8 /* IBM S390 */
-#define IH_CPU_SH 9 /* SuperH */
-#define IH_CPU_SPARC 10 /* Sparc */
-#define IH_CPU_SPARC64 11 /* Sparc 64 Bit */
-#define IH_CPU_M68K 12 /* M68K */
-#define IH_CPU_NIOS 13 /* Nios-32 */
-#define IH_CPU_MICROBLAZE 14 /* MicroBlaze */
-#define IH_CPU_NIOS2 15 /* Nios-II */
-#define IH_CPU_BLACKFIN 16 /* Blackfin */
-#define IH_CPU_AVR32 17 /* AVR32 */
-
-/*
- * Image Types
- *
- * "Standalone Programs" are directly runnable in the environment
- * provided by U-Boot; it is expected that (if they behave
- * well) you can continue to work in U-Boot after return from
- * the Standalone Program.
- * "OS Kernel Images" are usually images of some Embedded OS which
- * will take over control completely. Usually these programs
- * will install their own set of exception handlers, device
- * drivers, set up the MMU, etc. - this means, that you cannot
- * expect to re-enter U-Boot except by resetting the CPU.
- * "RAMDisk Images" are more or less just data blocks, and their
- * parameters (address, size) are passed to an OS kernel that is
- * being started.
- * "Multi-File Images" contain several images, typically an OS
- * (Linux) kernel image and one or more data images like
- * RAMDisks. This construct is useful for instance when you want
- * to boot over the network using BOOTP etc., where the boot
- * server provides just a single image file, but you want to get
- * for instance an OS kernel and a RAMDisk image.
- *
- * "Multi-File Images" start with a list of image sizes, each
- * image size (in bytes) specified by an "uint32_t" in network
- * byte order. This list is terminated by an "(uint32_t)0".
- * Immediately after the terminating 0 follow the images, one by
- * one, all aligned on "uint32_t" boundaries (size rounded up to
- * a multiple of 4 bytes - except for the last file).
- *
- * "Firmware Images" are binary images containing firmware (like
- * U-Boot or FPGA images) which usually will be programmed to
- * flash memory.
- *
- * "Script files" are command sequences that will be executed by
- * U-Boot's command interpreter; this feature is especially
- * useful when you configure U-Boot to use a real shell (hush)
- * as command interpreter (=> Shell Scripts).
- */
-
-#define IH_TYPE_INVALID 0 /* Invalid Image */
-#define IH_TYPE_STANDALONE 1 /* Standalone Program */
-#define IH_TYPE_KERNEL 2 /* OS Kernel Image */
-#define IH_TYPE_RAMDISK 3 /* RAMDisk Image */
-#define IH_TYPE_MULTI 4 /* Multi-File Image */
-#define IH_TYPE_FIRMWARE 5 /* Firmware Image */
-#define IH_TYPE_SCRIPT 6 /* Script file */
-#define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */
-#define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */
-
-/*
- * Compression Types
- */
-#define IH_COMP_NONE 0 /* No Compression Used */
-#define IH_COMP_GZIP 1 /* gzip Compression Used */
-#define IH_COMP_BZIP2 2 /* bzip2 Compression Used */
-#define IH_COMP_LZMA 3 /* lzma Compression Used */
-
-#define IH_MAGIC 0x27051956 /* Image Magic Number */
-#define IH_NMLEN 32 /* Image Name Length */
-
-/*
- * all data in network byte order (aka natural aka bigendian)
- */
-
-typedef struct image_header {
- uint32_t ih_magic; /* Image Header Magic Number */
- uint32_t ih_hcrc; /* Image Header CRC Checksum */
- uint32_t ih_time; /* Image Creation Timestamp */
- uint32_t ih_size; /* Image Data Size */
- uint32_t ih_load; /* Data Load Address */
- uint32_t ih_ep; /* Entry Point Address */
- uint32_t ih_dcrc; /* Image Data CRC Checksum */
- uint8_t ih_os; /* Operating System */
- uint8_t ih_arch; /* CPU architecture */
- uint8_t ih_type; /* Image Type */
- uint8_t ih_comp; /* Compression Type */
- uint8_t ih_name[IH_NMLEN]; /* Image Name */
-} image_header_t;
-
-
-#endif /* __IMAGE_H__ */
diff --git a/work/mkimage.c b/work/mkimage.c
deleted file mode 100644
index 7c0432b..0000000
--- a/work/mkimage.c
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- * (C) Copyright 2000-2004
- * DENX Software Engineering
- * Wolfgang Denk, wd@denx.de
- * All rights reserved.
- *
- * 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
- */
-#ifdef __APPLE__
-#define __FreeBSD__ 10
-#endif
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifndef __WIN32__
-#include <netinet/in.h> /* for host / network byte order conversions */
-#endif
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <unistd.h>
-
-#if defined(__BEOS__) || defined(__NetBSD__) || defined(__APPLE__)
-#include <inttypes.h>
-#include <sys/types.h>
-#endif
-#ifdef __WIN32__
-typedef unsigned int __u32;
-
-#define SWAP_LONG(x) \
- ((__u32)( \
- (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
- (((__u32)(x) & (__u32)0x0000ff00UL) << 8) | \
- (((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | \
- (((__u32)(x) & (__u32)0xff000000UL) >> 24) ))
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-
-#define ntohl(a) SWAP_LONG(a)
-#define htonl(a) SWAP_LONG(a)
-#endif /* __WIN32__ */
-
-#ifndef O_BINARY /* should be define'd on __WIN32__ */
-#define O_BINARY 0
-#endif
-
-#include "image.h"
-
-extern int errno;
-
-#ifndef MAP_FAILED
-#define MAP_FAILED (-1)
-#endif
-
-char *cmdname;
-
-extern unsigned long crc32 (unsigned long crc, const char *buf, unsigned int len);
-
-typedef struct table_entry {
- int val; /* as defined in image.h */
- char *sname; /* short (input) name */
- char *lname; /* long (output) name */
-} table_entry_t;
-
-table_entry_t arch_name[] = {
- { IH_CPU_INVALID, NULL, "Invalid CPU", },
- { IH_CPU_ALPHA, "alpha", "Alpha", },
- { IH_CPU_ARM, "arm", "ARM", },
- { IH_CPU_I386, "x86", "Intel x86", },
- { IH_CPU_IA64, "ia64", "IA64", },
- { IH_CPU_M68K, "m68k", "MC68000", },
- { IH_CPU_MICROBLAZE, "microblaze", "MicroBlaze", },
- { IH_CPU_MIPS, "mips", "MIPS", },
- { IH_CPU_MIPS64, "mips64", "MIPS 64 Bit", },
- { IH_CPU_NIOS, "nios", "NIOS", },
- { IH_CPU_NIOS2, "nios2", "NIOS II", },
- { IH_CPU_PPC, "ppc", "PowerPC", },
- { IH_CPU_S390, "s390", "IBM S390", },
- { IH_CPU_SH, "sh", "SuperH", },
- { IH_CPU_SPARC, "sparc", "SPARC", },
- { IH_CPU_SPARC64, "sparc64", "SPARC 64 Bit", },
- { IH_CPU_BLACKFIN, "blackfin", "Blackfin", },
- { IH_CPU_AVR32, "avr32", "AVR32", },
- { -1, "", "", },
-};
-
-table_entry_t os_name[] = {
- { IH_OS_INVALID, NULL, "Invalid OS", },
- { IH_OS_4_4BSD, "4_4bsd", "4_4BSD", },
- { IH_OS_ARTOS, "artos", "ARTOS", },
- { IH_OS_DELL, "dell", "Dell", },
- { IH_OS_ESIX, "esix", "Esix", },
- { IH_OS_FREEBSD, "freebsd", "FreeBSD", },
- { IH_OS_IRIX, "irix", "Irix", },
- { IH_OS_LINUX, "linux", "Linux", },
- { IH_OS_LYNXOS, "lynxos", "LynxOS", },
- { IH_OS_NCR, "ncr", "NCR", },
- { IH_OS_NETBSD, "netbsd", "NetBSD", },
- { IH_OS_OPENBSD, "openbsd", "OpenBSD", },
- { IH_OS_PSOS, "psos", "pSOS", },
- { IH_OS_QNX, "qnx", "QNX", },
- { IH_OS_RTEMS, "rtems", "RTEMS", },
- { IH_OS_SCO, "sco", "SCO", },
- { IH_OS_SOLARIS, "solaris", "Solaris", },
- { IH_OS_SVR4, "svr4", "SVR4", },
- { IH_OS_U_BOOT, "u-boot", "U-Boot", },
- { IH_OS_VXWORKS, "vxworks", "VxWorks", },
- { -1, "", "", },
-};
-
-table_entry_t type_name[] = {
- { IH_TYPE_INVALID, NULL, "Invalid Image", },
- { IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image", },
- { IH_TYPE_FIRMWARE, "firmware", "Firmware", },
- { IH_TYPE_KERNEL, "kernel", "Kernel Image", },
- { IH_TYPE_MULTI, "multi", "Multi-File Image", },
- { IH_TYPE_RAMDISK, "ramdisk", "RAMDisk Image", },
- { IH_TYPE_SCRIPT, "script", "Script", },
- { IH_TYPE_STANDALONE, "standalone", "Standalone Program", },
- { IH_TYPE_FLATDT, "flat_dt", "Flat Device Tree", },
- { -1, "", "", },
-};
-
-table_entry_t comp_name[] = {
- { IH_COMP_NONE, "none", "uncompressed", },
- { IH_COMP_BZIP2, "bzip2", "bzip2 compressed", },
- { IH_COMP_GZIP, "gzip", "gzip compressed", },
- { IH_COMP_LZMA, "lzma", "lzma compressed", },
- { -1, "", "", },
-};
-
-static void copy_file (int, const char *, int);
-static void usage (void);
-static void print_header (image_header_t *);
-static void print_type (image_header_t *);
-static char *put_table_entry (table_entry_t *, char *, int);
-static char *put_arch (int);
-static char *put_type (int);
-static char *put_os (int);
-static char *put_comp (int);
-static int get_table_entry (table_entry_t *, char *, char *);
-static int get_arch(char *);
-static int get_comp(char *);
-static int get_os (char *);
-static int get_type(char *);
-
-
-char *datafile;
-char *imagefile;
-
-int dflag = 0;
-int eflag = 0;
-int lflag = 0;
-int vflag = 0;
-int xflag = 0;
-int opt_os = IH_OS_LINUX;
-int opt_arch = IH_CPU_PPC;
-int opt_type = IH_TYPE_KERNEL;
-int opt_comp = IH_COMP_GZIP;
-
-image_header_t header;
-image_header_t *hdr = &header;
-
-int
-main (int argc, char **argv)
-{
- int ifd;
- uint32_t checksum;
- uint32_t addr;
- uint32_t ep;
- struct stat sbuf;
- unsigned char *ptr;
- char *name = "";
-
- cmdname = *argv;
-
- addr = ep = 0;
-
- while (--argc > 0 && **++argv == '-') {
- while (*++*argv) {
- switch (**argv) {
- case 'l':
- lflag = 1;
- break;
- case 'A':
- if ((--argc <= 0) ||
- (opt_arch = get_arch(*++argv)) < 0)
- usage ();
- goto NXTARG;
- case 'C':
- if ((--argc <= 0) ||
- (opt_comp = get_comp(*++argv)) < 0)
- usage ();
- goto NXTARG;
- case 'O':
- if ((--argc <= 0) ||
- (opt_os = get_os(*++argv)) < 0)
- usage ();
- goto NXTARG;
- case 'T':
- if ((--argc <= 0) ||
- (opt_type = get_type(*++argv)) < 0)
- usage ();
- goto NXTARG;
-
- case 'a':
- if (--argc <= 0)
- usage ();
- addr = strtoul (*++argv, (char **)&ptr, 16);
- if (*ptr) {
- fprintf (stderr,
- "%s: invalid load address %s\n",
- cmdname, *argv);
- exit (EXIT_FAILURE);
- }
- goto NXTARG;
- case 'd':
- if (--argc <= 0)
- usage ();
- datafile = *++argv;
- dflag = 1;
- goto NXTARG;
- case 'e':
- if (--argc <= 0)
- usage ();
- ep = strtoul (*++argv, (char **)&ptr, 16);
- if (*ptr) {
- fprintf (stderr,
- "%s: invalid entry point %s\n",
- cmdname, *argv);
- exit (EXIT_FAILURE);
- }
- eflag = 1;
- goto NXTARG;
- case 'n':
- if (--argc <= 0)
- usage ();
- name = *++argv;
- goto NXTARG;
- case 'v':
- vflag++;
- break;
- case 'x':
- xflag++;
- break;
- default:
- usage ();
- }
- }
-NXTARG: ;
- }
-
- if ((argc != 1) || ((lflag ^ dflag) == 0))
- usage();
-
- if (!eflag) {
- ep = addr;
- /* If XIP, entry point must be after the U-Boot header */
- if (xflag)
- ep += sizeof(image_header_t);
- }
-
- /*
- * If XIP, ensure the entry point is equal to the load address plus
- * the size of the U-Boot header.
- */
- if (xflag) {
- if (ep != addr + sizeof(image_header_t)) {
- fprintf (stderr,
- "%s: For XIP, the entry point must be the load addr + %lu\n",
- cmdname,
- (unsigned long)sizeof(image_header_t));
- exit (EXIT_FAILURE);
- }
- }
-
- imagefile = *argv;
-
- if (lflag) {
- ifd = open(imagefile, O_RDONLY|O_BINARY);
- } else {
- ifd = open(imagefile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, 0666);
- }
-
- if (ifd < 0) {
- fprintf (stderr, "%s: Can't open %s: %s\n",
- cmdname, imagefile, strerror(errno));
- exit (EXIT_FAILURE);
- }
-
- if (lflag) {
- int len;
- char *data;
- /*
- * list header information of existing image
- */
- if (fstat(ifd, &sbuf) < 0) {
- fprintf (stderr, "%s: Can't stat %s: %s\n",
- cmdname, imagefile, strerror(errno));
- exit (EXIT_FAILURE);
- }
-
- if ((unsigned)sbuf.st_size < sizeof(image_header_t)) {
- fprintf (stderr,
- "%s: Bad size: \"%s\" is no valid image\n",
- cmdname, imagefile);
- exit (EXIT_FAILURE);
- }
-
- ptr = (unsigned char *)mmap(0, sbuf.st_size,
- PROT_READ, MAP_SHARED, ifd, 0);
- if ((caddr_t)ptr == (caddr_t)-1) {
- fprintf (stderr, "%s: Can't read %s: %s\n",
- cmdname, imagefile, strerror(errno));
- exit (EXIT_FAILURE);
- }
-
- /*
- * create copy of header so that we can blank out the
- * checksum field for checking - this can't be done
- * on the PROT_READ mapped data.
- */
- memcpy (hdr, ptr, sizeof(image_header_t));
-
- if (ntohl(hdr->ih_magic) != IH_MAGIC) {
- fprintf (stderr,
- "%s: Bad Magic Number: \"%s\" is no valid image\n",
- cmdname, imagefile);
- exit (EXIT_FAILURE);
- }
-
- data = (char *)hdr;
- len = sizeof(image_header_t);
-
- checksum = ntohl(hdr->ih_hcrc);
- hdr->ih_hcrc = htonl(0); /* clear for re-calculation */
-
- if (crc32 (0, data, len) != checksum) {
- fprintf (stderr,
- "%s: ERROR: \"%s\" has bad header checksum!\n",
- cmdname, imagefile);
- exit (EXIT_FAILURE);
- }
-
- data = (char *)(ptr + sizeof(image_header_t));
- len = sbuf.st_size - sizeof(image_header_t) ;
-
- if (crc32 (0, data, len) != ntohl(hdr->ih_dcrc)) {
- fprintf (stderr,
- "%s: ERROR: \"%s\" has corrupted data!\n",
- cmdname, imagefile);
- exit (EXIT_FAILURE);
- }
-
- /* for multi-file images we need the data part, too */
- print_header ((image_header_t *)ptr);
-
- (void) munmap((void *)ptr, sbuf.st_size);
- (void) close (ifd);
-
- exit (EXIT_SUCCESS);
- }
-
- /*
- * Must be -w then:
- *
- * write dummy header, to be fixed later
- */
- memset (hdr, 0, sizeof(image_header_t));
-
- if (write(ifd, hdr, sizeof(image_header_t)) != sizeof(image_header_t)) {
- fprintf (stderr, "%s: Write error on %s: %s\n",
- cmdname, imagefile, strerror(errno));
- exit (EXIT_FAILURE);
- }
-
- if (opt_type == IH_TYPE_MULTI || opt_type == IH_TYPE_SCRIPT) {
- char *file = datafile;
- uint32_t size;
-
- for (;;) {
- char *sep = NULL;
-
- if (file) {
- if ((sep = strchr(file, ':')) != NULL) {
- *sep = '\0';
- }
-
- if (stat (file, &sbuf) < 0) {
- fprintf (stderr, "%s: Can't stat %s: %s\n",
- cmdname, file, strerror(errno));
- exit (EXIT_FAILURE);
- }
- size = htonl(sbuf.st_size);
- } else {
- size = 0;
- }
-
- if (write(ifd, (char *)&size, sizeof(size)) != sizeof(size)) {
- fprintf (stderr, "%s: Write error on %s: %s\n",
- cmdname, imagefile, strerror(errno));
- exit (EXIT_FAILURE);
- }
-
- if (!file) {
- break;
- }
-
- if (sep) {
- *sep = ':';
- file = sep + 1;
- } else {
- file = NULL;
- }
- }
-
- file = datafile;
-
- for (;;) {
- char *sep = strchr(file, ':');
- if (sep) {
- *sep = '\0';
- copy_file (ifd, file, 1);
- *sep++ = ':';
- file = sep;
- } else {
- copy_file (ifd, file, 0);
- break;
- }
- }
- } else {
- copy_file (ifd, datafile, 0);
- }
-
- /* We're a bit of paranoid */
-#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__)
- (void) fdatasync (ifd);
-#else
- (void) fsync (ifd);
-#endif
-
- if (fstat(ifd, &sbuf) < 0) {
- fprintf (stderr, "%s: Can't stat %s: %s\n",
- cmdname, imagefile, strerror(errno));
- exit (EXIT_FAILURE);
- }
-
- ptr = (unsigned char *)mmap(0, sbuf.st_size,
- PROT_READ|PROT_WRITE, MAP_SHARED, ifd, 0);
- if (ptr == (unsigned char *)MAP_FAILED) {
- fprintf (stderr, "%s: Can't map %s: %s\n",
- cmdname, imagefile, strerror(errno));
- exit (EXIT_FAILURE);
- }
-
- hdr = (image_header_t *)ptr;
-
- checksum = crc32 (0,
- (const char *)(ptr + sizeof(image_header_t)),
- sbuf.st_size - sizeof(image_header_t)
- );
-
- /* Build new header */
- hdr->ih_magic = htonl(IH_MAGIC);
- hdr->ih_time = htonl(sbuf.st_mtime);
- hdr->ih_size = htonl(sbuf.st_size - sizeof(image_header_t));
- hdr->ih_load = htonl(addr);
- hdr->ih_ep = htonl(ep);
- hdr->ih_dcrc = htonl(checksum);
- hdr->ih_os = opt_os;
- hdr->ih_arch = opt_arch;
- hdr->ih_type = opt_type;
- hdr->ih_comp = opt_comp;
-
- strncpy((char *)hdr->ih_name, name, IH_NMLEN);
-
- checksum = crc32(0,(const char *)hdr,sizeof(image_header_t));
-
- hdr->ih_hcrc = htonl(checksum);
-
- print_header (hdr);
-
- (void) munmap((void *)ptr, sbuf.st_size);
-
- /* We're a bit of paranoid */
-#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__)
- (void) fdatasync (ifd);
-#else
- (void) fsync (ifd);
-#endif
-
- if (close(ifd)) {
- fprintf (stderr, "%s: Write error on %s: %s\n",
- cmdname, imagefile, strerror(errno));
- exit (EXIT_FAILURE);
- }
-
- exit (EXIT_SUCCESS);
-}
-
-static void
-copy_file (int ifd, const char *datafile, int pad)
-{
- int dfd;
- struct stat sbuf;
- unsigned char *ptr;
- int tail;
- int zero = 0;
- int offset = 0;
- int size;
-
- if (vflag) {
- fprintf (stderr, "Adding Image %s\n", datafile);
- }
-
- if ((dfd = open(datafile, O_RDONLY|O_BINARY)) < 0) {
- fprintf (stderr, "%s: Can't open %s: %s\n",
- cmdname, datafile, strerror(errno));
- exit (EXIT_FAILURE);
- }
-
- if (fstat(dfd, &sbuf) < 0) {
- fprintf (stderr, "%s: Can't stat %s: %s\n",
- cmdname, datafile, strerror(errno));
- exit (EXIT_FAILURE);
- }
-
- ptr = (unsigned char *)mmap(0, sbuf.st_size,
- PROT_READ, MAP_SHARED, dfd, 0);
- if (ptr == (unsigned char *)MAP_FAILED) {
- fprintf (stderr, "%s: Can't read %s: %s\n",
- cmdname, datafile, strerror(errno));
- exit (EXIT_FAILURE);
- }
-
- if (xflag) {
- unsigned char *p = NULL;
- /*
- * XIP: do not append the image_header_t at the
- * beginning of the file, but consume the space
- * reserved for it.
- */
-
- if ((unsigned)sbuf.st_size < sizeof(image_header_t)) {
- fprintf (stderr,
- "%s: Bad size: \"%s\" is too small for XIP\n",
- cmdname, datafile);
- exit (EXIT_FAILURE);
- }
-
- for (p=ptr; p < ptr+sizeof(image_header_t); p++) {
- if ( *p != 0xff ) {
- fprintf (stderr,
- "%s: Bad file: \"%s\" has invalid buffer for XIP\n",
- cmdname, datafile);
- exit (EXIT_FAILURE);
- }
- }
-
- offset = sizeof(image_header_t);
- }
-
- size = sbuf.st_size - offset;
- if (write(ifd, ptr + offset, size) != size) {
- fprintf (stderr, "%s: Write error on %s: %s\n",
- cmdname, imagefile, strerror(errno));
- exit (EXIT_FAILURE);
- }
-
- if (pad && ((tail = size % 4) != 0)) {
-
- if (write(ifd, (char *)&zero, 4-tail) != 4-tail) {
- fprintf (stderr, "%s: Write error on %s: %s\n",
- cmdname, imagefile, strerror(errno));
- exit (EXIT_FAILURE);
- }
- }
-
- (void) munmap((void *)ptr, sbuf.st_size);
- (void) close (dfd);
-}
-
-void
-usage ()
-{
- fprintf (stderr, "Usage: %s -l image\n"
- " -l ==> list image header information\n"
- " %s [-x] -A arch -O os -T type -C comp "
- "-a addr -e ep -n name -d data_file[:data_file...] image\n",
- cmdname, cmdname);
- fprintf (stderr, " -A ==> set architecture to 'arch'\n"
- " -O ==> set operating system to 'os'\n"
- " -T ==> set image type to 'type'\n"
- " -C ==> set compression type 'comp'\n"
- " -a ==> set load address to 'addr' (hex)\n"
- " -e ==> set entry point to 'ep' (hex)\n"
- " -n ==> set image name to 'name'\n"
- " -d ==> use image data from 'datafile'\n"
- " -x ==> set XIP (execute in place)\n"
- );
- exit (EXIT_FAILURE);
-}
-
-static void
-print_header (image_header_t *hdr)
-{
- time_t timestamp;
- uint32_t size;
-
- timestamp = (time_t)ntohl(hdr->ih_time);
- size = ntohl(hdr->ih_size);
-
- printf ("Image Name: %.*s\n", IH_NMLEN, hdr->ih_name);
- printf ("Created: %s", ctime(×tamp));
- printf ("Image Type: "); print_type(hdr);
- printf ("Data Size: %d Bytes = %.2f kB = %.2f MB\n",
- size, (double)size / 1.024e3, (double)size / 1.048576e6 );
- printf ("Load Address: 0x%08X\n", ntohl(hdr->ih_load));
- printf ("Entry Point: 0x%08X\n", ntohl(hdr->ih_ep));
-
- if (hdr->ih_type == IH_TYPE_MULTI || hdr->ih_type == IH_TYPE_SCRIPT) {
- int i, ptrs;
- uint32_t pos;
- uint32_t *len_ptr = (uint32_t *) (
- (unsigned long)hdr + sizeof(image_header_t)
- );
-
- /* determine number of images first (to calculate image offsets) */
- for (i=0; len_ptr[i]; ++i) /* null pointer terminates list */
- ;
- ptrs = i; /* null pointer terminates list */
-
- pos = sizeof(image_header_t) + ptrs * sizeof(long);
- printf ("Contents:\n");
- for (i=0; len_ptr[i]; ++i) {
- size = ntohl(len_ptr[i]);
-
- printf (" Image %d: %8d Bytes = %4d kB = %d MB\n",
- i, size, size>>10, size>>20);
- if (hdr->ih_type == IH_TYPE_SCRIPT && i > 0) {
- /*
- * the user may need to know offsets
- * if planning to do something with
- * multiple files
- */
- printf (" Offset = %08X\n", pos);
- }
- /* copy_file() will pad the first files to even word align */
- size += 3;
- size &= ~3;
- pos += size;
- }
- }
-}
-
-
-static void
-print_type (image_header_t *hdr)
-{
- printf ("%s %s %s (%s)\n",
- put_arch (hdr->ih_arch),
- put_os (hdr->ih_os ),
- put_type (hdr->ih_type),
- put_comp (hdr->ih_comp)
- );
-}
-
-static char *put_arch (int arch)
-{
- return (put_table_entry(arch_name, "Unknown Architecture", arch));
-}
-
-static char *put_os (int os)
-{
- return (put_table_entry(os_name, "Unknown OS", os));
-}
-
-static char *put_type (int type)
-{
- return (put_table_entry(type_name, "Unknown Image", type));
-}
-
-static char *put_comp (int comp)
-{
- return (put_table_entry(comp_name, "Unknown Compression", comp));
-}
-
-static char *put_table_entry (table_entry_t *table, char *msg, int type)
-{
- for (; table->val>=0; ++table) {
- if (table->val == type)
- return (table->lname);
- }
- return (msg);
-}
-
-static int get_arch(char *name)
-{
- return (get_table_entry(arch_name, "CPU", name));
-}
-
-
-static int get_comp(char *name)
-{
- return (get_table_entry(comp_name, "Compression", name));
-}
-
-
-static int get_os (char *name)
-{
- return (get_table_entry(os_name, "OS", name));
-}
-
-
-static int get_type(char *name)
-{
- return (get_table_entry(type_name, "Image", name));
-}
-
-static int get_table_entry (table_entry_t *table, char *msg, char *name)
-{
- table_entry_t *t;
- int first = 1;
-
- for (t=table; t->val>=0; ++t) {
- if (t->sname && strcasecmp(t->sname, name)==0)
- return (t->val);
- }
- fprintf (stderr, "\nInvalid %s Type - valid names are", msg);
- for (t=table; t->val>=0; ++t) {
- if (t->sname == NULL)
- continue;
- fprintf (stderr, "%c %s", (first) ? ':' : ',', t->sname);
- first = 0;
- }
- fprintf (stderr, "\n");
- return (-1);
-}
diff --git a/work/u-boot-2011.09.tools1.patch b/work/u-boot-2011.09.tools1.patch
new file mode 100644
index 0000000..9ceaee0
--- /dev/null
+++ b/work/u-boot-2011.09.tools1.patch
@@ -0,0 +1,86 @@
+From: Loïc Minier <loic.minier@linaro.org>
+Date: Mon, 3 Oct 2011 09:57:10 +0000 (+0200)
+Subject: Build timestamp_autogenerated.h without config
+X-Git-Url: http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff_plain;h=249b53a6129bc24d26e52718a8a7b42751f11033
+
+Build timestamp_autogenerated.h without config
+
+Tools such as mkimage include version information but are
+config-agnostic; build timestamp_autogenerated.h even when config.mk
+isn't generated to fix "make tools" build failure:
+gcc [...] -o mkimage.o mkimage.c -c
+In file included from include/version.h:27:0, from mkimage.c:26:
+include/timestamp.h:27:37: fatal error: timestamp_autogenerated.h: No
+such file or directory
+
+Cc: patches@linaro.org
+Signed-off-by: Loïc Minier <loic.minier@linaro.org>
+Acked-by: Mike Frysinger <vapier@gentoo.org>
+---
+
+diff --git a/Makefile b/Makefile
+index cd6fc8c..1a9a4db 100644
+--- a/Makefile
++++ b/Makefile
+@@ -141,7 +141,7 @@ SUBDIRS = tools \
+ examples/standalone \
+ examples/api
+
+-.PHONY : $(SUBDIRS) $(VERSION_FILE)
++.PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE)
+
+ ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
+
+@@ -296,7 +296,7 @@ LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
+ endif
+
+ LIBS := $(addprefix $(obj),$(sort $(LIBS)))
+-.PHONY : $(LIBS) $(TIMESTAMP_FILE)
++.PHONY : $(LIBS)
+
+ LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
+ LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
+@@ -455,10 +455,6 @@ $(obj)mmc_spl/u-boot-mmc-spl.bin: mmc_spl
+ $(obj)spl/u-boot-spl.bin: depend
+ $(MAKE) -C spl all
+
+-$(TIMESTAMP_FILE):
+- @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
+- @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
+-
+ updater:
+ $(MAKE) -C tools/updater all
+
+@@ -549,12 +545,12 @@ $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s: $(obj)include/autoconf.mk.dep
+ else # !config.mk
+ all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
+ $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \
+-$(filter-out tools,$(SUBDIRS)) $(TIMESTAMP_FILE) \
++$(filter-out tools,$(SUBDIRS)) \
+ updater depend dep tags ctags etags cscope $(obj)System.map:
+ @echo "System not configured - see README" >&2
+ @ exit 1
+
+-tools: $(VERSION_FILE)
++tools: $(VERSION_FILE) $(TIMESTAMP_FILE)
+ $(MAKE) -C $@ all
+ endif # config.mk
+
+@@ -572,11 +568,16 @@ $(VERSION_FILE):
+ '$(shell $(LD) -v | head -n 1)' )>> $@.tmp
+ @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
+
++$(TIMESTAMP_FILE):
++ @mkdir -p $(dir $(TIMESTAMP_FILE))
++ @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
++ @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
++
+ easylogo env gdb:
+ $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION}
+ gdbtools: gdb
+
+-tools-all: easylogo env gdb $(VERSION_FILE)
++tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE)
+ $(MAKE) -C tools HOST_TOOLS_ALL=y
+
+ .PHONY : CHANGELOG
diff --git a/work/u-boot-2011.09.tools2.patch b/work/u-boot-2011.09.tools2.patch
new file mode 100644
index 0000000..422a12c
--- /dev/null
+++ b/work/u-boot-2011.09.tools2.patch
@@ -0,0 +1,30 @@
+From: Loïc Minier <loic.minier@linaro.org>
+Date: Mon, 3 Oct 2011 09:57:11 +0000 (+0200)
+Subject: Safer timestamp_autogenerated.h generation
+X-Git-Url: http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff_plain;h=a76406fb05f68bcf0156f456f8ba17ef076cebab
+
+Safer timestamp_autogenerated.h generation
+
+Generate timestamp_autogenerated.h as safely as version_autogenerated.h.
+
+Cc: patches@linaro.org
+Signed-off-by: Loïc Minier <loic.minier@linaro.org>
+Acked-by: Mike Frysinger <vapier@gentoo.org>
+---
+
+diff --git a/Makefile b/Makefile
+index 1a9a4db..5db2e0e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -570,8 +570,9 @@ $(VERSION_FILE):
+
+ $(TIMESTAMP_FILE):
+ @mkdir -p $(dir $(TIMESTAMP_FILE))
+- @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
+- @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
++ @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@.tmp
++ @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@.tmp
++ @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
+
+ easylogo env gdb:
+ $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION}
diff --git a/work/u-boot-2011.09.tools3.patch b/work/u-boot-2011.09.tools3.patch
new file mode 100644
index 0000000..da66f33
--- /dev/null
+++ b/work/u-boot-2011.09.tools3.patch
@@ -0,0 +1,57 @@
+From: Loïc Minier <loic.minier@linaro.org>
+Date: Mon, 3 Oct 2011 09:57:12 +0000 (+0200)
+Subject: ublimage: NAND block size isn't set at build-time
+X-Git-Url: http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff_plain;h=9f8765805400db65b44c3edb68a638f17dd8399d
+
+ublimage: NAND block size isn't set at build-time
+
+mkimage's ublimage support can't depend of build-time board configs;
+instead, this should be set in ublimage.cfg. Since currently no configs
+in u-boot override the NAND block size, hardcode it as such in
+ublimage.h to fix a build failure with "make tools":
+gcc [...] -o ublimage.o ublimage.c -c
+In file included from ublimage.c:37:0:
+ublimage.h:31:20: fatal error: config.h: No such file or directory
+
+Cc: Heiko Schocher <hs@denx.de>
+Cc: patches@linaro.org
+Signed-off-by: Loïc Minier <loic.minier@linaro.org>
+Acked-by: Heiko Schocher <hs@denx.de>
+---
+
+diff --git a/tools/ublimage.h b/tools/ublimage.h
+index c926689..93ec8ee 100644
+--- a/tools/ublimage.h
++++ b/tools/ublimage.h
+@@ -28,12 +28,6 @@
+ #ifndef _UBLIMAGE_H_
+ #define _UBLIMAGE_H_
+
+-#include <config.h>
+-
+-#if !defined(CONFIG_SYS_UBL_BLOCK)
+-#define CONFIG_SYS_UBL_BLOCK 512
+-#endif
+-
+ enum ublimage_cmd {
+ CMD_INVALID,
+ CMD_BOOT_MODE,
+@@ -71,6 +65,9 @@ enum ublimage_fld_types {
+ /* Define max UBL image size */
+ #define UBL_IMAGE_SIZE (0x00003800u)
+
++/* one NAND block */
++#define UBL_BLOCK_SIZE 512
++
+ /* from sprufg5a.pdf Table 109 */
+ struct ubl_header {
+ uint32_t magic; /* Magic Number, see UBL_* defines */
+@@ -97,7 +94,7 @@ struct ubl_header {
+ * Magic Number indicates fast EMIF boot).
+ */
+ /* to fit in one nand block */
+- unsigned char res[CONFIG_SYS_UBL_BLOCK - 8 * 4];
++ unsigned char res[UBL_BLOCK_SIZE - 8 * 4];
+ };
+
+ #endif /* _UBLIMAGE_H_ */