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/arch/x86 | |
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/arch/x86')
-rw-r--r-- | src/arch/x86/boot/boot.c | 2 | ||||
-rw-r--r-- | src/arch/x86/lib/cbfs_and_run.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/x86/boot/boot.c b/src/arch/x86/boot/boot.c index 29070a0ce1..8f7f0e01d0 100644 --- a/src/arch/x86/boot/boot.c +++ b/src/arch/x86/boot/boot.c @@ -1,6 +1,6 @@ #include <console/console.h> #include <arch/stages.h> -#include <payload_loader.h> +#include <program_loading.h> #include <ip_checksum.h> #include <string.h> diff --git a/src/arch/x86/lib/cbfs_and_run.c b/src/arch/x86/lib/cbfs_and_run.c index ca8d61be54..d279b72e40 100644 --- a/src/arch/x86/lib/cbfs_and_run.c +++ b/src/arch/x86/lib/cbfs_and_run.c @@ -18,7 +18,7 @@ */ #include <arch/stages.h> -#include <ramstage_loader.h> +#include <program_loading.h> void asmlinkage copy_and_run(void) { |