summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2008-05-17 15:51:49 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2008-05-17 15:51:49 +0000
commit7f67b0aa32893a58e8ba99daf6c9c25e48f18da2 (patch)
treea2ef1b894aeb04af7c815e17cc83befa8ecc9f1e
parent2e1e2190255b0bb74707285e11472747fda64853 (diff)
downloadrockbox-7f67b0aa32893a58e8ba99daf6c9c25e48f18da2.tar.gz
rockbox-7f67b0aa32893a58e8ba99daf6c9c25e48f18da2.tar.bz2
rockbox-7f67b0aa32893a58e8ba99daf6c9c25e48f18da2.zip
Try making binsize smaller and fix pointer problem
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17556 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/Makefile2
-rw-r--r--tools/creative.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/Makefile b/apps/Makefile
index 7fb704634d..88d3155b2d 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -147,7 +147,7 @@ $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) $(VOICE) $(
$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox $(LINKVOICE) $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map
$(OBJDIR)/rockbox.bin : $(OBJDIR)/rockbox.elf
- $(call PRINTS,OBJCOPY $(@F))$(if $(filter yes, $(USE_ELF)), cp $< $@, $(OC) -O binary $< $@)
+ $(call PRINTS,OBJCOPY $(@F))$(OC) $(if $(filter yes, $(USE_ELF)), -S -x, -O binary) $< $@
$(OBJDIR)/rombox.bin : $(OBJDIR)/rombox.elf
$(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@
diff --git a/tools/creative.c b/tools/creative.c
index 566904f78c..faa95650a4 100644
--- a/tools/creative.c
+++ b/tools/creative.c
@@ -84,7 +84,7 @@ static int elf_convert(const unsigned char *inbuf, unsigned char *outbuf)
Elf32_Ehdr *main_header;
Elf32_Shdr *section_header;
unsigned int i, j, sum;
- int startaddr;
+ intptr_t startaddr;
main_header = (Elf32_Ehdr*)inbuf;
if( !( main_header->e_ident[0] == ELFMAG0 && main_header->e_ident[1] == ELFMAG1
@@ -123,7 +123,7 @@ static int elf_convert(const unsigned char *inbuf, unsigned char *outbuf)
outbuf += section_header->sh_size;
}
}
- return (intptr_t)(outbuf - startaddr);
+ return (int)((intptr_t)outbuf - startaddr);
}
static int make_jrm_file(const unsigned char *inbuf, unsigned char *outbuf)