summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/i386/Config.lb4
-rw-r--r--src/boot/Config.lb2
-rw-r--r--src/boot/hardwaremain.c8
-rw-r--r--src/boot/selfboot.c24
-rw-r--r--src/config/Options.lb4
-rw-r--r--src/devices/pci_rom.c6
-rw-r--r--src/include/cbfs.h169
-rw-r--r--src/lib/Config.lb4
-rw-r--r--src/lib/cbfs.c252
-rw-r--r--src/mainboard/a-trend/atc-6220/Options.lb6
-rw-r--r--src/mainboard/a-trend/atc-6240/Options.lb6
-rw-r--r--src/mainboard/abit/be6-ii_v2_0/Options.lb6
-rw-r--r--src/mainboard/advantech/pcm-5820/Options.lb6
-rw-r--r--src/mainboard/amd/db800/Options.lb6
-rw-r--r--src/mainboard/amd/dbm690t/Options.lb6
-rw-r--r--src/mainboard/amd/norwich/Options.lb6
-rw-r--r--src/mainboard/amd/pistachio/Options.lb6
-rw-r--r--src/mainboard/amd/rumba/Options.lb6
-rw-r--r--src/mainboard/amd/serengeti_cheetah/Options.lb6
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/Options.lb6
-rw-r--r--src/mainboard/arima/hdama/Options.lb6
-rw-r--r--src/mainboard/artecgroup/dbe61/Options.lb6
-rw-r--r--src/mainboard/asi/mb_5blgp/Options.lb6
-rw-r--r--src/mainboard/asi/mb_5blmp/Options.lb6
-rw-r--r--src/mainboard/asus/a8n_e/Options.lb6
-rw-r--r--src/mainboard/asus/a8v-e_se/Options.lb6
-rw-r--r--src/mainboard/asus/m2v-mx_se/Options.lb6
-rw-r--r--src/mainboard/asus/mew-am/Options.lb6
-rw-r--r--src/mainboard/asus/mew-vm/Options.lb6
-rw-r--r--src/mainboard/asus/p2b-ds/Options.lb6
-rw-r--r--src/mainboard/asus/p2b-f/Options.lb6
-rw-r--r--src/mainboard/asus/p2b/Options.lb6
-rw-r--r--src/mainboard/asus/p3b-f/Options.lb6
-rw-r--r--src/mainboard/axus/tc320/Options.lb6
-rw-r--r--src/mainboard/azza/pt-6ibd/Options.lb6
-rw-r--r--src/mainboard/bcom/winnet100/Options.lb6
-rw-r--r--src/mainboard/bcom/winnetp680/Options.lb6
-rw-r--r--src/mainboard/biostar/m6tba/Options.lb6
-rw-r--r--src/mainboard/broadcom/blast/Options.lb6
-rw-r--r--src/mainboard/compaq/deskpro_en_sff_p600/Options.lb6
-rw-r--r--src/mainboard/dell/s1850/Options.lb6
-rw-r--r--src/mainboard/digitallogic/adl855pc/Options.lb6
-rw-r--r--src/mainboard/digitallogic/msm586seg/Options.lb6
-rw-r--r--src/mainboard/digitallogic/msm800sev/Options.lb6
-rw-r--r--src/mainboard/eaglelion/5bcm/Options.lb6
-rw-r--r--src/mainboard/embeddedplanet/ep405pc/Options.lb6
-rw-r--r--src/mainboard/emulation/qemu-x86/Options.lb4
-rw-r--r--src/mainboard/gigabyte/ga-6bxc/Options.lb6
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/Options.lb6
-rw-r--r--src/mainboard/gigabyte/m57sli/Options.lb6
-rw-r--r--src/mainboard/ibm/e325/Options.lb6
-rw-r--r--src/mainboard/ibm/e326/Options.lb6
-rw-r--r--src/mainboard/iei/juki-511p/Options.lb6
-rw-r--r--src/mainboard/iei/nova4899r/Options.lb6
-rw-r--r--src/mainboard/iei/pcisa-lx-800-r10/Options.lb6
-rw-r--r--src/mainboard/intel/jarrell/Options.lb6
-rw-r--r--src/mainboard/intel/mtarvon/Options.lb6
-rw-r--r--src/mainboard/intel/truxton/Options.lb6
-rw-r--r--src/mainboard/intel/xe7501devkit/Options.lb6
-rw-r--r--src/mainboard/iwill/dk8_htx/Options.lb6
-rw-r--r--src/mainboard/iwill/dk8s2/Options.lb6
-rw-r--r--src/mainboard/iwill/dk8x/Options.lb6
-rw-r--r--src/mainboard/jetway/j7f24/Options.lb6
-rw-r--r--src/mainboard/kontron/986lcd-m/Options.lb6
-rw-r--r--src/mainboard/lippert/frontrunner/Options.lb6
-rw-r--r--src/mainboard/lippert/roadrunner-lx/Options.lb6
-rw-r--r--src/mainboard/lippert/spacerunner-lx/Options.lb6
-rw-r--r--src/mainboard/motorola/sandpoint/Options.lb6
-rw-r--r--src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb6
-rw-r--r--src/mainboard/msi/ms6119/Options.lb6
-rw-r--r--src/mainboard/msi/ms6147/Options.lb6
-rw-r--r--src/mainboard/msi/ms6178/Options.lb6
-rw-r--r--src/mainboard/msi/ms7135/Options.lb6
-rw-r--r--src/mainboard/msi/ms7260/Options.lb6
-rw-r--r--src/mainboard/msi/ms9185/Options.lb6
-rw-r--r--src/mainboard/msi/ms9282/Options.lb6
-rw-r--r--src/mainboard/nec/powermate2000/Options.lb6
-rw-r--r--src/mainboard/newisys/khepri/Options.lb6
-rw-r--r--src/mainboard/nvidia/l1_2pvv/Options.lb6
-rw-r--r--src/mainboard/olpc/btest/Options.lb6
-rw-r--r--src/mainboard/olpc/rev_a/Options.lb6
-rw-r--r--src/mainboard/pcengines/alix1c/Options.lb6
-rw-r--r--src/mainboard/rca/rm4100/Options.lb6
-rw-r--r--src/mainboard/sunw/ultra40/Options.lb6
-rw-r--r--src/mainboard/supermicro/h8dme/Options.lb6
-rw-r--r--src/mainboard/supermicro/h8dmr/Options.lb6
-rw-r--r--src/mainboard/supermicro/x6dai_g/Options.lb6
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Options.lb6
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Options.lb6
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/Options.lb6
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/Options.lb6
-rw-r--r--src/mainboard/technexion/tim8690/Options.lb2
-rw-r--r--src/mainboard/technologic/ts5300/Options.lb6
-rw-r--r--src/mainboard/televideo/tc7020/Options.lb6
-rw-r--r--src/mainboard/thomson/ip1000/Options.lb6
-rw-r--r--src/mainboard/totalimpact/briq/Options.lb6
-rw-r--r--src/mainboard/tyan/s1846/Options.lb6
-rw-r--r--src/mainboard/tyan/s2735/Options.lb6
-rw-r--r--src/mainboard/tyan/s2850/Options.lb6
-rw-r--r--src/mainboard/tyan/s2875/Options.lb6
-rw-r--r--src/mainboard/tyan/s2880/Options.lb6
-rw-r--r--src/mainboard/tyan/s2881/Options.lb6
-rw-r--r--src/mainboard/tyan/s2882/Options.lb6
-rw-r--r--src/mainboard/tyan/s2885/Options.lb6
-rw-r--r--src/mainboard/tyan/s2891/Options.lb6
-rw-r--r--src/mainboard/tyan/s2892/Options.lb6
-rw-r--r--src/mainboard/tyan/s2895/Options.lb6
-rw-r--r--src/mainboard/tyan/s2912/Options.lb6
-rw-r--r--src/mainboard/tyan/s2912_fam10/Options.lb6
-rw-r--r--src/mainboard/tyan/s4880/Options.lb6
-rw-r--r--src/mainboard/tyan/s4882/Options.lb6
-rw-r--r--src/mainboard/via/epia-cn/Options.lb8
-rw-r--r--src/mainboard/via/epia-m/Options.lb6
-rw-r--r--src/mainboard/via/epia/Options.lb6
-rw-r--r--src/mainboard/via/pc2500e/Options.lb6
-rw-r--r--util/newconfig/config.g20
116 files changed, 773 insertions, 352 deletions
diff --git a/src/arch/i386/Config.lb b/src/arch/i386/Config.lb
index 3a2574a244..5f09066695 100644
--- a/src/arch/i386/Config.lb
+++ b/src/arch/i386/Config.lb
@@ -80,8 +80,8 @@ if USE_FAILOVER_IMAGE
else
makerule coreboot.rom
depends "coreboot.strip buildrom $(PAYLOAD-1)"
- action "PAYLOAD=$(PAYLOAD-1); if [ $(CONFIG_ROMFS) -eq 1 ]; then PAYLOAD=/dev/null; touch romfs-support; fi; ./buildrom $< $@ $$PAYLOAD $(ROM_IMAGE_SIZE) $(ROM_SECTION_SIZE)"
- action "if [ $(CONFIG_COMPRESSED_PAYLOAD_LZMA) -eq 1 -a $(CONFIG_ROMFS) -eq 1 ]; then echo l > romfs-support; fi"
+ action "PAYLOAD=$(PAYLOAD-1); if [ $(CONFIG_CBFS) -eq 1 ]; then PAYLOAD=/dev/null; touch cbfs-support; fi; ./buildrom $< $@ $$PAYLOAD $(ROM_IMAGE_SIZE) $(ROM_SECTION_SIZE)"
+ action "if [ $(CONFIG_COMPRESSED_PAYLOAD_LZMA) -eq 1 -a $(CONFIG_CBFS) -eq 1 ]; then echo l > cbfs-support; fi"
end
end
diff --git a/src/boot/Config.lb b/src/boot/Config.lb
index 4c2f4d71f0..f9206bd3aa 100644
--- a/src/boot/Config.lb
+++ b/src/boot/Config.lb
@@ -1,6 +1,6 @@
object elfboot.o
object hardwaremain.o
-if CONFIG_ROMFS
+if CONFIG_CBFS
object selfboot.o
end
if CONFIG_FS_PAYLOAD
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index aaf82fa30d..99c4d3079c 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -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
diff --git a/src/boot/selfboot.c b/src/boot/selfboot.c
index f624a7d02a..c7b927f15b 100644
--- a/src/boot/selfboot.c
+++ b/src/boot/selfboot.c
@@ -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;
diff --git a/src/config/Options.lb b/src/config/Options.lb
index 9739b6d909..7bcba27e04 100644
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -679,10 +679,10 @@ define CONFIG_FS_FAT
export always
comment "Enable FAT filesystem support"
end
-define CONFIG_ROMFS
+define CONFIG_CBFS
default 0
export always
- comment "The new ROMFS file system"
+ comment "The new CBFS file system"
end
define AUTOBOOT_DELAY
default 2
diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c
index 9eaea84115..5df13a4214 100644
--- a/src/devices/pci_rom.c
+++ b/src/devices/pci_rom.c
@@ -27,7 +27,7 @@
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <string.h>
-#include <romfs.h>
+#include <cbfs.h>
struct rom_header * pci_rom_probe(struct device *dev)
{
@@ -35,10 +35,10 @@ struct rom_header * pci_rom_probe(struct device *dev)
struct rom_header *rom_header;
struct pci_data *rom_data;
- if (CONFIG_ROMFS) {
+ if (CONFIG_CBFS) {
void *v;
/* if it's in FLASH, then it's as if dev->on_mainboard was true */
- v = romfs_load_optionrom(dev->vendor, dev->device, NULL);
+ v = cbfs_load_optionrom(dev->vendor, dev->device, NULL);
printk_debug("In cbfs, rom address for %s = %lx\n",
dev_path(dev), rom_address);
if (v) {
diff --git a/src/include/cbfs.h b/src/include/cbfs.h
new file mode 100644
index 0000000000..3449fe93f6
--- /dev/null
+++ b/src/include/cbfs.h
@@ -0,0 +1,169 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
+ *
+ * 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_
+
+/** These are standard values for the known compression
+ alogrithms that coreboot knows about for stages and
+ payloads. Of course, other LAR users can use whatever
+ values they want, as long as they understand them. */
+
+#define CBFS_COMPRESS_NONE 0
+#define CBFS_COMPRESS_LZMA 1
+#define CBFS_COMPRESS_NRV2B 2
+
+/** These are standard component types for well known
+ components (i.e - those that coreboot needs to consume.
+ Users are welcome to use any other value for their
+ components */
+
+#define CBFS_TYPE_STAGE 0x10
+#define CBFS_TYPE_PAYLOAD 0x20
+#define CBFS_TYPE_OPTIONROM 0x30
+
+/** this is the master cbfs header - it need to be
+ located somewhere in the bootblock. Where it
+ actually lives is up to coreboot. A pointer to
+ this header will live at 0xFFFFFFFc, so we can
+ easily find it. */
+
+#define CBFS_HEADER_MAGIC 0x4F524243
+#define CBFS_HEADPTR_ADDR 0xFFFFFFFc
+#define VERSION1 0x31313131
+
+struct cbfs_header {
+ u32 magic;
+ u32 version;
+ u32 romsize;
+ u32 bootblocksize;
+ u32 align;
+ u32 offset;
+ u32 pad[2];
+} __attribute__((packed));
+
+/** This is a component header - every entry in the CBFS
+ will have this header.
+
+ This is how the component is arranged in the ROM:
+
+ -------------- <- 0
+ component header
+ -------------- <- sizeof(struct component)
+ component name
+ -------------- <- offset
+ data
+ ...
+ -------------- <- offset + len
+*/
+
+#define CBFS_FILE_MAGIC "LARCHIVE"
+
+struct cbfs_file {
+ char magic[8];
+ u32 len;
+ u32 type;
+ u32 checksum;
+ u32 offset;
+} __attribute__((packed));
+
+/*** Component sub-headers ***/
+
+/* Following are component sub-headers for the "standard"
+ component types */
+
+/** This is the sub-header for stage components. Stages are
+ loaded by coreboot during the normal boot process */
+
+struct cbfs_stage {
+ u32 compression; /** Compression type */
+ u64 entry; /** entry point */
+ u64 load; /** Where to load in memory */
+ u32 len; /** length of data to load */
+ u32 memlen; /** total length of object in memory */
+} __attribute__((packed));
+
+/** this is the sub-header for payload components. Payloads
+ are loaded by coreboot at the end of the boot process */
+
+struct cbfs_payload_segment {
+ u32 type;
+ u32 compression;
+ u32 offset;
+ u64 load_addr;
+ u32 len;
+ u32 mem_len;
+} __attribute__((packed));
+
+struct cbfs_payload {
+ struct cbfs_payload_segment segments;
+};
+
+#define PAYLOAD_SEGMENT_CODE 0x45444F43
+#define PAYLOAD_SEGMENT_DATA 0x41544144
+#define PAYLOAD_SEGMENT_BSS 0x20535342
+#define PAYLOAD_SEGMENT_PARAMS 0x41524150
+#define PAYLOAD_SEGMENT_ENTRY 0x52544E45
+
+struct cbfs_optionrom {
+ u32 compression;
+ u32 len;
+} __attribute__((packed));
+
+#define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file))
+#define CBFS_SUBHEADER(_p) ( (void *) ((((u8 *) (_p)) + ntohl((_p)->offset))) )
+
+void * cbfs_load_payload(struct lb_memory *lb_mem, const char *name);
+void * cbfs_load_stage(const char *name);
+int cbfs_execute_stage(const char *name);
+void * cbfs_get_file(const char *name);
+void *cbfs_load_optionrom(u16 vendor, u16 device, void * dest);
+int run_address(void *f);
+
+#endif
+
diff --git a/src/lib/Config.lb b/src/lib/Config.lb
index 4e6aa4d8d0..9ecf316b1c 100644
--- a/src/lib/Config.lb
+++ b/src/lib/Config.lb
@@ -28,6 +28,6 @@ if CONFIG_USE_INIT
initobject memcmp.o
end
-if CONFIG_ROMFS
- object romfs.o
+if CONFIG_CBFS
+ object cbfs.o
end
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
new file mode 100644
index 0000000000..55a84b5d93
--- /dev/null
+++ b/src/lib/cbfs.c
@@ -0,0 +1,252 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008, Jordan Crouse <jordan@cosmicpenguin.net>
+ *
+ * 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
+ */
+
+#include <types.h>
+#include <string.h>
+#include <console/console.h>
+#include <boot/coreboot_tables.h>
+#include <cbfs.h>
+
+#ifndef CONFIG_BIG_ENDIAN
+#define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \
+ ((x&0xff0000) >> 8) | ((x&0xff000000) >> 24) )
+#else
+#define ntohl(x) (x)
+#endif
+
+int run_address(void *f);
+
+int cbfs_decompress(int algo, void *src, void *dst, int len)
+{
+ switch(algo) {
+ case CBFS_COMPRESS_NONE:
+ memcpy(dst, src, len);
+ return 0;
+
+#ifdef CONFIG_COMPRESSION_LZMA
+
+ case CBFS_COMPRESS_LZMA: {
+ unsigned long ulzma(unsigned char *src, unsigned char *dst);
+ ulzma(src, dst);
+ }
+ return 0;
+#endif
+
+#ifdef CONFIG_COMPRESSION_NRV2B
+ case CBFS_COMPRESS_NRV2B: {
+ unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p);
+ unsigned long tmp;
+
+ unrv2b(src, dst, &tmp);
+ }
+ return 0;
+#endif
+ default:
+ printk_info( "CBFS: Unknown compression type %d\n",
+ algo);
+ return -1;
+ }
+}
+
+int cbfs_check_magic(struct cbfs_file *file)
+{
+ return !strcmp(file->magic, CBFS_FILE_MAGIC) ? 1 : 0;
+}
+
+struct cbfs_header *cbfs_master_header(void)
+{
+ struct cbfs_header *header;
+
+ void *ptr = (void *)*((unsigned long *) CBFS_HEADPTR_ADDR);
+ printk_debug("Check CBFS header at %p\n", ptr);
+ header = (struct cbfs_header *) ptr;
+
+ printk_debug("magic is %08x\n", ntohl(header->magic));
+ if (ntohl(header->magic) != CBFS_HEADER_MAGIC) {
+ printk_err("NO CBFS HEADER\n");
+ return NULL;
+ }
+
+ printk_debug("Found CBFS header at %p\n", ptr);
+ return header;
+}
+
+struct cbfs_file *cbfs_find(const char *name)
+{
+ struct cbfs_header *header = cbfs_master_header();
+ unsigned long offset;
+
+ if (header == NULL)
+ return NULL;
+ offset = 0 - ntohl(header->romsize) + ntohl(header->offset);
+
+ while(1) {
+ struct cbfs_file *file = (struct cbfs_file *) offset;
+ if (cbfs_check_magic(file)) printk_info("Check %s\n", CBFS_NAME(file));
+ if (cbfs_check_magic(file) &&
+ !strcmp(CBFS_NAME(file), name))
+ return file;
+
+ offset += ntohl(header->align);
+
+ if (offset < 0xFFFFFFFF - ntohl(header->romsize))
+ return NULL;
+ }
+}
+
+struct cbfs_stage *cbfs_find_file(const char *name, int type)
+{
+ struct cbfs_file *file = cbfs_find(name);
+
+ if (file == NULL) {
+ printk_info( "CBFS: Could not find file %s\n",
+ name);
+ return NULL;
+ }
+
+ if (ntohl(file->type) != type) {
+ printk_info( "CBFS: File %s is of type %x instead of"
+ "type %x\n", name, file->type, type);
+
+ return NULL;
+ }
+
+ return (void *) CBFS_SUBHEADER(file);
+}
+
+void *cbfs_load_optionrom(u16 vendor, u16 device, void * dest)
+{
+ char name[17];
+ struct cbfs_optionrom *orom;
+ u8 *src;
+
+ sprintf(name,"pci%04x,%04x.rom", vendor, device);
+
+ orom = (struct cbfs_optionrom *)
+ cbfs_find_file(name, CBFS_TYPE_OPTIONROM);
+
+ if (orom == NULL)
+ return NULL;
+
+ /* They might have specified a dest address. If so, we can decompress.
+ * If not, there's not much hope of decompressing or relocating the rom.
+ * in the common case, the expansion rom is uncompressed, we
+ * pass 0 in for the dest, and all we have to do is find the rom and
+ * return a pointer to it.
+ */
+
+ /* BUG: the cbfstool is (not yet) including a cbfs_optionrom header */
+ src = ((unsigned char *) orom); // + sizeof(struct cbfs_optionrom);
+
+ if (! dest)
+ return src;
+
+ if (cbfs_decompress(ntohl(orom->compression),
+ src,
+ dest,
+ ntohl(orom->len)))
+ return NULL;
+
+ return dest;
+}
+
+void * cbfs_load_payload(struct lb_memory *lb_mem, const char *name)
+{
+ int selfboot(struct lb_memory *mem, struct cbfs_payload *payload);
+ struct cbfs_payload *payload = (struct cbfs_payload *)
+ cbfs_find_file(name, CBFS_TYPE_PAYLOAD);
+
+ struct cbfs_payload_segment *segment, *first_segment;
+
+ if (payload == NULL)
+ return (void *) -1;
+ printk_debug("Got a payload\n");
+ first_segment = segment = &payload->segments;
+ selfboot(lb_mem, payload);
+ printk_emerg("SELFBOOT RETURNED!\n");
+
+ return (void *) -1;
+}
+
+void * cbfs_load_stage(const char *name)
+{
+ struct cbfs_stage *stage = (struct cbfs_stage *)
+ cbfs_find_file(name, CBFS_TYPE_STAGE);
+ /* this is a mess. There is no ntohll. */
+ /* for now, assume compatible byte order until we solve this. */
+ u32 entry;
+
+ if (stage == NULL)
+ return (void *) -1;
+
+ printk_info("Stage: load @ %d/%d bytes, enter @ %llx\n",
+ ntohl((u32) stage->load), ntohl(stage->memlen),
+ stage->entry);
+ memset((void *) ntohl((u32) stage->load), 0, ntohl(stage->memlen));
+
+ if (cbfs_decompress(ntohl(stage->compression),
+ ((unsigned char *) stage) +
+ sizeof(struct cbfs_stage),
+ (void *) ntohl((u32) stage->load),
+ ntohl(stage->len)))
+ return (void *) -1;
+
+ entry = stage->entry;
+// return (void *) ntohl((u32) stage->entry);
+ return (void *) entry;
+}
+
+void * cbfs_get_file(const char *name)
+{
+ return cbfs_find(name);
+}
+
+int cbfs_execute_stage(const char *name)
+{
+ struct cbfs_stage *stage = (struct cbfs_stage *)
+ cbfs_find_file(name, CBFS_TYPE_STAGE);
+
+ if (stage == NULL)
+ return 1;
+
+ if (ntohl(stage->compression) != CBFS_COMPRESS_NONE) {
+ printk_info( "CBFS: Unable to run %s: Compressed file"
+ "Not supported for in-place execution\n", name);
+ return 1;
+ }
+
+ /* FIXME: This isn't right */
+ printk_info( "CBFS: run @ %p\n", (void *) ntohl((u32) stage->entry));
+ return run_address((void *) ntohl((u32) stage->entry));
+}
+
+/**
+ * run_address is passed the address of a function taking no parameters and
+ * jumps to it, returning the result.
+ * @param f the address to call as a function.
+ * returns value returned by the function.
+ */
+
+int run_address(void *f)
+{
+ int (*v) (void);
+ v = f;
+ return v();
+}
+
diff --git a/src/mainboard/a-trend/atc-6220/Options.lb b/src/mainboard/a-trend/atc-6220/Options.lb
index ae66752d25..2641e766df 100644
--- a/src/mainboard/a-trend/atc-6220/Options.lb
+++ b/src/mainboard/a-trend/atc-6220/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -98,8 +98,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/a-trend/atc-6240/Options.lb b/src/mainboard/a-trend/atc-6240/Options.lb
index 0a39f34cb2..31c70358f5 100644
--- a/src/mainboard/a-trend/atc-6240/Options.lb
+++ b/src/mainboard/a-trend/atc-6240/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -98,8 +98,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/abit/be6-ii_v2_0/Options.lb b/src/mainboard/abit/be6-ii_v2_0/Options.lb
index aac55457dc..986b770bbc 100644
--- a/src/mainboard/abit/be6-ii_v2_0/Options.lb
+++ b/src/mainboard/abit/be6-ii_v2_0/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -99,8 +99,8 @@ default CONFIG_CONSOLE_VGA = 1 # Override this in targets/*/Config.lb.
default CONFIG_PCI_ROM_RUN = 1 # Override this in targets/*/Config.lb.
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/advantech/pcm-5820/Options.lb b/src/mainboard/advantech/pcm-5820/Options.lb
index 1c1cffc923..8e8d078aaa 100644
--- a/src/mainboard/advantech/pcm-5820/Options.lb
+++ b/src/mainboard/advantech/pcm-5820/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -104,8 +104,8 @@ default DEFAULT_CONSOLE_LOGLEVEL = 9
default MAXIMUM_CONSOLE_LOGLEVEL = 9
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/amd/db800/Options.lb b/src/mainboard/amd/db800/Options.lb
index f61114de1d..ab75f33bb5 100644
--- a/src/mainboard/amd/db800/Options.lb
+++ b/src/mainboard/amd/db800/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -180,8 +180,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL=8
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/amd/dbm690t/Options.lb b/src/mainboard/amd/dbm690t/Options.lb
index bc5b08f218..be32edf8a1 100644
--- a/src/mainboard/amd/dbm690t/Options.lb
+++ b/src/mainboard/amd/dbm690t/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -302,8 +302,8 @@ default HAVE_MAINBOARD_RESOURCES=1
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/amd/norwich/Options.lb b/src/mainboard/amd/norwich/Options.lb
index ac83e66a19..216b860b2e 100644
--- a/src/mainboard/amd/norwich/Options.lb
+++ b/src/mainboard/amd/norwich/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -180,8 +180,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL=8
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/amd/pistachio/Options.lb b/src/mainboard/amd/pistachio/Options.lb
index 4a6d7b4e0b..29e7802e25 100644
--- a/src/mainboard/amd/pistachio/Options.lb
+++ b/src/mainboard/amd/pistachio/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -302,8 +302,8 @@ default HAVE_MAINBOARD_RESOURCES=1
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/amd/rumba/Options.lb b/src/mainboard/amd/rumba/Options.lb
index ab0dd8a0e1..70c05bfa56 100644
--- a/src/mainboard/amd/rumba/Options.lb
+++ b/src/mainboard/amd/rumba/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -161,8 +161,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL=8
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/amd/serengeti_cheetah/Options.lb b/src/mainboard/amd/serengeti_cheetah/Options.lb
index 3d06fa46ba..697e9119a2 100644
--- a/src/mainboard/amd/serengeti_cheetah/Options.lb
+++ b/src/mainboard/amd/serengeti_cheetah/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -330,8 +330,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb b/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
index e2963954fe..235f1c71a0 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
@@ -18,7 +18,7 @@
#
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -365,8 +365,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/arima/hdama/Options.lb b/src/mainboard/arima/hdama/Options.lb
index f377e7e878..24fff9b1ac 100644
--- a/src/mainboard/arima/hdama/Options.lb
+++ b/src/mainboard/arima/hdama/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -243,8 +243,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/artecgroup/dbe61/Options.lb b/src/mainboard/artecgroup/dbe61/Options.lb
index b84dea208d..4e5fffdbc1 100644
--- a/src/mainboard/artecgroup/dbe61/Options.lb
+++ b/src/mainboard/artecgroup/dbe61/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -180,8 +180,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL=8
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/asi/mb_5blgp/Options.lb b/src/mainboard/asi/mb_5blgp/Options.lb
index 91be9d8e3e..870f3b80f9 100644
--- a/src/mainboard/asi/mb_5blgp/Options.lb
+++ b/src/mainboard/asi/mb_5blgp/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -104,8 +104,8 @@ default DEFAULT_CONSOLE_LOGLEVEL = 9
default MAXIMUM_CONSOLE_LOGLEVEL = 9
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/asi/mb_5blmp/Options.lb b/src/mainboard/asi/mb_5blmp/Options.lb
index 90d47a8398..c1ea8c4e24 100644
--- a/src/mainboard/asi/mb_5blmp/Options.lb
+++ b/src/mainboard/asi/mb_5blmp/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_PIRQ_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
uses HAVE_HARD_RESET
@@ -163,8 +163,8 @@ default CONFIG_VIDEO_MB = 0
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/asus/a8n_e/Options.lb b/src/mainboard/asus/a8n_e/Options.lb
index d4f1bf9c7e..5f4c65715e 100644
--- a/src/mainboard/asus/a8n_e/Options.lb
+++ b/src/mainboard/asus/a8n_e/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses USE_FAILOVER_IMAGE
@@ -168,8 +168,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL = 8
default MAINBOARD_POWER_ON_AFTER_POWER_FAIL = "MAINBOARD_POWER_ON"
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/asus/a8v-e_se/Options.lb b/src/mainboard/asus/a8v-e_se/Options.lb
index fa41c65cc3..a471b418b2 100644
--- a/src/mainboard/asus/a8v-e_se/Options.lb
+++ b/src/mainboard/asus/a8v-e_se/Options.lb
@@ -18,7 +18,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -168,8 +168,8 @@ default DEFAULT_CONSOLE_LOGLEVEL = 8
default MAXIMUM_CONSOLE_LOGLEVEL = 8
default MAINBOARD_POWER_ON_AFTER_POWER_FAIL = "MAINBOARD_POWER_ON"
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/asus/m2v-mx_se/Options.lb b/src/mainboard/asus/m2v-mx_se/Options.lb
index c388831cc9..f9a88c9bef 100644
--- a/src/mainboard/asus/m2v-mx_se/Options.lb
+++ b/src/mainboard/asus/m2v-mx_se/Options.lb
@@ -18,7 +18,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -176,8 +176,8 @@ default DEFAULT_CONSOLE_LOGLEVEL = 9
default MAXIMUM_CONSOLE_LOGLEVEL = 9
default MAINBOARD_POWER_ON_AFTER_POWER_FAIL = "MAINBOARD_POWER_ON"
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/asus/mew-am/Options.lb b/src/mainboard/asus/mew-am/Options.lb
index 1f0ea7dec6..95be45a13d 100644
--- a/src/mainboard/asus/mew-am/Options.lb
+++ b/src/mainboard/asus/mew-am/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -98,8 +98,8 @@ default CONFIG_CONSOLE_VGA = 1 # Override this in targets/*/Config.lb.
default CONFIG_PCI_ROM_RUN = 1 # Override this in targets/*/Config.lb.
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/asus/mew-vm/Options.lb b/src/mainboard/asus/mew-vm/Options.lb
index 063ea3cf4e..fa0eedc074 100644
--- a/src/mainboard/asus/mew-vm/Options.lb
+++ b/src/mainboard/asus/mew-vm/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -159,8 +159,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL=9
default CONFIG_UDELAY_TSC=1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/asus/p2b-ds/Options.lb b/src/mainboard/asus/p2b-ds/Options.lb
index 2b0c485e07..f907eac3d8 100644
--- a/src/mainboard/asus/p2b-ds/Options.lb
+++ b/src/mainboard/asus/p2b-ds/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -105,8 +105,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/asus/p2b-f/Options.lb b/src/mainboard/asus/p2b-f/Options.lb
index ae66752d25..2641e766df 100644
--- a/src/mainboard/asus/p2b-f/Options.lb
+++ b/src/mainboard/asus/p2b-f/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -98,8 +98,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/asus/p2b/Options.lb b/src/mainboard/asus/p2b/Options.lb
index c2ee68b2b3..e6bd850cbd 100644
--- a/src/mainboard/asus/p2b/Options.lb
+++ b/src/mainboard/asus/p2b/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -99,8 +99,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/asus/p3b-f/Options.lb b/src/mainboard/asus/p3b-f/Options.lb
index ae66752d25..2641e766df 100644
--- a/src/mainboard/asus/p3b-f/Options.lb
+++ b/src/mainboard/asus/p3b-f/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -98,8 +98,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/axus/tc320/Options.lb b/src/mainboard/axus/tc320/Options.lb
index f542aee227..0003852a59 100644
--- a/src/mainboard/axus/tc320/Options.lb
+++ b/src/mainboard/axus/tc320/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -104,8 +104,8 @@ default DEFAULT_CONSOLE_LOGLEVEL = 6
default MAXIMUM_CONSOLE_LOGLEVEL = 6
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/azza/pt-6ibd/Options.lb b/src/mainboard/azza/pt-6ibd/Options.lb
index ae66752d25..2641e766df 100644
--- a/src/mainboard/azza/pt-6ibd/Options.lb
+++ b/src/mainboard/azza/pt-6ibd/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -98,8 +98,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/bcom/winnet100/Options.lb b/src/mainboard/bcom/winnet100/Options.lb
index 7f08e9dfd6..384d78ce0a 100644
--- a/src/mainboard/bcom/winnet100/Options.lb
+++ b/src/mainboard/bcom/winnet100/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -104,8 +104,8 @@ default DEFAULT_CONSOLE_LOGLEVEL = 6
default MAXIMUM_CONSOLE_LOGLEVEL = 6
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/bcom/winnetp680/Options.lb b/src/mainboard/bcom/winnetp680/Options.lb
index 00585972b3..446cf228b5 100644
--- a/src/mainboard/bcom/winnetp680/Options.lb
+++ b/src/mainboard/bcom/winnetp680/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -105,8 +105,8 @@ default CONFIG_MAX_PCI_BUSES = 3
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/biostar/m6tba/Options.lb b/src/mainboard/biostar/m6tba/Options.lb
index ae66752d25..2641e766df 100644
--- a/src/mainboard/biostar/m6tba/Options.lb
+++ b/src/mainboard/biostar/m6tba/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -98,8 +98,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/broadcom/blast/Options.lb b/src/mainboard/broadcom/blast/Options.lb
index 39cdc22f5f..752007572c 100644
--- a/src/mainboard/broadcom/blast/Options.lb
+++ b/src/mainboard/broadcom/blast/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -263,8 +263,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb b/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
index ae66752d25..2641e766df 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -98,8 +98,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/dell/s1850/Options.lb b/src/mainboard/dell/s1850/Options.lb
index e2f0c30b6f..808fe21018 100644
--- a/src/mainboard/dell/s1850/Options.lb
+++ b/src/mainboard/dell/s1850/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -229,8 +229,8 @@ default CONFIG_CONSOLE_BTEXT=0
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/digitallogic/adl855pc/Options.lb b/src/mainboard/digitallogic/adl855pc/Options.lb
index 1ddea0d291..24cb38cbd8 100644
--- a/src/mainboard/digitallogic/adl855pc/Options.lb
+++ b/src/mainboard/digitallogic/adl855pc/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -116,8 +116,8 @@ default HOSTCC="gcc"
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/digitallogic/msm586seg/Options.lb b/src/mainboard/digitallogic/msm586seg/Options.lb
index 973a704720..fc9a2be178 100644
--- a/src/mainboard/digitallogic/msm586seg/Options.lb
+++ b/src/mainboard/digitallogic/msm586seg/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -124,8 +124,8 @@ default HOSTCC="gcc"
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/digitallogic/msm800sev/Options.lb b/src/mainboard/digitallogic/msm800sev/Options.lb
index 2d34deaa1c..f77126e0fa 100644
--- a/src/mainboard/digitallogic/msm800sev/Options.lb
+++ b/src/mainboard/digitallogic/msm800sev/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -180,8 +180,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL=8
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/eaglelion/5bcm/Options.lb b/src/mainboard/eaglelion/5bcm/Options.lb
index 1f34ae68a3..6c4034120f 100644
--- a/src/mainboard/eaglelion/5bcm/Options.lb
+++ b/src/mainboard/eaglelion/5bcm/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -166,8 +166,8 @@ default CONFIG_VIDEO_MB = 0
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/embeddedplanet/ep405pc/Options.lb b/src/mainboard/embeddedplanet/ep405pc/Options.lb
index 58da5734c0..11491508d2 100644
--- a/src/mainboard/embeddedplanet/ep405pc/Options.lb
+++ b/src/mainboard/embeddedplanet/ep405pc/Options.lb
@@ -3,7 +3,7 @@
##
uses PCIC0_CFGADDR
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses PCIC0_CFGDATA
uses ISA_IO_BASE
uses ISA_MEM_BASE
@@ -143,8 +143,8 @@ default _RAMBASE=0x00100000
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/emulation/qemu-x86/Options.lb b/src/mainboard/emulation/qemu-x86/Options.lb
index da93b1b481..9628ebb256 100644
--- a/src/mainboard/emulation/qemu-x86/Options.lb
+++ b/src/mainboard/emulation/qemu-x86/Options.lb
@@ -44,13 +44,13 @@ uses USE_DCACHE_RAM
uses DEFAULT_CONSOLE_LOGLEVEL
uses MAXIMUM_CONSOLE_LOGLEVEL
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
default CONFIG_CONSOLE_SERIAL8250=1
default DEFAULT_CONSOLE_LOGLEVEL=8
default MAXIMUM_CONSOLE_LOGLEVEL=8
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
## ROM_SIZE is the size of boot ROM that this board will use.
default ROM_SIZE = 256*1024
diff --git a/src/mainboard/gigabyte/ga-6bxc/Options.lb b/src/mainboard/gigabyte/ga-6bxc/Options.lb
index ae66752d25..2641e766df 100644
--- a/src/mainboard/gigabyte/ga-6bxc/Options.lb
+++ b/src/mainboard/gigabyte/ga-6bxc/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -98,8 +98,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Options.lb b/src/mainboard/gigabyte/ga_2761gxdk/Options.lb
index 387a7a782f..a57533bfe2 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Options.lb
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Options.lb
@@ -22,7 +22,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -354,8 +354,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/gigabyte/m57sli/Options.lb b/src/mainboard/gigabyte/m57sli/Options.lb
index 2fa5c29f4b..0f4ec042a3 100644
--- a/src/mainboard/gigabyte/m57sli/Options.lb
+++ b/src/mainboard/gigabyte/m57sli/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -358,8 +358,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/ibm/e325/Options.lb b/src/mainboard/ibm/e325/Options.lb
index b4383fbabc..98f61b1e0f 100644
--- a/src/mainboard/ibm/e325/Options.lb
+++ b/src/mainboard/ibm/e325/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -222,8 +222,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/ibm/e326/Options.lb b/src/mainboard/ibm/e326/Options.lb
index a068ca9ead..9a101d1950 100644
--- a/src/mainboard/ibm/e326/Options.lb
+++ b/src/mainboard/ibm/e326/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -228,8 +228,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/iei/juki-511p/Options.lb b/src/mainboard/iei/juki-511p/Options.lb
index e3c87cdf38..2e91257805 100644
--- a/src/mainboard/iei/juki-511p/Options.lb
+++ b/src/mainboard/iei/juki-511p/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -147,8 +147,8 @@ default CONFIG_VIDEO_MB = 0
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/iei/nova4899r/Options.lb b/src/mainboard/iei/nova4899r/Options.lb
index c65026cdbe..3b49675b70 100644
--- a/src/mainboard/iei/nova4899r/Options.lb
+++ b/src/mainboard/iei/nova4899r/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -174,8 +174,8 @@ default CONFIG_VIDEO_MB = 0
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Options.lb b/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
index 00944da13f..6a3b6e56bc 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
+++ b/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -106,8 +106,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL=8
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/intel/jarrell/Options.lb b/src/mainboard/intel/jarrell/Options.lb
index afefef35fe..a0e1f9ecf6 100644
--- a/src/mainboard/intel/jarrell/Options.lb
+++ b/src/mainboard/intel/jarrell/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -243,8 +243,8 @@ default CONFIG_CONSOLE_BTEXT=0
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/intel/mtarvon/Options.lb b/src/mainboard/intel/mtarvon/Options.lb
index 42ec01cf81..47e7ff05f8 100644
--- a/src/mainboard/intel/mtarvon/Options.lb
+++ b/src/mainboard/intel/mtarvon/Options.lb
@@ -18,7 +18,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -226,8 +226,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/intel/truxton/Options.lb b/src/mainboard/intel/truxton/Options.lb
index dc4f204774..d4c777c4e2 100644
--- a/src/mainboard/intel/truxton/Options.lb
+++ b/src/mainboard/intel/truxton/Options.lb
@@ -18,7 +18,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -228,8 +228,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/intel/xe7501devkit/Options.lb b/src/mainboard/intel/xe7501devkit/Options.lb
index 76049b0a86..d3036df6a7 100644
--- a/src/mainboard/intel/xe7501devkit/Options.lb
+++ b/src/mainboard/intel/xe7501devkit/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
uses HAVE_PIRQ_TABLE
@@ -241,8 +241,8 @@ default DEBUG=1
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/iwill/dk8_htx/Options.lb b/src/mainboard/iwill/dk8_htx/Options.lb
index dd94a06520..2e235d9c17 100644
--- a/src/mainboard/iwill/dk8_htx/Options.lb
+++ b/src/mainboard/iwill/dk8_htx/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -329,8 +329,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/iwill/dk8s2/Options.lb b/src/mainboard/iwill/dk8s2/Options.lb
index 04a7d026a8..6c0fb018c3 100644
--- a/src/mainboard/iwill/dk8s2/Options.lb
+++ b/src/mainboard/iwill/dk8s2/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -229,8 +229,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/iwill/dk8x/Options.lb b/src/mainboard/iwill/dk8x/Options.lb
index 39f02d9307..a515945180 100644
--- a/src/mainboard/iwill/dk8x/Options.lb
+++ b/src/mainboard/iwill/dk8x/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -228,8 +228,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/jetway/j7f24/Options.lb b/src/mainboard/jetway/j7f24/Options.lb
index c227de7f89..1000212827 100644
--- a/src/mainboard/jetway/j7f24/Options.lb
+++ b/src/mainboard/jetway/j7f24/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -106,8 +106,8 @@ default CONFIG_MAX_PCI_BUSES = 3
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/kontron/986lcd-m/Options.lb b/src/mainboard/kontron/986lcd-m/Options.lb
index cf06651897..3d708b0e1c 100644
--- a/src/mainboard/kontron/986lcd-m/Options.lb
+++ b/src/mainboard/kontron/986lcd-m/Options.lb
@@ -72,7 +72,7 @@ uses CONFIG_PCIE_CONFIGSPACE_HOLE
uses MMCONF_SUPPORT
uses MMCONF_BASE_ADDRESS
uses CONFIG_GFXUMA
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
#
uses MAINBOARD
@@ -325,9 +325,9 @@ default MAXIMUM_CONSOLE_LOGLEVEL=9
default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
#
-# ROMFS
+# CBFS
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
### End Options.lb
end
diff --git a/src/mainboard/lippert/frontrunner/Options.lb b/src/mainboard/lippert/frontrunner/Options.lb
index ab0dd8a0e1..70c05bfa56 100644
--- a/src/mainboard/lippert/frontrunner/Options.lb
+++ b/src/mainboard/lippert/frontrunner/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -161,8 +161,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL=8
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/lippert/roadrunner-lx/Options.lb b/src/mainboard/lippert/roadrunner-lx/Options.lb
index 61add853d3..d8e173b6bc 100644
--- a/src/mainboard/lippert/roadrunner-lx/Options.lb
+++ b/src/mainboard/lippert/roadrunner-lx/Options.lb
@@ -21,7 +21,7 @@
## Based on Options.lb from AMD's DB800 mainboard.
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -210,8 +210,8 @@ default DEFAULT_CONSOLE_LOGLEVEL = 8
default MAXIMUM_CONSOLE_LOGLEVEL = 8
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/lippert/spacerunner-lx/Options.lb b/src/mainboard/lippert/spacerunner-lx/Options.lb
index 75da01de65..191ad3b2e5 100644
--- a/src/mainboard/lippert/spacerunner-lx/Options.lb
+++ b/src/mainboard/lippert/spacerunner-lx/Options.lb
@@ -21,7 +21,7 @@
## Based on Options.lb from AMD's DB800 mainboard.
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -210,8 +210,8 @@ default DEFAULT_CONSOLE_LOGLEVEL = 8
default MAXIMUM_CONSOLE_LOGLEVEL = 8
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/motorola/sandpoint/Options.lb b/src/mainboard/motorola/sandpoint/Options.lb
index d20b2f74eb..e6042f1604 100644
--- a/src/mainboard/motorola/sandpoint/Options.lb
+++ b/src/mainboard/motorola/sandpoint/Options.lb
@@ -1,5 +1,5 @@
uses CONFIG_SANDPOINT_ALTIMUS
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses CONFIG_SANDPOINT_TALUS
uses CONFIG_SANDPOINT_UNITY
uses CONFIG_SANDPOINT_VALIS
@@ -125,8 +125,8 @@ default CONFIG_SANDPOINT_ALTIMUS=1
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb b/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
index 72cea15cc7..42b183f916 100644
--- a/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
+++ b/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
@@ -1,5 +1,5 @@
uses ISA_IO_BASE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses ISA_MEM_BASE
uses PCIC0_CFGADDR
uses PCIC0_CFGDATA
@@ -120,8 +120,8 @@ default _RAMSTART=0x00100000
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/msi/ms6119/Options.lb b/src/mainboard/msi/ms6119/Options.lb
index 0a39f34cb2..31c70358f5 100644
--- a/src/mainboard/msi/ms6119/Options.lb
+++ b/src/mainboard/msi/ms6119/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -98,8 +98,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/msi/ms6147/Options.lb b/src/mainboard/msi/ms6147/Options.lb
index 866db785e1..9e0f7225dd 100644
--- a/src/mainboard/msi/ms6147/Options.lb
+++ b/src/mainboard/msi/ms6147/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -98,8 +98,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/msi/ms6178/Options.lb b/src/mainboard/msi/ms6178/Options.lb
index a87c3c8b2b..e3980ca460 100644
--- a/src/mainboard/msi/ms6178/Options.lb
+++ b/src/mainboard/msi/ms6178/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -97,8 +97,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/msi/ms7135/Options.lb b/src/mainboard/msi/ms7135/Options.lb
index c4c31027c9..36260c76e0 100644
--- a/src/mainboard/msi/ms7135/Options.lb
+++ b/src/mainboard/msi/ms7135/Options.lb
@@ -21,7 +21,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses USE_FAILOVER_IMAGE
@@ -322,8 +322,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/msi/ms7260/Options.lb b/src/mainboard/msi/ms7260/Options.lb
index ddd2252f0f..b16ebcaf61 100644
--- a/src/mainboard/msi/ms7260/Options.lb
+++ b/src/mainboard/msi/ms7260/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses USE_FAILOVER_IMAGE
@@ -187,8 +187,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL = 9
default MAINBOARD_POWER_ON_AFTER_POWER_FAIL = "MAINBOARD_POWER_ON"
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/msi/ms9185/Options.lb b/src/mainboard/msi/ms9185/Options.lb
index 0f64e833c9..efd5dc95bc 100644
--- a/src/mainboard/msi/ms9185/Options.lb
+++ b/src/mainboard/msi/ms9185/Options.lb
@@ -23,7 +23,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -331,8 +331,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/msi/ms9282/Options.lb b/src/mainboard/msi/ms9282/Options.lb
index 61afebe438..a666a8c61e 100644
--- a/src/mainboard/msi/ms9282/Options.lb
+++ b/src/mainboard/msi/ms9282/Options.lb
@@ -23,7 +23,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -310,8 +310,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/nec/powermate2000/Options.lb b/src/mainboard/nec/powermate2000/Options.lb
index d5ac0ddbfa..3985c3c067 100644
--- a/src/mainboard/nec/powermate2000/Options.lb
+++ b/src/mainboard/nec/powermate2000/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -97,8 +97,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/newisys/khepri/Options.lb b/src/mainboard/newisys/khepri/Options.lb
index 00951829ce..041762eb5f 100644
--- a/src/mainboard/newisys/khepri/Options.lb
+++ b/src/mainboard/newisys/khepri/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -246,8 +246,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/nvidia/l1_2pvv/Options.lb b/src/mainboard/nvidia/l1_2pvv/Options.lb
index 781c558e90..2f455f4265 100644
--- a/src/mainboard/nvidia/l1_2pvv/Options.lb
+++ b/src/mainboard/nvidia/l1_2pvv/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -352,8 +352,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/olpc/btest/Options.lb b/src/mainboard/olpc/btest/Options.lb
index 1050cc7b2e..70ee04683c 100644
--- a/src/mainboard/olpc/btest/Options.lb
+++ b/src/mainboard/olpc/btest/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -162,8 +162,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL=8
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/olpc/rev_a/Options.lb b/src/mainboard/olpc/rev_a/Options.lb
index 1050cc7b2e..70ee04683c 100644
--- a/src/mainboard/olpc/rev_a/Options.lb
+++ b/src/mainboard/olpc/rev_a/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -162,8 +162,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL=8
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/pcengines/alix1c/Options.lb b/src/mainboard/pcengines/alix1c/Options.lb
index 0aa6f278a0..21f4398c01 100644
--- a/src/mainboard/pcengines/alix1c/Options.lb
+++ b/src/mainboard/pcengines/alix1c/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -198,8 +198,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL=8
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/rca/rm4100/Options.lb b/src/mainboard/rca/rm4100/Options.lb
index 0b6d0c97c5..0272905da2 100644
--- a/src/mainboard/rca/rm4100/Options.lb
+++ b/src/mainboard/rca/rm4100/Options.lb
@@ -19,7 +19,7 @@
##
uses CC
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses CONFIG_CONSOLE_SERIAL8250
uses CONFIG_CONSOLE_VGA
uses CONFIG_COMPRESSED_PAYLOAD_LZMA
@@ -95,8 +95,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL = 9
default MAINBOARD_VENDOR = "RCA"
default MAINBOARD_PART_NUMBER = "RM4100"
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/sunw/ultra40/Options.lb b/src/mainboard/sunw/ultra40/Options.lb
index 9a44422964..4a7e48cdbf 100644
--- a/src/mainboard/sunw/ultra40/Options.lb
+++ b/src/mainboard/sunw/ultra40/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -279,8 +279,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/supermicro/h8dme/Options.lb b/src/mainboard/supermicro/h8dme/Options.lb
index 3167501ca6..ba52d84eca 100644
--- a/src/mainboard/supermicro/h8dme/Options.lb
+++ b/src/mainboard/supermicro/h8dme/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -349,8 +349,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/supermicro/h8dmr/Options.lb b/src/mainboard/supermicro/h8dmr/Options.lb
index 906f61fb26..e65dfca0ed 100644
--- a/src/mainboard/supermicro/h8dmr/Options.lb
+++ b/src/mainboard/supermicro/h8dmr/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -349,8 +349,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/supermicro/x6dai_g/Options.lb b/src/mainboard/supermicro/x6dai_g/Options.lb
index 397808bcd2..576cdb8c3e 100644
--- a/src/mainboard/supermicro/x6dai_g/Options.lb
+++ b/src/mainboard/supermicro/x6dai_g/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -230,8 +230,8 @@ default CONFIG_CONSOLE_BTEXT=0
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/supermicro/x6dhe_g/Options.lb b/src/mainboard/supermicro/x6dhe_g/Options.lb
index 849b41d1df..bd31e7c14c 100644
--- a/src/mainboard/supermicro/x6dhe_g/Options.lb
+++ b/src/mainboard/supermicro/x6dhe_g/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -230,8 +230,8 @@ default CONFIG_CONSOLE_BTEXT=0
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/supermicro/x6dhe_g2/Options.lb b/src/mainboard/supermicro/x6dhe_g2/Options.lb
index 849b41d1df..bd31e7c14c 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Options.lb
+++ b/src/mainboard/supermicro/x6dhe_g2/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -230,8 +230,8 @@ default CONFIG_CONSOLE_BTEXT=0
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/supermicro/x6dhr_ig/Options.lb b/src/mainboard/supermicro/x6dhr_ig/Options.lb
index e2f0c30b6f..808fe21018 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Options.lb
+++ b/src/mainboard/supermicro/x6dhr_ig/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -229,8 +229,8 @@ default CONFIG_CONSOLE_BTEXT=0
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Options.lb b/src/mainboard/supermicro/x6dhr_ig2/Options.lb
index e2f0c30b6f..808fe21018 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Options.lb
+++ b/src/mainboard/supermicro/x6dhr_ig2/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -229,8 +229,8 @@ default CONFIG_CONSOLE_BTEXT=0
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/technexion/tim8690/Options.lb b/src/mainboard/technexion/tim8690/Options.lb
index 937211bcea..d4300898ec 100644
--- a/src/mainboard/technexion/tim8690/Options.lb
+++ b/src/mainboard/technexion/tim8690/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
diff --git a/src/mainboard/technologic/ts5300/Options.lb b/src/mainboard/technologic/ts5300/Options.lb
index 1179ac62e1..7f2ad59503 100644
--- a/src/mainboard/technologic/ts5300/Options.lb
+++ b/src/mainboard/technologic/ts5300/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -137,8 +137,8 @@ default CC="$(CROSS_COMPILE)gcc -m32"
default HOSTCC="gcc"
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/televideo/tc7020/Options.lb b/src/mainboard/televideo/tc7020/Options.lb
index 6c8762bdfb..f215c5a622 100644
--- a/src/mainboard/televideo/tc7020/Options.lb
+++ b/src/mainboard/televideo/tc7020/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -105,8 +105,8 @@ default DEFAULT_CONSOLE_LOGLEVEL = 6
default MAXIMUM_CONSOLE_LOGLEVEL = 6
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/thomson/ip1000/Options.lb b/src/mainboard/thomson/ip1000/Options.lb
index 2b57730e10..8b47189cce 100644
--- a/src/mainboard/thomson/ip1000/Options.lb
+++ b/src/mainboard/thomson/ip1000/Options.lb
@@ -19,7 +19,7 @@
##
uses CC
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses CONFIG_CONSOLE_SERIAL8250
uses CONFIG_CONSOLE_VGA
uses CONFIG_COMPRESSED_PAYLOAD_LZMA
@@ -95,8 +95,8 @@ default MAXIMUM_CONSOLE_LOGLEVEL = 9
default MAINBOARD_VENDOR = "THOMSON"
default MAINBOARD_PART_NUMBER = "IP1000"
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/totalimpact/briq/Options.lb b/src/mainboard/totalimpact/briq/Options.lb
index 2659c64014..1a25c9cfa1 100644
--- a/src/mainboard/totalimpact/briq/Options.lb
+++ b/src/mainboard/totalimpact/briq/Options.lb
@@ -3,7 +3,7 @@
##
uses TTYS0_DIV
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses TTYS0_BASE
uses CONFIG_BRIQ_750FX
uses CONFIG_BRIQ_7400
@@ -127,8 +127,8 @@ default CONFIG_BRIQ_750FX=1
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s1846/Options.lb b/src/mainboard/tyan/s1846/Options.lb
index 6e918ebaa9..e5ebc85be6 100644
--- a/src/mainboard/tyan/s1846/Options.lb
+++ b/src/mainboard/tyan/s1846/Options.lb
@@ -19,7 +19,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -99,8 +99,8 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s2735/Options.lb b/src/mainboard/tyan/s2735/Options.lb
index 05c0b4239e..affd13815c 100644
--- a/src/mainboard/tyan/s2735/Options.lb
+++ b/src/mainboard/tyan/s2735/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -256,8 +256,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s2850/Options.lb b/src/mainboard/tyan/s2850/Options.lb
index 030cea6fbc..f9317f7bd2 100644
--- a/src/mainboard/tyan/s2850/Options.lb
+++ b/src/mainboard/tyan/s2850/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -247,8 +247,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s2875/Options.lb b/src/mainboard/tyan/s2875/Options.lb
index 66622c2cf8..01daaa4e6f 100644
--- a/src/mainboard/tyan/s2875/Options.lb
+++ b/src/mainboard/tyan/s2875/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -248,8 +248,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s2880/Options.lb b/src/mainboard/tyan/s2880/Options.lb
index 6eaeadd660..8b37f911db 100644
--- a/src/mainboard/tyan/s2880/Options.lb
+++ b/src/mainboard/tyan/s2880/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -247,8 +247,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s2881/Options.lb b/src/mainboard/tyan/s2881/Options.lb
index 47a7cd1670..d83638715b 100644
--- a/src/mainboard/tyan/s2881/Options.lb
+++ b/src/mainboard/tyan/s2881/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -264,8 +264,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s2882/Options.lb b/src/mainboard/tyan/s2882/Options.lb
index 415a65fa48..9e6b36db70 100644
--- a/src/mainboard/tyan/s2882/Options.lb
+++ b/src/mainboard/tyan/s2882/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -247,8 +247,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s2885/Options.lb b/src/mainboard/tyan/s2885/Options.lb
index ece2a78905..88e7bf2790 100644
--- a/src/mainboard/tyan/s2885/Options.lb
+++ b/src/mainboard/tyan/s2885/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -274,8 +274,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s2891/Options.lb b/src/mainboard/tyan/s2891/Options.lb
index c9f96167da..b0250fc850 100644
--- a/src/mainboard/tyan/s2891/Options.lb
+++ b/src/mainboard/tyan/s2891/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -307,8 +307,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s2892/Options.lb b/src/mainboard/tyan/s2892/Options.lb
index 07c13f3a9d..e50806f57e 100644
--- a/src/mainboard/tyan/s2892/Options.lb
+++ b/src/mainboard/tyan/s2892/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -295,8 +295,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s2895/Options.lb b/src/mainboard/tyan/s2895/Options.lb
index ba835f729c..df0b2ea3b5 100644
--- a/src/mainboard/tyan/s2895/Options.lb
+++ b/src/mainboard/tyan/s2895/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -314,8 +314,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s2912/Options.lb b/src/mainboard/tyan/s2912/Options.lb
index f2e57f89ef..7222788349 100644
--- a/src/mainboard/tyan/s2912/Options.lb
+++ b/src/mainboard/tyan/s2912/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -354,8 +354,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s2912_fam10/Options.lb b/src/mainboard/tyan/s2912_fam10/Options.lb
index 425a7b0f94..0e9b91ce38 100644
--- a/src/mainboard/tyan/s2912_fam10/Options.lb
+++ b/src/mainboard/tyan/s2912_fam10/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses HAVE_ACPI_TABLES
uses HAVE_ACPI_RESUME
@@ -362,8 +362,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s4880/Options.lb b/src/mainboard/tyan/s4880/Options.lb
index 604733ee03..485ab8397b 100644
--- a/src/mainboard/tyan/s4880/Options.lb
+++ b/src/mainboard/tyan/s4880/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -256,8 +256,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/tyan/s4882/Options.lb b/src/mainboard/tyan/s4882/Options.lb
index f7b3bfed6c..e5eadf414f 100644
--- a/src/mainboard/tyan/s4882/Options.lb
+++ b/src/mainboard/tyan/s4882/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -255,8 +255,8 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
### End Options.lb
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/via/epia-cn/Options.lb b/src/mainboard/via/epia-cn/Options.lb
index 7418127c19..3e965b284b 100644
--- a/src/mainboard/via/epia-cn/Options.lb
+++ b/src/mainboard/via/epia-cn/Options.lb
@@ -20,7 +20,7 @@
##
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -82,7 +82,7 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
default HAVE_HARD_RESET = 0
default HAVE_PIRQ_TABLE = 1
default IRQ_SLOT_COUNT = 9
-default HAVE_ACPI_TABLES = 0
+default HAVE_ACPI_TABLES = 1
default HAVE_OPTION_TABLE = 1
default ROM_IMAGE_SIZE = 64 * 1024
default FALLBACK_SIZE = ROM_SIZE
@@ -106,8 +106,8 @@ default CONFIG_MAX_PCI_BUSES = 3
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/via/epia-m/Options.lb b/src/mainboard/via/epia-m/Options.lb
index 30668f54dc..5781156c49 100644
--- a/src/mainboard/via/epia-m/Options.lb
+++ b/src/mainboard/via/epia-m/Options.lb
@@ -1,5 +1,5 @@
uses HAVE_MP_TABLE
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
uses HAVE_FALLBACK_BOOT
@@ -145,8 +145,8 @@ default CONFIG_CONSOLE_SERIAL8250=1
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/via/epia/Options.lb b/src/mainboard/via/epia/Options.lb
index 8338434255..6e4856c543 100644
--- a/src/mainboard/via/epia/Options.lb
+++ b/src/mainboard/via/epia/Options.lb
@@ -1,5 +1,5 @@
uses MAXIMUM_CONSOLE_LOGLEVEL
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses DEFAULT_CONSOLE_LOGLEVEL
uses CONFIG_CONSOLE_SERIAL8250
uses TTYS0_BAUD
@@ -143,8 +143,8 @@ default HOSTCC="gcc"
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/src/mainboard/via/pc2500e/Options.lb b/src/mainboard/via/pc2500e/Options.lb
index 518393475b..c19f2cd529 100644
--- a/src/mainboard/via/pc2500e/Options.lb
+++ b/src/mainboard/via/pc2500e/Options.lb
@@ -19,7 +19,7 @@
##
uses CONFIG_SMP
-uses CONFIG_ROMFS
+uses CONFIG_CBFS
uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE
@@ -114,8 +114,8 @@ default DEFAULT_CONSOLE_LOGLEVEL = 9
#
-# ROMFS
+# CBFS
#
#
-default CONFIG_ROMFS=0
+default CONFIG_CBFS=0
end
diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index b7d9c69ef7..02e04b1ff6 100644
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -2224,11 +2224,11 @@ def writemakefile(path):
file = safe_open(makefilepath, 'w+')
writemakefileheader(file, makefilepath)
- # Hack to get the necessary settings (CONFIG_ROMFS):
+ # Hack to get the necessary settings (CONFIG_CBFS):
file.write("include %s/Makefile.settings\n\n" % romimages.keys()[0])
# main rule
- file.write("ifeq \"$(CONFIG_ROMFS)\" \"1\"\n")
+ file.write("ifeq \"$(CONFIG_CBFS)\" \"1\"\n")
file.write("\nall: ")
for i in buildroms:
file.write(" %sfs" % i.name)
@@ -2240,8 +2240,8 @@ def writemakefile(path):
file.write("\n")
file.write("endif\n\n")
- # romtool rules
- file.write("\nromtool:\n\tmkdir -p tools/lzma\n\t$(MAKE) -C $(TOP)/util/romtool obj=$(shell pwd)\n\n")
+ # cbfstool rules
+ file.write("\ncbfstool:\n\tmkdir -p tools/lzma\n\t$(MAKE) -C $(TOP)/util/cbfstool obj=$(shell pwd)\n\n")
file.write("include Makefile.settings\n\n")
for i, o in romimages.items():
@@ -2278,17 +2278,17 @@ def writemakefile(path):
romsize = getoption("ROM_SIZE", image)
# i.name? That can not be right, can it?
- file.write("%sfs: %s romtool\n" %(i.name,i.name));
- file.write("\trm -f coreboot.romfs\n");
- file.write("\t./romtool %sfs create %s %s %s.bootblock\n" % (i.name, romsize, bootblocksize, i.name))
+ file.write("%sfs: %s cbfstool\n" %(i.name,i.name));
+ file.write("\trm -f coreboot.cbfs\n");
+ file.write("\t./cbfstool %sfs create %s %s %s.bootblock\n" % (i.name, romsize, bootblocksize, i.name))
for i in buildroms:
for j in i.roms:
#failover is a hack that will go away soon.
if (j != "failover") and (rommapping[j] != "/dev/null"):
- file.write("\tif [ -f %s/romfs-support ]; then ./romtool %sfs add-payload %s %s/payload `cat %s/romfs-support`; fi\n" % (j, i.name, rommapping[j], j, j))
- file.write("\t ./romtool %sfs print\n" % i.name)
+ file.write("\tif [ -f %s/cbfs-support ]; then ./cbfstool %sfs add-payload %s %s/payload `cat %s/cbfs-support`; fi\n" % (j, i.name, rommapping[j], j, j))
+ file.write("\t ./cbfstool %sfs print\n" % i.name)
- file.write(".PHONY: all clean romtool")
+ file.write(".PHONY: all clean cbfstool")
for i in romimages.keys():
file.write(" %s-clean" % i)
for i, o in romimages.items():