commit 04654a2eff08f8956734e65946bdbaad87f51d56
author Aaron Durbin <adurbin@chromium.org> Tue Mar 17 11:43:44 2015 -0500
committer Aaron Durbin <adurbin@google.com> Fri Mar 20 19:25:29 2015 +0100
tree 2b555e36f80cf1a982bc0d9c611aca8fab49ac0d
parent 3486d1fbe8deaf2062bd4c0c14b7f96f78dfce8f

loaders: add program_loading.h header file

Instead of two headers for payload and ramstage loading
combine the 2 files into one. This also allows for easier
refactoring by keeping header files consistent.

Change-Id: I4a6dffb78ad84c78e6e96c886d361413f9b4a17d
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/8708
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

src/lib/hardwaremain.c

diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index d16aa09..9917a69 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <reset.h>
 #include <boot/tables.h>
-#include <payload_loader.h>
+#include <program_loading.h>
 #include <lib.h>
 #if CONFIG_HAVE_ACPI_RESUME
 #include <arch/acpi.h>

src/lib/loaders/cbfs_payload_loader.c

diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c
index 2c1d179..22f4c2f 100644
--- a/src/lib/loaders/cbfs_payload_loader.c
+++ b/src/lib/loaders/cbfs_payload_loader.c
@@ -18,7 +18,7 @@
  */
 
 #include <cbfs.h>
-#include <payload_loader.h>
+#include <program_loading.h>
 
 static int cbfs_locate_payload(struct payload *payload)
 {

src/lib/loaders/cbfs_ramstage_loader.c

diff --git a/src/lib/loaders/cbfs_ramstage_loader.c b/src/lib/loaders/cbfs_ramstage_loader.c
index 5d5cc0b..5155aea 100644
--- a/src/lib/loaders/cbfs_ramstage_loader.c
+++ b/src/lib/loaders/cbfs_ramstage_loader.c
@@ -20,7 +20,7 @@
 #include <console/console.h>
 #include <cbfs.h>
 #include <arch/stages.h>
-#include <ramstage_loader.h>
+#include <program_loading.h>
 #include <timestamp.h>
 
 #if CONFIG_RELOCATABLE_RAMSTAGE

src/lib/loaders/load_and_run_payload.c

diff --git a/src/lib/loaders/load_and_run_payload.c b/src/lib/loaders/load_and_run_payload.c
index 2204090..4bb29c1 100644
--- a/src/lib/loaders/load_and_run_payload.c
+++ b/src/lib/loaders/load_and_run_payload.c
@@ -22,7 +22,7 @@
 #include <console/console.h>
 #include <fallback.h>
 #include <lib.h>
-#include <payload_loader.h>
+#include <program_loading.h>
 #include <timestamp.h>
 
 extern const struct payload_loader_ops vboot_payload_loader;

src/lib/loaders/load_and_run_ramstage.c

diff --git a/src/lib/loaders/load_and_run_ramstage.c b/src/lib/loaders/load_and_run_ramstage.c
index 5237e20..b24e29f 100644
--- a/src/lib/loaders/load_and_run_ramstage.c
+++ b/src/lib/loaders/load_and_run_ramstage.c
@@ -22,7 +22,7 @@
 #include <arch/stages.h>
 #include <cbfs.h>
 #include <cbmem.h>
-#include <ramstage_loader.h>
+#include <program_loading.h>
 #include <romstage_handoff.h>
 #include <timestamp.h>
 

src/lib/selfboot.c

diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c
index de059b0..4c5fbad 100644
--- a/src/lib/selfboot.c
+++ b/src/lib/selfboot.c
@@ -27,7 +27,7 @@
 #include <cbfs.h>
 #include <lib.h>
 #include <bootmem.h>
-#include <payload_loader.h>
+#include <program_loading.h>
 
 /* from ramstage.ld: */
 extern unsigned char _ram_seg;