aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/etrax/image/mkfimage
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2008-05-03 15:51:16 +0000
committerJohn Crispin <john@openwrt.org>2008-05-03 15:51:16 +0000
commit4e7ea16048bde2f02e566c0bd0db70b69d0271fd (patch)
tree89cff521850b1fb697074c73a281717811a6eba6 /target/linux/etrax/image/mkfimage
parent6720686d55dd6f13cf527c087f67ee27cb74592a (diff)
downloadupstream-4e7ea16048bde2f02e566c0bd0db70b69d0271fd.tar.gz
upstream-4e7ea16048bde2f02e566c0bd0db70b69d0271fd.tar.bz2
upstream-4e7ea16048bde2f02e566c0bd0db70b69d0271fd.zip
bump etrax to .25
SVN-Revision: 11028
Diffstat (limited to 'target/linux/etrax/image/mkfimage')
-rw-r--r--target/linux/etrax/image/mkfimage/Makefile2
-rw-r--r--target/linux/etrax/image/mkfimage/src/mkfimage.c20
2 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/etrax/image/mkfimage/Makefile b/target/linux/etrax/image/mkfimage/Makefile
index e907e73aca..f97d098d9b 100644
--- a/target/linux/etrax/image/mkfimage/Makefile
+++ b/target/linux/etrax/image/mkfimage/Makefile
@@ -24,7 +24,7 @@ define Build/Compile
endef
define Build/InstallDev
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/mkfimage $(STAGING_DIR)/bin/mkfimage
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mkfimage $(STAGING_DIR_HOST)/bin/mkfimage
endef
$(eval $(call Build/DefaultTargets))
diff --git a/target/linux/etrax/image/mkfimage/src/mkfimage.c b/target/linux/etrax/image/mkfimage/src/mkfimage.c
index 51b8192de9..6904170cfe 100644
--- a/target/linux/etrax/image/mkfimage/src/mkfimage.c
+++ b/target/linux/etrax/image/mkfimage/src/mkfimage.c
@@ -17,49 +17,49 @@ int main(int argc, char **argv){
printf("%s in out\n", argv[0]);
return 1;
}
-
+
printf("Generating image\n");
-
+
FILE *vmlinux = fopen(argv[1], "r");
FILE *vmlinux_out = fopen(argv[2], "w");
if((!vmlinux) || (!vmlinux_out)){
printf("Error opening a file\n");
return 1;
}
-
+
stat(argv[1], &s);
size_vmlinux = s.st_size;
real_size_vmlinux = (size_vmlinux & 0xffff0000) + 0x10000;
printf("vmlinux = 0x%.08X / 0x%.08X\n", size_vmlinux, real_size_vmlinux);
-
+
unsigned int t = fread(buffer, 1, 64 * 1024, vmlinux);
for(loop = 0; loop < (64 * 1024) - sizeof(magic_str); loop++){
if(buffer[loop] == magic_str[0]){
if((magic = strstr(&buffer[loop], magic_str))){
- printf("Magic at 0x%.08X %p %p\n", magic - buffer, magic, buffer);
+ printf("Magic at 0x%.08X %p %p\n", magic - buffer, magic, buffer);
printf("Found Magic %X%X%X%X\n",
buffer[loop + strlen(magic_str)],
buffer[loop + strlen(magic_str) + 2],
buffer[loop + strlen(magic_str) + 1],
buffer[loop + strlen(magic_str) + 3]);
-
+
buffer[loop + strlen(magic_str)] = real_size_vmlinux >> 24;
buffer[loop + strlen(magic_str) + 2] = (real_size_vmlinux >> 16) & 0xff;
buffer[loop + strlen(magic_str) + 1] = (real_size_vmlinux >> 8) & 0xff;
buffer[loop + strlen(magic_str) + 3] = (real_size_vmlinux) & 0xff;
-
+
printf("Replaced with %.02X%.02X%.02X%.02X\n",
buffer[loop + strlen(magic_str)],
buffer[loop + strlen(magic_str) + 2],
buffer[loop + strlen(magic_str) + 1],
buffer[loop + strlen(magic_str) + 3]);
-
+
}
}
}
-
- fwrite(buffer, 1, 64 * 1024, vmlinux_out);
+
+ fwrite(buffer, 1, 64 * 1024, vmlinux_out);
real_size_vmlinux -= 64 * 1024;
do {
real_size_vmlinux -= 64 * 1024;