sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loaders: add program_loading.h header file

Browse Source 
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>
This commit is contained in:
Aaron Durbin
2015-03-17 11:43:44 -05:00
committed by Aaron Durbin
parent 3486d1fbe8
commit 04654a2eff
16 changed files with 39 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/include/payload_loader.h → src/include/program_loading.h
View File

@@ -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 */

34
src/include/ramstage_loader.h
View File

@@ -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 */