Containers packed in single .elf file

loader/linker.lds

@@ -1,7 +1,7 @@
 /*
- * Simple linker script for userspace or svc tasks.
+ * Linker script that packs all containers in loader image.
  *
- * Copyright (C) 2007 Bahadir Balban
+ * Copyright (C) 2007-2009 B Labs Ltd.
  */
 ENTRY(_start)
 
@@ -13,23 +13,17 @@ SECTIONS
 	.rodata1 : { *(.rodata1) }
 	.data :
 	{
+        *(.data)
 		_start_kernel = .;
 		*(.kernel)
 		_end_kernel = .;
-		_start_bootdesc = .;
-		*(.bootdesc)
-		_end_bootdesc = .;
-		_start_mm0 = .;
-		*(.mm0)
-		_end_mm0 = .;
-		_start_fs0 = .;
-		*(.fs0)
-		_end_fs0 = .;
-		_start_test0 = .;
-		*(.test0)
-		_end_test0 = .;
-		*(.data)
 	}
+	_start_containers = .;
+
+	.cont.0 : { *(.cont.0) }
+	.cont.1 : { *(.cont.1) }
+
+	_end_containers = .;
 	.got : { *(.got) *(.got.plt) }
 	.bss : { *(.bss) }
 }