projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mkimage: upgrade to version 2013.01.01
[openwrt/openwrt.git]
/
tools
/
mkimage
/
patches
/
030-allow-to-use-different-magic.patch
diff --git
a/tools/mkimage/patches/030-allow-to-use-different-magic.patch
b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
index 23f39ad22ca340b25484b4729247bd7c0da8a94d..305b8342b3d0401465bf5053bca3e9cc9f6b3dc8 100644
(file)
--- a/
tools/mkimage/patches/030-allow-to-use-different-magic.patch
+++ b/
tools/mkimage/patches/030-allow-to-use-different-magic.patch
@@
-1,14
+1,14
@@
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
--- 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,
+ .magic = IH_MAGIC,
.dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
.imagename = "",
.arch = IH_ARCH_PPC,
.type = IH_TYPE_KERNEL,
.comp = IH_COMP_GZIP,
+ .magic = IH_MAGIC,
.dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
.imagename = "",
- };
-@@ -18
6,6 +187,16 @@ main (int argc, char **argv)
+ .imagename2 = "",
+@@ -18
9,6 +190,16 @@
genimg_get_comp_id (*++argv)) < 0)
usage ();
goto NXTARG;
genimg_get_comp_id (*++argv)) < 0)
usage ();
goto NXTARG;
@@
-25,7
+25,7
@@
case 'D':
if (--argc <= 0)
usage ();
case 'D':
if (--argc <= 0)
usage ();
-@@ -
596,12 +607,13 @@ usage ()
+@@ -
613,12 +624,13 @@
fprintf (stderr, "Usage: %s -l image\n"
" -l ==> list image header information\n",
params.cmdname);
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
" -n ==> set image name to 'name'\n"
--- a/tools/mkimage.h
+++ b/tools/mkimage.h
-@@ -65,6 +65,7 @@
struct mkimage_params {
+@@ -65,6 +65,7 @@
int arch;
int type;
int comp;
int arch;
int type;
int comp;
@@
-52,7
+52,7
@@
unsigned int ep;
--- a/tools/default_image.c
+++ b/tools/default_image.c
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 */
sbuf->st_size - sizeof(image_header_t));
/* Build new header */