diff options
author | Stefan Reinauer <stepan@coresystems.de> | 2008-01-18 15:08:58 +0000 |
---|---|---|
committer | Stefan Reinauer <stepan@openbios.org> | 2008-01-18 15:08:58 +0000 |
commit | f8ee1806ac524bc782c93eccc59ee3c929abddb9 (patch) | |
tree | 7daab6b3aa82476a10d38fbf68068f4a409d2ce9 /src/arch/ppc | |
parent | 7e61e45402aba2b90997f4f02ca8266cf65a229a (diff) | |
download | coreboot-staging-f8ee1806ac524bc782c93eccc59ee3c929abddb9.zip coreboot-staging-f8ee1806ac524bc782c93eccc59ee3c929abddb9.tar.gz |
Rename almost all occurences of LinuxBIOS to coreboot.
Due to the automatic nature of this update, I am self-acking. It worked in
abuild.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3053 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/ppc')
-rw-r--r-- | src/arch/ppc/Config.lb | 4 | ||||
-rw-r--r-- | src/arch/ppc/boot/boot.c | 2 | ||||
-rw-r--r-- | src/arch/ppc/boot/linuxbios_table.c | 32 | ||||
-rw-r--r-- | src/arch/ppc/boot/linuxbios_table.h | 14 | ||||
-rw-r--r-- | src/arch/ppc/boot/tables.c | 4 | ||||
-rw-r--r-- | src/arch/ppc/init/ldscript.lb | 14 |
6 files changed, 35 insertions, 35 deletions
diff --git a/src/arch/ppc/Config.lb b/src/arch/ppc/Config.lb index 31ccc29..4e3c858 100644 --- a/src/arch/ppc/Config.lb +++ b/src/arch/ppc/Config.lb @@ -1,7 +1,7 @@ ldscript init/ldscript.lb -makerule linuxbios.rom - depends "linuxbios" +makerule coreboot.rom + depends "coreboot" action "cp $< $@" end diff --git a/src/arch/ppc/boot/boot.c b/src/arch/ppc/boot/boot.c index 5a7d06d..b123b3e 100644 --- a/src/arch/ppc/boot/boot.c +++ b/src/arch/ppc/boot/boot.c @@ -29,7 +29,7 @@ void jmp_to_elf_entry(void *entry, unsigned long buffer) */ flush_dcache(); - /* On ppc we don't currently support loading over LinuxBIOS. + /* On ppc we don't currently support loading over coreboot. * So ignore the buffer. */ diff --git a/src/arch/ppc/boot/linuxbios_table.c b/src/arch/ppc/boot/linuxbios_table.c index e8eefc6..2758934 100644 --- a/src/arch/ppc/boot/linuxbios_table.c +++ b/src/arch/ppc/boot/linuxbios_table.c @@ -104,16 +104,16 @@ void lb_strings(struct lb_header *header) uint32_t tag; const uint8_t *string; } strings[] = { - { LB_TAG_VERSION, linuxbios_version, }, - { LB_TAG_EXTRA_VERSION, linuxbios_extra_version, }, - { LB_TAG_BUILD, linuxbios_build, }, - { LB_TAG_COMPILE_TIME, linuxbios_compile_time, }, - { LB_TAG_COMPILE_BY, linuxbios_compile_by, }, - { LB_TAG_COMPILE_HOST, linuxbios_compile_host, }, - { LB_TAG_COMPILE_DOMAIN, linuxbios_compile_domain, }, - { LB_TAG_COMPILER, linuxbios_compiler, }, - { LB_TAG_LINKER, linuxbios_linker, }, - { LB_TAG_ASSEMBLER, linuxbios_assembler, }, + { LB_TAG_VERSION, coreboot_version, }, + { LB_TAG_EXTRA_VERSION, coreboot_extra_version, }, + { LB_TAG_BUILD, coreboot_build, }, + { LB_TAG_COMPILE_TIME, coreboot_compile_time, }, + { LB_TAG_COMPILE_BY, coreboot_compile_by, }, + { LB_TAG_COMPILE_HOST, coreboot_compile_host, }, + { LB_TAG_COMPILE_DOMAIN, coreboot_compile_domain, }, + { LB_TAG_COMPILER, coreboot_compiler, }, + { LB_TAG_LINKER, coreboot_linker, }, + { LB_TAG_ASSEMBLER, coreboot_assembler, }, }; unsigned int i; for(i = 0; i < sizeof(strings)/sizeof(strings[0]); i++) { @@ -183,7 +183,7 @@ unsigned long lb_table_fini(struct lb_header *head) head->table_checksum = compute_ip_checksum(first_rec, head->table_bytes); head->header_checksum = 0; head->header_checksum = compute_ip_checksum(head, sizeof(*head)); - printk_debug("Wrote linuxbios table at: %p - %p checksum %lx\n", + printk_debug("Wrote coreboot table at: %p - %p checksum %lx\n", head, rec, head->table_checksum); return (unsigned long)rec; } @@ -297,8 +297,8 @@ static void lb_add_memory_range(struct lb_memory *mem, lb_cleanup_memory_ranges(mem); } -/* Routines to extract part so the linuxBIOS table or - * information from the linuxBIOS table after we have written it. +/* Routines to extract part so the coreboot table or + * information from the coreboot table after we have written it. * Currently get_lb_mem relies on a global we can change the * implementaiton. */ @@ -330,7 +330,7 @@ static struct lb_memory *build_lb_mem(struct lb_header *head) return mem; } -unsigned long write_linuxbios_table( +unsigned long write_coreboot_table( unsigned long low_table_start, unsigned long low_table_end, unsigned long rom_table_start, unsigned long rom_table_end) { @@ -363,9 +363,9 @@ unsigned long write_linuxbios_table( /* Note: * I assume that there is always memory at immediately after - * the low_table_end. This means that after I setup the linuxbios table. + * the low_table_end. This means that after I setup the coreboot table. * I can trivially fixup the reserved memory ranges to hold the correct - * size of the linuxbios table. + * size of the coreboot table. */ /* Record our motheboard */ diff --git a/src/arch/ppc/boot/linuxbios_table.h b/src/arch/ppc/boot/linuxbios_table.h index 25b152c..2f20091 100644 --- a/src/arch/ppc/boot/linuxbios_table.h +++ b/src/arch/ppc/boot/linuxbios_table.h @@ -1,12 +1,12 @@ -#ifndef LINUXBIOS_TABLE_H -#define LINUXBIOS_TABLE_H +#ifndef COREBOOT_TABLE_H +#define COREBOOT_TABLE_H #include <boot/linuxbios_tables.h> struct mem_range; -/* This file holds function prototypes for building the linuxbios table. */ -unsigned long write_linuxbios_table( +/* This file holds function prototypes for building the coreboot table. */ +unsigned long write_coreboot_table( unsigned long low_table_start, unsigned long low_table_end, unsigned long rom_table_start, unsigned long rom_table_end); @@ -21,11 +21,11 @@ void lb_memory_range(struct lb_memory *mem, struct lb_mainboard *lb_mainboard(struct lb_header *header); unsigned long lb_table_fini(struct lb_header *header); -/* Routines to extract part so the linuxBIOS table or information - * from the linuxBIOS table. +/* Routines to extract part so the coreboot table or information + * from the coreboot table. */ struct lb_memory *get_lb_mem(void); extern struct cmos_option_table option_table; -#endif /* LINUXBIOS_TABLE_H */ +#endif /* COREBOOT_TABLE_H */ diff --git a/src/arch/ppc/boot/tables.c b/src/arch/ppc/boot/tables.c index 6fde37d..a9e1e8e 100644 --- a/src/arch/ppc/boot/tables.c +++ b/src/arch/ppc/boot/tables.c @@ -18,8 +18,8 @@ write_tables(void) low_table_start = 0; low_table_end = 16; - /* The linuxbios table must be in 0-4K or 960K-1M */ - write_linuxbios_table( + /* The coreboot table must be in 0-4K or 960K-1M */ + write_coreboot_table( low_table_start, low_table_end, rom_table_start, rom_table_end); diff --git a/src/arch/ppc/init/ldscript.lb b/src/arch/ppc/init/ldscript.lb index 63a32b7..4c48087 100644 --- a/src/arch/ppc/init/ldscript.lb +++ b/src/arch/ppc/init/ldscript.lb @@ -5,7 +5,7 @@ * _RESET : reset vector (may be at top of ROM) * _EXCEPTIONS_VECTORS : exception table * - * _ROMSTART : linuxbios text + * _ROMSTART : coreboot text * : payload text * * _RAMBASE : address to copy payload @@ -26,7 +26,7 @@ OUTPUT_FORMAT("elf32-powerpc") ENTRY(_start) TARGET(binary) -INPUT(linuxbios_ram.rom) +INPUT(coreboot_ram.rom) SECTIONS { /* @@ -54,7 +54,7 @@ SECTIONS } /* - * Absolute location of LinuxBIOS initialization code in ROM. + * Absolute location of coreboot initialization code in ROM. */ . = _ROMSTART; .rom . : { @@ -63,7 +63,7 @@ SECTIONS *(.text); *(.rom.data); *(.rodata); - *(EXCLUDE_FILE(linuxbios_ram.rom) .data); + *(EXCLUDE_FILE(coreboot_ram.rom) .data); . = ALIGN(16); _erom = .; } @@ -71,16 +71,16 @@ SECTIONS _elrom = LOADADDR(.rom) + SIZEOF(.rom); /* - * Ram is the LinuxBIOS code that runs from RAM. + * Ram is the coreboot code that runs from RAM. */ .ram . : { _ram = . ; - linuxbios_ram.rom(*) + coreboot_ram.rom(*) _eram = . ; } /* - * Absolute location of where LinuxBIOS will be relocated in RAM. + * Absolute location of where coreboot will be relocated in RAM. */ _iseg = _RAMBASE; _eiseg = _iseg + SIZEOF(.ram); |