diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-03-17 11:43:44 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@google.com> | 2015-03-20 19:25:29 +0100 |
| commit | 04654a2eff08f8956734e65946bdbaad87f51d56 (patch) | |
| tree | 2b555e36f80cf1a982bc0d9c611aca8fab49ac0d /src/lib | |
| parent | 3486d1fbe8deaf2062bd4c0c14b7f96f78dfce8f (diff) | |
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>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/hardwaremain.c | 2 | ||||
| -rw-r--r-- | src/lib/loaders/cbfs_payload_loader.c | 2 | ||||
| -rw-r--r-- | src/lib/loaders/cbfs_ramstage_loader.c | 2 | ||||
| -rw-r--r-- | src/lib/loaders/load_and_run_payload.c | 2 | ||||
| -rw-r--r-- | src/lib/loaders/load_and_run_ramstage.c | 2 | ||||
| -rw-r--r-- | src/lib/selfboot.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c index d16aa09a29..9917a690e7 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> diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c index 2c1d1796f2..22f4c2fcd6 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) { diff --git a/src/lib/loaders/cbfs_ramstage_loader.c b/src/lib/loaders/cbfs_ramstage_loader.c index 5d5cc0b0ec..5155aea511 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 diff --git a/src/lib/loaders/load_and_run_payload.c b/src/lib/loaders/load_and_run_payload.c index 2204090843..4bb29c10e5 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; diff --git a/src/lib/loaders/load_and_run_ramstage.c b/src/lib/loaders/load_and_run_ramstage.c index 5237e20db7..b24e29fc2d 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> diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index de059b0faa..4c5fbad8ff 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; |