mkimage: update to 2013.07-rc1

also remove 100-dtc-binary.patch which was not accepted upstream

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

SVN-Revision: 37361
This commit is contained in:
Luka Perkov
2013-07-15 23:18:36 +00:00
parent d530ad0732
commit 620739e0be
7 changed files with 13 additions and 99 deletions

View File

@@ -1,6 +1,6 @@
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -37,6 +37,7 @@ struct mkimage_params params = {
@@ -37,6 +37,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 @@ main (int argc, char **argv)
@@ -189,6 +190,16 @@
genimg_get_comp_id (*++argv)) < 0)
usage ();
goto NXTARG;
@@ -25,7 +25,7 @@
case 'D':
if (--argc <= 0)
usage ();
@@ -613,12 +624,13 @@ usage ()
@@ -613,12 +624,13 @@
fprintf (stderr, "Usage: %s -l image\n"
" -l ==> list image header information\n",
params.cmdname);
@@ -42,7 +42,7 @@
" -n ==> set image name to 'name'\n"
--- a/tools/mkimage.h
+++ b/tools/mkimage.h
@@ -65,6 +65,7 @@ struct mkimage_params {
@@ -79,6 +79,7 @@
int arch;
int type;
int comp;
@@ -52,7 +52,7 @@
unsigned int ep;
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -111,7 +111,7 @@ static void image_set_header(void *ptr,
@@ -111,7 +111,7 @@
sbuf->st_size - sizeof(image_header_t));
/* Build new header */