diff options
Diffstat (limited to 'apps/plugins/rockboy')
-rw-r--r-- | apps/plugins/rockboy/archos.lds | 44 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.make | 22 |
2 files changed, 11 insertions, 55 deletions
diff --git a/apps/plugins/rockboy/archos.lds b/apps/plugins/rockboy/archos.lds deleted file mode 100644 index fcc3e6f922..0000000000 --- a/apps/plugins/rockboy/archos.lds +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | #include "config.h" | ||
2 | |||
3 | /* linker script for rockboy as an overlay, | ||
4 | * only used/ necessary for SH-based archos targets */ | ||
5 | |||
6 | OUTPUT_FORMAT(elf32-sh) | ||
7 | |||
8 | #define DRAMORIG 0x09000000 | ||
9 | #define PLUGIN_LENGTH PLUGIN_BUFFER_SIZE | ||
10 | |||
11 | #define OVERLAY_LENGTH 0x68000 | ||
12 | #define OVERLAY_ORIGIN (DRAMORIG + (MEMORYSIZE * 0x100000) - PLUGIN_LENGTH - OVERLAY_LENGTH) | ||
13 | |||
14 | MEMORY | ||
15 | { | ||
16 | OVERLAY_RAM : ORIGIN = OVERLAY_ORIGIN, LENGTH = OVERLAY_LENGTH | ||
17 | } | ||
18 | |||
19 | SECTIONS | ||
20 | { | ||
21 | .header : { | ||
22 | _plugin_start_addr = .; | ||
23 | KEEP(*(.header)) | ||
24 | } > OVERLAY_RAM | ||
25 | |||
26 | .text : { | ||
27 | *(.text*) | ||
28 | } > OVERLAY_RAM | ||
29 | |||
30 | .rodata : { | ||
31 | *(.rodata*) | ||
32 | } > OVERLAY_RAM | ||
33 | |||
34 | .data : { | ||
35 | *(.data*) | ||
36 | } > OVERLAY_RAM | ||
37 | |||
38 | .bss : { | ||
39 | *(.bss*) | ||
40 | *(COMMON) | ||
41 | . = ALIGN(0x4); | ||
42 | _plugin_end_addr = .; | ||
43 | } > OVERLAY_RAM | ||
44 | } | ||
diff --git a/apps/plugins/rockboy/rockboy.make b/apps/plugins/rockboy/rockboy.make index bce549c43c..ca0ed17a0a 100644 --- a/apps/plugins/rockboy/rockboy.make +++ b/apps/plugins/rockboy/rockboy.make | |||
@@ -18,30 +18,30 @@ OTHER_SRC += $(ROCKBOY_SRC) | |||
18 | 18 | ||
19 | ifndef SIMVER | 19 | ifndef SIMVER |
20 | ifneq (,$(findstring RECORDER,$(TARGET))) | 20 | ifneq (,$(findstring RECORDER,$(TARGET))) |
21 | ## archos recorder targets | 21 | ## lowmem targets |
22 | ROCKBOY_INLDS := $(ROCKBOY_SRCDIR)/archos.lds | ||
23 | ROCKS += $(ROCKBOY_OBJDIR)/rockboy.ovl | 22 | ROCKS += $(ROCKBOY_OBJDIR)/rockboy.ovl |
23 | ROCKBOY_OUTLDS = $(ROCKBOY_OBJDIR)/rockboy.link | ||
24 | ROCKBOY_OVLFLAGS = -T$(ROCKBOY_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map | ||
24 | else | 25 | else |
25 | ### all other targets | 26 | ### all other targets |
26 | ROCKBOY_INLDS := $(APPSDIR)/plugins/plugin.lds | ||
27 | ROCKS += $(ROCKBOY_OBJDIR)/rockboy.rock | 27 | ROCKS += $(ROCKBOY_OBJDIR)/rockboy.rock |
28 | endif | 28 | endif |
29 | ROCKBOY_OVLFLAGS = -T$(ROCKBOY_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map | ||
30 | ROCKBOY_OUTLDS = $(ROCKBOY_OBJDIR)/rockboy.lds | ||
31 | else | 29 | else |
32 | ### simulator | 30 | ### simulator |
33 | ROCKS += $(ROCKBOY_OBJDIR)/rockboy.rock | 31 | ROCKS += $(ROCKBOY_OBJDIR)/rockboy.rock |
34 | ROCKBOY_OVLFLAGS = $(SHARED_FLAG) # <-- from Makefile | ||
35 | endif | 32 | endif |
36 | 33 | ||
37 | $(ROCKBOY_OUTLDS): $(ROCKBOY_INLDS) $(ROCKBOY_OBJ) | 34 | $(ROCKBOY_OBJDIR)/rockboy.rock: $(ROCKBOY_OBJ) |
38 | $(call PRINTS,PP $(<F))$(call preprocess2file,$<,$@) | 35 | |
36 | $(ROCKBOY_OBJDIR)/rockboy.refmap: $(ROCKBOY_OBJ) | ||
39 | 37 | ||
40 | $(ROCKBOY_OBJDIR)/rockboy.rock: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) $(PLUGINBITMAPLIB) | 38 | $(ROCKBOY_OUTLDS): $(PLUGIN_LDS) $(ROCKBOY_OBJDIR)/rockboy.refmap |
39 | $(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DOVERLAY_OFFSET=$(shell \ | ||
40 | $(TOOLSDIR)/ovl_offset.pl $(ROCKBOY_OBJDIR)/rockboy.refmap)) | ||
41 | 41 | ||
42 | $(ROCKBOY_OBJDIR)/rockboy.ovl: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) $(PLUGINBITMAPLIB) | 42 | $(ROCKBOY_OBJDIR)/rockboy.ovl: $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS) |
43 | $(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \ | 43 | $(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \ |
44 | $(filter %.o, $^) \ | 44 | $(filter %.o, $^) \ |
45 | $(filter %.a, $^) \ | 45 | $(filter %.a, $+) \ |
46 | -lgcc $(ROCKBOY_OVLFLAGS) | 46 | -lgcc $(ROCKBOY_OVLFLAGS) |
47 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ | 47 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ |