rbutil: Merge rbutil with utils folder.

rbutil uses several components from the utils folder, and can be
considered part of utils too. Having it in a separate folder is an
arbitrary split that doesn't help anymore these days, so merge them.

This also allows other utils to easily use libtools.make without the
need to navigate to a different folder.

Change-Id: I3fc2f4de19e3e776553efb5dea5f779dfec0dc21

1 files changed, 32 insertions, 0 deletions

diff --git a/utils/mkzenboot/dualboot/dualboot.lds b/utils/mkzenboot/dualboot/dualboot.lds
new file mode 100644
index 0000000000..7444a1e427
--- /dev/null
+++ b/utils/mkzenboot/dualboot/dualboot.lds
@@ -0,0 +1,32 @@
+ENTRY(start)
+OUTPUT_FORMAT(elf32-littlearm)
+OUTPUT_ARCH(arm)
+
+MEMORY
+{
+    /* keep this consistent with the address in mkzenboot.c */
+#if IMX233_SUBTARGET == 3700
+    RAM : ORIGIN = 0x41000000, LENGTH = 0x8000
+#elif IMX233_SUBTARGET == 3600
+    RAM : ORIGIN = 0x61000000, LENGTH = 0x8000
+#else
+#error define me
+#endif
+}
+
+SECTIONS
+{
+    .text :
+    {
+        *(.start*)
+        *(.text*)
+        . = ALIGN(4);
+        LONG(0x1ceb00da)
+        of_vector = .;
+        . += 4;
+        rb_vector = .;
+        . += 4;
+        boot_arg = .;
+        . += 4;
+    } > RAM
+}