Upgrade CBFS in libpayload to use new media-based implementation from coreboot ( http://review.coreboot.org/#/c/2182/ ). Old CBFS functions (cbfs_find, cbfs_find_file, get_cbfs_header) are still supported, although the recommended way is to use new CBFS API. To migrate your existing x86 payload source: - Change cbfs_find to cbfs_get_file - Change cbfs_find_file to cbfs_get_file_content - Prefix every CBFS call with a CBFS_DEFAULT_MEDIA argument. Ex, char *jpeg_data = cbfs_find_file("splash.jpg", CBFS_TYPE_BOOTSPLASH); => char *jpeg_data = cbfs_get_file_content( CBFS_DEFAULT_MEDIA, "splash.jpg", CBFS_TYPE_BOOTSPLASH); The legacy setup_cbfs_from_{ram,flash} is also supported, although the better equivalent is to make a new media instance: struct cbfs_media ram_media; init_cbfs_ram_media(&ram_media, start, size); char *data = cbfs_get_file_content(&ram_media, "myfile", my_type); Verified by being successfully linked with filo. Change-Id: If797bc7e3ba975d7e3be905c59424f7a93b8ce11 Signed-off-by: Hung-Te Lin <hungte@chromium.org> Reviewed-on: http://review.coreboot.org/2191 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Anton Kochkov <anton.kochkov@gmail.com>
		
			
				
	
	
		
			93 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			93 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * This file is part of the libpayload project.
 | |
|  *
 | |
|  * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
 | |
|  * 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_H_
 | |
| #define _CBFS_H_
 | |
| 
 | |
| #include <cbfs_core.h>
 | |
| 
 | |
| /* legacy APIs */
 | |
| const struct cbfs_header *get_cbfs_header(void);
 | |
| struct cbfs_file *cbfs_find(const char *name);
 | |
| void *cbfs_find_file(const char *name, int type);
 | |
| 
 | |
| int cbfs_execute_stage(struct cbfs_media *media, const char *name);
 | |
| void *cbfs_load_optionrom(struct cbfs_media *media, uint16_t vendor,
 | |
| 			  uint16_t device, void * dest);
 | |
| void *cbfs_load_payload(struct cbfs_media *media, const char *name);
 | |
| void *cbfs_load_stage(struct cbfs_media *media, const char *name);
 | |
| 
 | |
| /* Simple buffer for streaming media. */
 | |
| struct cbfs_simple_buffer {
 | |
| 	char *buffer;
 | |
| 	size_t allocated;
 | |
| 	size_t size;
 | |
| 	size_t last_allocate;
 | |
| };
 | |
| 
 | |
| void *cbfs_simple_buffer_map(struct cbfs_simple_buffer *buffer,
 | |
| 			     struct cbfs_media *media,
 | |
| 			     size_t offset, size_t count);
 | |
| 
 | |
| void *cbfs_simple_buffer_unmap(struct cbfs_simple_buffer *buffer,
 | |
| 			       const void *address);
 | |
| 
 | |
| // Utility functions
 | |
| int run_address(void *f);
 | |
| 
 | |
| /* Defined in src/lib/selfboot.c */
 | |
| struct lb_memory;
 | |
| int selfboot(struct lb_memory *mem, struct cbfs_payload *payload);
 | |
| 
 | |
| /* Defined in individual arch / board implementation. */
 | |
| int init_default_cbfs_media(struct cbfs_media *media);
 | |
| 
 | |
| #endif
 | |
| 
 |