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

v2/src romfs->cbfs rename

Browse Source 
This also has the config tool changes in v2/util.

Rename romfs.[ch]->cbfs.[ch] and sed romfs->cbfs romtool->cbfstool ROMFS->CBFS

Signed-off-by: Peter Stuge <peter@stuge.se>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4113 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Peter Stuge
2009-04-14 07:40:01 +00:00
parent 3935b19d9f
commit 483b7bbd77
116 changed files with 773 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/boot/Config.lb
View File

@@ -1,6 +1,6 @@
object elfboot.o
object hardwaremain.o
if CONFIG_ROMFS
if CONFIG_CBFS
object selfboot.o
end
if CONFIG_FS_PAYLOAD

8
src/boot/hardwaremain.c
View File

@@ -36,7 +36,7 @@ it with the version available from LANL.
#include <part/hard_reset.h>
#include <part/init_timer.h>
#include <boot/elf.h>
#include <romfs.h>
#include <cbfs.h>
#if HAVE_ACPI_RESUME == 1
#include <arch/acpi.h>
#endif
@@ -112,11 +112,11 @@ void hardwaremain(int boot_complete)
* write our configuration tables.
*/
lb_mem = write_tables();
#if CONFIG_ROMFS == 1
#if CONFIG_CBFS == 1
# if USE_FALLBACK_IMAGE == 1
void (*pl)(void) = romfs_load_payload(lb_mem, "fallback/payload");
void (*pl)(void) = cbfs_load_payload(lb_mem, "fallback/payload");
# else
void (*pl)(void) = romfs_load_payload(lb_mem, "normal/payload");
void (*pl)(void) = cbfs_load_payload(lb_mem, "normal/payload");
# endif
#endif

24
src/boot/selfboot.c
View File

@@ -28,7 +28,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <romfs.h>
#include <cbfs.h>
#ifndef CONFIG_BIG_ENDIAN
#define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \
@@ -70,12 +70,12 @@ struct ip_checksum_vcb {
unsigned short ip_checksum;
};
int romfs_self_decompress(int algo, void *src,struct segment *new)
int cbfs_self_decompress(int algo, void *src,struct segment *new)
{
u8 *dst;
/* for uncompressed, it's easy: just point at the area in ROM */
if (algo == ROMFS_COMPRESS_NONE) {
if (algo == CBFS_COMPRESS_NONE) {
new->s_srcaddr = (u32) src;
new->s_filesz = new->s_memsz;
return 0;
@@ -91,21 +91,21 @@ int romfs_self_decompress(int algo, void *src,struct segment *new)
switch(algo) {
#ifdef CONFIG_COMPRESSION_LZMA
case ROMFS_COMPRESS_LZMA: {
case CBFS_COMPRESS_LZMA: {
unsigned long ulzma(unsigned char *src, unsigned char *dst);
ulzma(src, dst);
}
#endif
#ifdef CONFIG_COMPRESSION_NRV2B
case ROMFS_COMPRESS_NRV2B: {
case CBFS_COMPRESS_NRV2B: {
unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p);
unsigned long tmp;
unrv2b(src, dst, &tmp);
}
#endif
default:
printk_info( "ROMFS: Unknown compression type %d\n",
printk_info( "CBFS: Unknown compression type %d\n",
algo);
return -1;
}
@@ -341,13 +341,13 @@ static void relocate_segment(unsigned long buffer, struct segment *seg)
static int build_self_segment_list(
struct segment *head,
unsigned long bounce_buffer, struct lb_memory *mem,
struct romfs_payload *payload, u32 *entry)
struct cbfs_payload *payload, u32 *entry)
{
struct segment *new;
struct segment *ptr;
u8 *data;
int datasize;
struct romfs_payload_segment *segment, *first_segment;
struct cbfs_payload_segment *segment, *first_segment;
memset(head, 0, sizeof(*head));
head->phdr_next = head->phdr_prev = head;
head->next = head->prev = head;
@@ -372,10 +372,10 @@ static int build_self_segment_list(
datasize = ntohl(segment->len);
/* figure out decompression, do it, get pointer to the area */
if (romfs_self_decompress(ntohl(segment->compression),
if (cbfs_self_decompress(ntohl(segment->compression),
((unsigned char *) first_segment) +
ntohl(segment->offset), new)) {
printk_emerg("romfs_self_decompress failed\n");
printk_emerg("cbfs_self_decompress failed\n");
return;
}
printk_debug("New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n",
@@ -432,7 +432,7 @@ static int build_self_segment_list(
}
static int load_self_segments(
struct segment *head, struct romfs_payload *payload)
struct segment *head, struct cbfs_payload *payload)
{
unsigned long offset;
struct segment *ptr;
@@ -478,7 +478,7 @@ static int load_self_segments(
return 0;
}
int selfboot(struct lb_memory *mem, struct romfs_payload *payload)
int selfboot(struct lb_memory *mem, struct cbfs_payload *payload)
{
void *entry;
struct segment head;