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/include | |
| 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/include')
| -rw-r--r-- | src/include/program_loading.h (renamed from src/include/payload_loader.h) | 29 | ||||
| -rw-r--r-- | src/include/ramstage_loader.h | 34 |
2 files changed, 25 insertions, 38 deletions
diff --git a/src/include/payload_loader.h b/src/include/program_loading.h index 7a3f045f1c..8ceebc12d4 100644 --- a/src/include/payload_loader.h +++ b/src/include/program_loading.h @@ -1,7 +1,7 @@ /* * This file is part of the coreboot project. * - * Copyright (C) 2014 Google Inc. + * Copyright 2015 Google Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,12 +16,32 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PAYLOAD_LOADER_H -#define PAYLOAD_LOADER_H +#ifndef PROGRAM_LOADING_H +#define PROGRAM_LOADING_H #include <stdint.h> #include <stddef.h> + +/************************ + * RAMSTAGE LOADING * + ************************/ + +struct cbmem_entry; + +/* Run ramstage from romstage. */ +void run_ramstage(void); + +struct ramstage_loader_ops { + const char *name; + void *(*load)(uint32_t cbmem_id, const char *name, + const struct cbmem_entry **cbmem_entry); +}; + +/*********************** + * PAYLOAD LOADING * + ***********************/ + struct buffer_area { void *data; size_t size; @@ -63,4 +83,5 @@ struct payload_loader_ops { /* Defined in src/lib/selfboot.c */ void *selfload(struct payload *payload); -#endif /* PAYLOAD_LOADER_H */ + +#endif /* PROGRAM_LOADING_H */ diff --git a/src/include/ramstage_loader.h b/src/include/ramstage_loader.h deleted file mode 100644 index ad085c0ba5..0000000000 --- a/src/include/ramstage_loader.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ -#ifndef RAMSTAGE_LOADER_H -#define RAMSTAGE_LOADER_H - -#include <stdint.h> -struct cbmem_entry; - -/* Run ramstage from romstage. */ -void run_ramstage(void); - -struct ramstage_loader_ops { - const char *name; - void *(*load)(uint32_t cbmem_id, const char *name, - const struct cbmem_entry **cbmem_entry); -}; - -#endif /* RAMSTAGE_LOADER_H */ |