Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4194
-gerrit
commit 02138eb815f5d52e492778bc889a3f96ae29d65d Author: Aaron Durbin adurbin@chromium.org Date: Fri May 24 13:40:51 2013 -0500
libpayload: expose cbfs ram functions
The ram_media.c file is being compiled, however the global functions were not exposed through a header.
Change-Id: I4588fbe320c29051566cef277bf4d20a83abf853 Signed-off-by: Aaron Durbin adurbin@chromium.org Reviewed-on: https://gerrit.chromium.org/gerrit/56642 Reviewed-by: Duncan Laurie dlaurie@chromium.org Reviewed-by: Stefan Reinauer reinauer@google.com --- payloads/libpayload/include/cbfs_ram.h | 61 +++++++++++++++++++++++++++++++++ payloads/libpayload/libcbfs/ram_media.c | 4 +-- 2 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/payloads/libpayload/include/cbfs_ram.h b/payloads/libpayload/include/cbfs_ram.h new file mode 100644 index 0000000..defe823 --- /dev/null +++ b/payloads/libpayload/include/cbfs_ram.h @@ -0,0 +1,61 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2013 Google, Inc. + * + * This file is dual-licensed. You can choose between: + * - The GNU GPL, version 2, as published by the Free Software Foundation + * - The revised BSD license (without advertising clause) + * + * --------------------------------------------------------------------------- + * 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 + * --------------------------------------------------------------------------- + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * --------------------------------------------------------------------------- + */ + +#ifndef _CBFS_RAM_H_ +#define _CBFS_RAM_H_ + +#include <stdint.h> + +struct cbfs_media; + +/* The following functions return 0 for success. None-zero on error. */ +int init_cbfs_ram_media(struct cbfs_media *media, void *start, size_t size); +int setup_cbfs_from_ram(void *start, uint32_t size); +int setup_cbfs_from_flash(void); + +#endif /* _CBFS_RAM_H_ */ diff --git a/payloads/libpayload/libcbfs/ram_media.c b/payloads/libpayload/libcbfs/ram_media.c index 9f11a31..a260b05 100644 --- a/payloads/libpayload/libcbfs/ram_media.c +++ b/payloads/libpayload/libcbfs/ram_media.c @@ -27,6 +27,7 @@ * SUCH DAMAGE. */ #include <cbfs.h> +#include <cbfs_ram.h> #include <string.h> #include <stdio.h> #include <stdlib.h> @@ -77,7 +78,6 @@ static int ram_close(struct cbfs_media *media) { return 0; }
-int init_cbfs_ram_media(struct cbfs_media *media, void *start, size_t size); int init_cbfs_ram_media(struct cbfs_media *media, void *start, size_t size) { // TODO Find a way to release unused media. Maybe adding media->destroy. struct ram_media *m = (struct ram_media*)malloc(sizeof(*m)); @@ -96,7 +96,6 @@ int init_cbfs_ram_media(struct cbfs_media *media, void *start, size_t size) { static int is_default_cbfs_media_initialized; static struct cbfs_media default_cbfs_media;
-int setup_cbfs_from_ram(void *start, uint32_t size); int setup_cbfs_from_ram(void *start, uint32_t size) { int result = init_cbfs_ram_media(&default_cbfs_media, start, size); if (result == 0) @@ -105,7 +104,6 @@ int setup_cbfs_from_ram(void *start, uint32_t size) { }
extern int libpayload_init_default_cbfs_media(struct cbfs_media *media); -int setup_cbfs_from_flash(void); int setup_cbfs_from_flash(void) { int result = libpayload_init_default_cbfs_media(&default_cbfs_media); if (result == 0)