summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-09-05 12:59:26 -0500
committerAaron Durbin <adurbin@chromium.org>2015-09-09 19:35:30 +0000
commitdde7629e9cccf7b3a9b2e468ac8439f91d13cf97 (patch)
treef855ce91134e77665b4019efbaaee019dc36c774 /src/include
parente5bad5cd3d828eba06f1db66f43948f966e7b0e0 (diff)
downloadcoreboot-dde7629e9cccf7b3a9b2e468ac8439f91d13cf97.tar.xz
rmodule: use program.ld for linking
Bring rmodule linking into the common linking method. The __rmodule_entry symbol was removed while using a more common _start symbol. The rmodtool will honor the entry point found within the ELF header. Add ENV_RMODULE so that one can distinguish the environment when generating linker scripts for rmodules. Lastly, directly use program.ld for the rmodule.ld linker script. BUG=chrome-os-partner:44827 BRANCH=None TEST=Built rambi and analyzed the relocatable ramstage, sipi_vector, and smm rmodules. Change-Id: Iaa499eb229d8171272add9ee6d27cff75e7534ac Signed-off-by: Aaron Durbin <adubin@chromium.org> Reviewed-on: http://review.coreboot.org/11517 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/include')
-rw-r--r--src/include/memlayout.h4
-rw-r--r--src/include/rmodule.h4
-rw-r--r--src/include/rules.h16
3 files changed, 20 insertions, 4 deletions
diff --git a/src/include/memlayout.h b/src/include/memlayout.h
index f67753c527..09be615eff 100644
--- a/src/include/memlayout.h
+++ b/src/include/memlayout.h
@@ -43,9 +43,9 @@
#define ARCH_STAGE_HAS_BSS_SECTION 1
#endif
-/* Default is that currently ramstage and smm only has a heap. */
+/* Default is that currently ramstage, smm, and rmodules have a heap. */
#ifndef ARCH_STAGE_HAS_HEAP_SECTION
-#define ARCH_STAGE_HAS_HEAP_SECTION (ENV_RAMSTAGE || ENV_SMM)
+#define ARCH_STAGE_HAS_HEAP_SECTION (ENV_RAMSTAGE || ENV_SMM || ENV_RMODULE)
#endif
#define STR(x) #x
diff --git a/src/include/rmodule.h b/src/include/rmodule.h
index 719c6a6b6b..03cdf76b5c 100644
--- a/src/include/rmodule.h
+++ b/src/include/rmodule.h
@@ -73,9 +73,9 @@ struct rmodule {
};
#if IS_ENABLED(CONFIG_RELOCATABLE_MODULES)
-/* Rmodules have an entry point of named __rmodule_entry. */
+/* Rmodules have an entry point of named _start. */
#define RMODULE_ENTRY(entry_) \
- void __rmodule_entry(void *) __attribute__((alias (STRINGIFY(entry_))))
+ void _start(void *) __attribute__((alias (STRINGIFY(entry_))))
#else
#define RMODULE_ENTRY(entry_)
#endif
diff --git a/src/include/rules.h b/src/include/rules.h
index 607d7fc0dd..7523347588 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -30,6 +30,7 @@
#define ENV_SMM 0
#define ENV_SECMON 0
#define ENV_VERSTAGE 0
+#define ENV_RMODULE 0
#elif defined(__ROMSTAGE__)
#define ENV_BOOTBLOCK 0
@@ -38,6 +39,7 @@
#define ENV_SMM 0
#define ENV_SECMON 0
#define ENV_VERSTAGE 0
+#define ENV_RMODULE 0
#elif defined(__SMM__)
#define ENV_BOOTBLOCK 0
@@ -46,6 +48,7 @@
#define ENV_SMM 1
#define ENV_SECMON 0
#define ENV_VERSTAGE 0
+#define ENV_RMODULE 0
#elif defined(__SECMON__)
#define ENV_BOOTBLOCK 0
@@ -54,6 +57,7 @@
#define ENV_SMM 0
#define ENV_SECMON 1
#define ENV_VERSTAGE 0
+#define ENV_RMODULE 0
#elif defined(__VERSTAGE__)
#define ENV_BOOTBLOCK 0
@@ -62,6 +66,7 @@
#define ENV_SMM 0
#define ENV_SECMON 0
#define ENV_VERSTAGE 1
+#define ENV_RMODULE 0
#elif defined(__RAMSTAGE__)
#define ENV_BOOTBLOCK 0
@@ -70,6 +75,16 @@
#define ENV_SMM 0
#define ENV_SECMON 0
#define ENV_VERSTAGE 0
+#define ENV_RMODULE 0
+
+#elif defined(__RMODULE__)
+#define ENV_BOOTBLOCK 0
+#define ENV_ROMSTAGE 0
+#define ENV_RAMSTAGE 0
+#define ENV_SMM 0
+#define ENV_SECMON 0
+#define ENV_VERSTAGE 0
+#define ENV_RMODULE 1
#else
/*
@@ -84,6 +99,7 @@
#define ENV_SMM 0
#define ENV_SECMON 0
#define ENV_VERSTAGE 0
+#define ENV_RMODULE 0
#endif
/* For romstage and ramstage always build with simple device model, ie.