Changeset 31171


Ignore:
Timestamp:
2012-04-02T18:25:23+02:00 (6 years ago)
Author:
florian
Message:

[tools] mkimage: update to 2011.12

Signed-off-by: Luka Perkov <openwrt@…>

Location:
trunk/tools/mkimage
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/mkimage/Makefile

    r27336 r31171  
    11# 
    2 # Copyright (C) 2006-2011 OpenWrt.org 
     2# Copyright (C) 2006-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    88 
    99PKG_NAME:=mkimage 
    10 PKG_VERSION:=2011.06 
     10PKG_VERSION:=2011.12 
    1111 
    1212PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2 
    1313PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot 
    14 PKG_MD5SUM:=0cc5026aad02f218a9b9ac56b301c97a 
     14PKG_MD5SUM:=7f29b9f6da44d6e46e988e7561fd1d5f 
    1515PKG_CAT:=bzcat 
    1616 
  • trunk/tools/mkimage/patches/030-allow-to-use-different-magic.patch

    r29442 r31171  
    99        .imagename = "", 
    1010 }; 
    11 @@ -180,6 +181,16 @@ main (int argc, char **argv) 
     11@@ -186,6 +187,16 @@ main (int argc, char **argv) 
    1212                                        genimg_get_comp_id (*++argv)) < 0) 
    1313                                        usage (); 
     
    2626                                if (--argc <= 0) 
    2727                                        usage (); 
    28 @@ -580,12 +591,13 @@ usage () 
     28@@ -595,12 +606,13 @@ usage () 
    2929        fprintf (stderr, "Usage: %s -l image\n" 
    3030                         "          -l ==> list image header information\n", 
     
    4343--- a/tools/mkimage.h 
    4444+++ b/tools/mkimage.h 
    45 @@ -64,6 +64,7 @@ struct mkimage_params { 
     45@@ -65,6 +65,7 @@ struct mkimage_params { 
    4646        int arch; 
    4747        int type; 
     
    5353--- a/tools/default_image.c 
    5454+++ b/tools/default_image.c 
    55 @@ -110,7 +110,7 @@ static void image_set_header (void *ptr, 
     55@@ -111,7 +111,7 @@ static void image_set_header(void *ptr, 
    5656                        sbuf->st_size - sizeof(image_header_t)); 
    5757  
    5858        /* Build new header */ 
    59 -       image_set_magic (hdr, IH_MAGIC); 
    60 +       image_set_magic (hdr, params->magic); 
    61         image_set_time (hdr, sbuf->st_mtime); 
    62         image_set_size (hdr, sbuf->st_size - sizeof(image_header_t)); 
    63         image_set_load (hdr, params->addr); 
     59-       image_set_magic(hdr, IH_MAGIC); 
     60+       image_set_magic(hdr, params->magic); 
     61        image_set_time(hdr, sbuf->st_mtime); 
     62        image_set_size(hdr, sbuf->st_size - sizeof(image_header_t)); 
     63        image_set_load(hdr, params->addr); 
Note: See TracChangeset for help on using the changeset viewer.