commit dde7629e9cccf7b3a9b2e468ac8439f91d13cf97
author Aaron Durbin <adurbin@chromium.org> Sat Sep 05 12:59:26 2015 -0500
committer Aaron Durbin <adurbin@chromium.org> Wed Sep 09 19:35:30 2015 +0000
tree f855ce91134e77665b4019efbaaee019dc36c774
parent e5bad5cd3d828eba06f1db66f43948f966e7b0e0

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>

src/include/rules.h

diff --git a/src/include/rules.h b/src/include/rules.h
index 607d7fc..7523347 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.