v2/src romfs->cbfs rename

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

diff --git a/src/config/Options.lb b/src/config/Options.lb
index bb141d008eca67bed3d020691d47c3d6a13250dc..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"
@@ -168,6 +168,12 @@ define CONFIG_USE_INIT
        comment "Use stage 1 initialization code"
 end
 
+define COREBOOT_V2
+       default 1
+       export always
+       comment "This is used by code to determine v2 vs v3"
+end
+
 ###############################################
 # ROM image options
 ###############################################
@@ -673,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
@@ -732,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
@@ -843,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
@@ -922,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
@@ -977,6 +988,13 @@ define MMCONF_SUPPORT_DEFAULT
        comment "enable mmconfig for pci conf"
 end
 
+define MMCONF_BASE_ADDRESS
+       default none
+       format "0x%x"
+       export used
+       comment "enable mmconfig base address"
+end
+
 define HW_MEM_HOLE_SIZEK
         default 0
         export always
@@ -1068,6 +1086,31 @@ define CONFIG_PCI_ROM_RUN
        comment "Init x86 ROMs on all PCI devices"
 end
 
+define CONFIG_PCI_OPTION_ROM_RUN_YABEL
+       default 0
+       export used
+       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
+       comment "Use Yabel instead of old bios emulator"
+end
+
 define CONFIG_PCI_64BIT_PREF_MEM
         default 0
         export always
@@ -1111,6 +1154,18 @@ define HAVE_MAINBOARD_RESOURCES
        comment "Enable if the mainboard/chipset requires extra entries in the memory map"
 end
 
+define HAVE_LOW_TABLES
+       default 1
+       export always
+       comment "Enable if ACPI, PIRQ, MP tables are supposed to live in the low megabyte"
+end
+
+define HAVE_HIGH_TABLES
+       default 0
+       export always
+       comment "Enable if ACPI, PIRQ, MP tables are supposed to live at top of memory"
+end
+
 define CONFIG_SPLASH_GRAPHIC
        default 0
        export used