payload loading: remove passing of struct payload
There's no need to keep track of struct payload within
the boot state machine. It is completely contained within
the payload loader module.
Change-Id: I16fcecf43d7fb41fc311955fdb82eabbd5c96b11
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/8836
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index 1091c00..83bc7be 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -227,26 +227,16 @@
static boot_state_t bs_payload_load(void *arg)
{
- struct payload *payload;
-
timestamp_add_now(TS_LOAD_PAYLOAD);
- payload = payload_load();
-
- if (! payload)
- die("Could not load payload\n");
-
- /* Pass the payload to the next state. */
- boot_states[BS_PAYLOAD_BOOT].arg = payload;
+ payload_load();
return BS_PAYLOAD_BOOT;
}
static boot_state_t bs_payload_boot(void *arg)
{
- struct payload *payload = arg;
-
- payload_run(payload);
+ payload_run();
printk(BIOS_EMERG, "Boot failed");
/* Returning from this state will fail because the following signals
diff --git a/src/lib/loaders/load_and_run_payload.c b/src/lib/loaders/load_and_run_payload.c
index 4bb29c1..89b6da6 100644
--- a/src/lib/loaders/load_and_run_payload.c
+++ b/src/lib/loaders/load_and_run_payload.c
@@ -44,7 +44,7 @@
return;
}
-struct payload *payload_load(void)
+void payload_load(void)
{
int i;
void *entry;
@@ -65,24 +65,22 @@
}
if (i == ARRAY_SIZE(payload_ops))
- return NULL;
+ goto out;
mirror_payload(payload);
entry = selfload(payload);
- if (entry == NULL)
- return NULL;
-
payload->entry = entry;
- return payload;
+out:
+ if (payload->entry == NULL)
+ die("Payload not loaded.\n");
}
-void payload_run(const struct payload *payload)
+void payload_run(void)
{
- if (payload == NULL)
- return;
+ const struct payload *payload = &global_payload;
/* Reset to booting from this image as late as possible */
boot_successful();