diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds index fc9d4d4efe..84617b9b4e 100644 --- a/apps/plugins/plugin.lds +++ b/apps/plugins/plugin.lds @@ -113,6 +113,7 @@ SECTIONS #endif { *(.bss*) + *(COMMON) } > PLUGIN_RAM /* Special trick to avoid a linker error when no other sections are diff --git a/apps/plugins/rockboy.c b/apps/plugins/rockboy.c index d531c9405b..e2ffc30d99 100644 --- a/apps/plugins/rockboy.c +++ b/apps/plugins/rockboy.c @@ -69,10 +69,12 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) " overlay doesn't fit into memory."); return PLUGIN_ERROR; } + rb->memset(header.start_addr, 0, header.end_addr - header.start_addr); + rb->lseek(fh, 0, SEEK_SET); readsize = rb->read(fh, header.start_addr, header.end_addr - header.start_addr); rb->close(fh); - if (readsize != header.end_addr - header.start_addr) + if (readsize <= sizeof(header)) { rb->splash(2*HZ, true, "Error loading " OVL_DISPLAYNAME " overlay."); return PLUGIN_ERROR; diff --git a/apps/plugins/rockboy/archos.lds b/apps/plugins/rockboy/archos.lds index 9412c4365a..55db1e2e30 100755 --- a/apps/plugins/rockboy/archos.lds +++ b/apps/plugins/rockboy/archos.lds @@ -28,18 +28,19 @@ SECTIONS *(.text) } > OVERLAY_RAM + .rodata : { + *(.rodata) + *(.rodata.str1.1) + *(.rodata.str1.4) + } > OVERLAY_RAM + .data : { *(.data) } > OVERLAY_RAM .bss : { *(.bss) - } > OVERLAY_RAM - - .rodata : { - *(.rodata) - *(.rodata.str1.1) - *(.rodata.str1.4) + *(COMMON) . = ALIGN(0x4); _ovl_end_addr = .; } > OVERLAY_RAM