summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2013-05-09 16:30:06 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-07-10 02:40:30 +0200
commit6adef0847e4a62abf00e489209d239c958447830 (patch)
tree5e6cbc1a6f84cca69b7060710b73b1d31c00ccf5 /src/include
parent2ae6d6f6de3d5fb6c1fdb039d0997814ac0b9798 (diff)
Rename hardwaremain() to main()
... and drop the wrapper on ARMv7 Change-Id: If3ffe953cee9e61d4dcbb38f4e5e2ca74b628ccc Signed-off-by: Stefan Reinauer <reinauer@google.com> Signed-off-by: Gabe Black <gabeblack@chromium.org> Reviewed-on: http://review.coreboot.org/3639 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/include')
-rw-r--r--src/include/bootstate.h2
-rw-r--r--src/include/console/post_codes.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/include/bootstate.h b/src/include/bootstate.h
index 40822a79e2..af189897d8 100644
--- a/src/include/bootstate.h
+++ b/src/include/bootstate.h
@@ -165,7 +165,7 @@ void boot_state_current_block(void);
void boot_state_current_unblock(void);
/* Entry into the boot state machine. */
-void hardwaremain(void);
+void main(void);
/* In order to schedule boot state callbacks at compile-time specify the
* entries in an array using the BOOT_STATE_INIT_ENTRIES and
diff --git a/src/include/console/post_codes.h b/src/include/console/post_codes.h
index f66d276cdf..ba6c916fce 100644
--- a/src/include/console/post_codes.h
+++ b/src/include/console/post_codes.h
@@ -83,16 +83,16 @@
#define POST_ENTRY_C_START 0x13
/**
- * \brief Pre call to hardwaremain()
+ * \brief Pre call to ram stage main()
*
- * POSTed right before hardwaremain is called from c_start.S
+ * POSTed right before ram stage main() is called from c_start.S
*/
#define POST_PRE_HARDWAREMAIN 0x79
/**
- * \brief Entry into coreboot in hardwaremain (RAM)
+ * \brief Entry into coreboot in ram stage main()
*
- * This is the first call in hardwaremain.c. If this code is POSTed, then
+ * This is the first call in ram stage main(). If this code is POSTed, then
* ramstage has succesfully loaded and started executing.
*/
#define POST_ENTRY_RAMSTAGE 0x80