v2/src romfs->cbfs rename

[coreboot.git] / src / config / Options.lb

diff --git a/src/config/Options.lb b/src/config/Options.lb
index 1ad1ef8ca43d11fb55d8e717763ce363aeec2640..7bcba27e04b1dfdf583c9adc027c3144a615fb0d 100644 (file)
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -146,7 +146,7 @@ define COREBOOT_COMPILER
        comment "Build compiler"
 end
 define COREBOOT_LINKER
-       default "$(shell  $(CC) -Wl,--version 2>&1 | grep version | tail -n 1)"
+       default "$(shell  $(CC) -Wl,--version 2>&1 | grep \" ld\")"
        export always
        format "\"%s\""
        comment "Build linker"
@@ -679,6 +679,11 @@ define CONFIG_FS_FAT
        export always
        comment "Enable FAT filesystem support"
 end
+define CONFIG_CBFS
+       default 0
+       export always
+       comment "The new CBFS file system"
+end
 define AUTOBOOT_DELAY
        default 2
        export always
@@ -738,7 +743,7 @@ define HAVE_PIRQ_TABLE
 end
 define PIRQ_ROUTE
        default 0
-       export used
+       export always
        comment "Define if we have a PIRQ table and want routing IRQs"
 end
 define IRQ_SLOT_COUNT
@@ -849,12 +854,6 @@ end
 # Misc options
 ###############################################
 
-define CONFIG_CHIP_NAME
-       default 0
-       export always
-       comment "Compile in the chip name"
-end
-
 define CONFIG_GDB_STUB
        default 0
        export used
@@ -928,6 +927,12 @@ define HAVE_ACPI_TABLES
        comment "Define to build ACPI tables"
 end
 
+define HAVE_ACPI_RESUME
+       default 0
+       export always
+       comment "Define to build ACPI with resume support"
+end
+
 define ACPI_SSDTX_NUM
        default 0
        export always
@@ -1087,6 +1092,19 @@ define CONFIG_PCI_OPTION_ROM_RUN_YABEL
        comment "Use Yabel instead of old bios emulator"
 end
 
+define CONFIG_YABEL_DEBUG_FLAGS
+       default 0
+       export used
+       comment "YABEL debug flags, for possible values, see util/x86emu/yabel/debug.h"
+end
+
+define CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES
+       default 0
+       export used
+       comment "Allow Option ROMs executed by YABEL to access the config space of devices other than the one YABEL is running for. This may be needed by some onboard Graphics cards ROMs."
+
+end
+
 define CONFIG_PCI_OPTION_ROM_RUN_VM86
        default 0
        export used