domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mkimage: update to 2014.04

Browse Source 
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 40807
This commit is contained in:
Luka Perkov
2014-05-21 09:42:33 +00:00
parent b10140d832
commit 5342a1a2ea
8 changed files with 35 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/mkimage/patches/030-allow-to-use-different-magic.patch
View File

@@ -1,6 +1,6 @@
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -37,6 +37,7 @@
@@ -24,6 +24,7 @@
.arch = IH_ARCH_PPC,
.type = IH_TYPE_KERNEL,
.comp = IH_COMP_GZIP,
@@ -8,7 +8,7 @@
.dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
.imagename = "",
.imagename2 = "",
@@ -189,6 +190,16 @@
@@ -168,6 +169,16 @@
genimg_get_comp_id (*++argv)) < 0)
usage ();
goto NXTARG;
@@ -25,7 +25,7 @@
case 'D':
if (--argc <= 0)
usage ();
@@ -613,12 +624,13 @@
@@ -623,12 +634,13 @@
fprintf (stderr, "Usage: %s -l image\n"
" -l ==> list image header information\n",
params.cmdname);
@@ -40,19 +40,9 @@
" -a ==> set load address to 'addr' (hex)\n"
" -e ==> set entry point to 'ep' (hex)\n"
" -n ==> set image name to 'name'\n"
--- a/tools/mkimage.h
+++ b/tools/mkimage.h
@@ -79,6 +79,7 @@
int arch;
int type;
int comp;
+ unsigned int magic;
char *dtc;
unsigned int addr;
unsigned int ep;
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -111,7 +111,7 @@
@@ -98,7 +98,7 @@
sbuf->st_size - sizeof(image_header_t));
/* Build new header */
@@ -61,3 +51,13 @@
image_set_time(hdr, sbuf->st_mtime);
image_set_size(hdr, sbuf->st_size - sizeof(image_header_t));
image_set_load(hdr, params->addr);
--- a/tools/imagetool.h
+++ b/tools/imagetool.h
@@ -44,6 +44,7 @@
int arch;
int type;
int comp;
+ unsigned int magic;
char *dtc;
unsigned int addr;
unsigned int ep;