diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2003-02-26 16:05:30 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2003-02-26 16:05:30 +0000 |
| commit | b0c6276b40a53c5ca96474c6f76fa566d81cf1c6 (patch) | |
| tree | db1529688f3e3939bc0c10e4ce9e46c35f65aa42 | |
| parent | a0086b61e142ec2847d90b0ba6643a106d81f3f4 (diff) | |
| download | rockbox-b0c6276b40a53c5ca96474c6f76fa566d81cf1c6.zip rockbox-b0c6276b40a53c5ca96474c6f76fa566d81cf1c6.tar.gz rockbox-b0c6276b40a53c5ca96474c6f76fa566d81cf1c6.tar.bz2 rockbox-b0c6276b40a53c5ca96474c6f76fa566d81cf1c6.tar.xz | |
Moved to one single .lds file for ALL builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3347 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/Makefile | 7 | ||||
| -rw-r--r-- | firmware/app.lds | 17 |
2 files changed, 19 insertions, 5 deletions
diff --git a/apps/Makefile b/apps/Makefile index 9c2b961..dfd1ae2 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -31,12 +31,11 @@ ifndef MEM MEM=2 endif +LDS := $(FIRMWARE)/app.lds + ifdef DEBUG DEFINES := -DDEBUG CFLAGS += -g - LDS := $(FIRMWARE)/gdb.lds -else - LDS := $(FIRMWARE)/app.lds endif SRC := $(wildcard *.c) @@ -76,7 +75,7 @@ $(OBJDIR)/librockbox.a: # MEM should be passed on to this makefile with the chosen memory size given # in number of MB $(LINKFILE): $(LDS) - cat $< | $(CC) -DMEMORYSIZE=$(MEM) -E -P - >$@ + cat $< | $(CC) -DMEMORYSIZE=$(MEM) $(DEFINES) -E -P - >$@ $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(OBJDIR)/librockbox.a $(CC) -Os -nostdlib -o $(OBJDIR)/rockbox.elf $(OBJS) -L$(OBJDIR) -lrockbox -lgcc -L$(FIRMWARE) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map diff --git a/firmware/app.lds b/firmware/app.lds index c614925..4a8ae72 100644 --- a/firmware/app.lds +++ b/firmware/app.lds @@ -2,11 +2,17 @@ ENTRY(start) OUTPUT_FORMAT(elf32-sh) INPUT(crt0.o) +#ifdef DEBUG +#define DRAMSIZE 0x1f0000 +#define ORIGADDR 0x09010000 +#else #define DRAMSIZE (MEMORYSIZE * 0x100000) +#define ORIGADDR 0x09000000 +#endif MEMORY { - DRAM : ORIGIN = 0x09000000, LENGTH = DRAMSIZE + DRAM : ORIGIN = ORIGADDR, LENGTH = DRAMSIZE IRAM : ORIGIN = 0x0f000000, LENGTH = 0x1000 } @@ -56,6 +62,15 @@ SECTIONS _end = .; } > DRAM +#ifdef DEBUG + .heap : + { + _poolstart = .; + . = 0x20000; + _poolend = .; + } > DRAM +#endif + .mp3buf : { _mp3buf = .; |