Calculate the optimal memory location for overlay plugins, and use plugin.lds for linking them. This gets rid of hand-adjusted archos.lds, making it easy to use overlay plugins on other lowmem targets. * Fix some duplicate and incorrect dependencies. * Change the way libs are filtered, so that a lib can be specified more than once. This allows to get rid of explicitly linking gcc-support.o, fixing empty plugins on some simulator platforms.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20163 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 10 insertions, 58 deletions

diff --git a/apps/plugins/zxbox/archos.lds b/apps/plugins/zxbox/archos.lds
deleted file mode 100644
index 5b4db7d..0000000
--- a/apps/plugins/zxbox/archos.lds
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "config.h"
-
-/* linker script for zxbox as an overlay,
- * only used/ necessary for SH-based archos targets */
-
-OUTPUT_FORMAT(elf32-sh)
-
-#define DRAMORIG 0x09000000
-#define PLUGIN_LENGTH PLUGIN_BUFFER_SIZE
-
-#define OVERLAY_LENGTH 0x48000
-#define OVERLAY_ORIGIN (DRAMORIG + (MEMORYSIZE * 0x100000) - PLUGIN_LENGTH - OVERLAY_LENGTH)
-
-MEMORY
-{
-   OVERLAY_RAM : ORIGIN = OVERLAY_ORIGIN, LENGTH = OVERLAY_LENGTH
-}
-
-SECTIONS
-{
-    .header : {
-        _plugin_start_addr = .;
-        KEEP(*(.header))
-    } > OVERLAY_RAM
-
-    .text : {
-        *(.text*)
-    } > OVERLAY_RAM
-
-    .rodata : {
-        *(.rodata*)
-    } > OVERLAY_RAM
-
-    .data : {
-        *(.data*)
-    } > OVERLAY_RAM
-
-    .bss : {
-        *(.bss*)
-        *(COMMON)
-        . = ALIGN(0x4);
-        _plugin_end_addr = .;
-    } > OVERLAY_RAM
-}
diff --git a/apps/plugins/zxbox/zxbox.make b/apps/plugins/zxbox/zxbox.make
index 6f6d1ab..24f8e91 100644
--- a/apps/plugins/zxbox/zxbox.make
+++ b/apps/plugins/zxbox/zxbox.make
@@ -17,12 +17,12 @@ OTHER_SRC += $(ZXBOX_SRC)
 
 ifndef SIMVER
 ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET)))))
-    ## archos recorder targets
-    ZXBOX_INLDS := $(ZXBOX_SRCDIR)/archos.lds
+    ## lowmem targets
     ROCKS += $(ZXBOX_OBJDIR)/zxbox.ovl
+    ZXBOX_OUTLDS = $(ZXBOX_OBJDIR)/zxbox.link
+    ZXBOX_LDFLAGS = -T$(ZXBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map
 else
     ### all other targets
-    ZXBOX_INLDS := $(APPSDIR)/plugins/plugin.lds
     ROCKS += $(ZXBOX_OBJDIR)/zxbox.rock
 endif
 else
@@ -32,22 +32,18 @@ endif
 
 ZXBOXFLAGS = $(filter-out -O%,$(PLUGINFLAGS)) -O3 -funroll-loops
 
-ifdef SIMVER
- ZXBOX_LDFLAGS = $(SHARED_FLAG) # <-- from Makefile
-else
- ZXBOX_OUTLDS = $(ZXBOX_OBJDIR)/zxbox.lds
- ZXBOX_LDFLAGS = -T$(ZXBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map
-endif
+$(ZXBOX_OBJDIR)/zxbox.rock: $(ZXBOX_OBJ)
 
-$(ZXBOX_OUTLDS): $(ZXBOX_INLDS) $(ZXBOX_OBJ)
-	$(call PRINTS,PP $(<F))$(call preprocess2file,$<,$@)
+$(ZXBOX_OBJDIR)/zxbox.refmap: $(ZXBOX_OBJ)
 
-$(ZXBOX_OBJDIR)/zxbox.rock: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) $(PLUGINBITMAPLIB)
+$(ZXBOX_OUTLDS): $(PLUGIN_LDS) $(ZXBOX_OBJDIR)/zxbox.refmap
+	$(call PRINTS,PP $(@F))$(call preprocess2file,$<,$@,-DOVERLAY_OFFSET=$(shell \
+		$(TOOLSDIR)/ovl_offset.pl $(ZXBOX_OBJDIR)/zxbox.refmap))
 
-$(ZXBOX_OBJDIR)/zxbox.ovl: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) $(PLUGINBITMAPLIB) $(PLUGINLIB)
+$(ZXBOX_OBJDIR)/zxbox.ovl: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS)
 	$(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
 		$(filter %.o, $^) \
-		$(filter %.a, $^) \
+		$(filter %.a, $+) \
 		-lgcc $(ZXBOX_LDFLAGS)
 	$(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@