This, ladies and gentlement, is commit #4000.

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

diff --git a/src/config/Options.lb b/src/config/Options.lb
index 2301905712bdb9a23c7a343d60c6bd7beecb5069..88f57e2879b358c42383d847fa5f2fa91b97f508 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
 ###############################################
@@ -408,9 +414,9 @@ end
 ###############################################
 
 define DEBUG
-       default 1
+       default 0
        export always
-       comment "Enable debugging code"
+       comment "Enable x86emu debugging code"
 end
 define CONFIG_CONSOLE_VGA
        default 0
@@ -501,8 +507,12 @@ define CONFIG_USE_PRINTK_IN_CAR
        export always
        comment "use printk instead of print in CAR stage code"
 end
+define ASSEMBLER_DEBUG
+       default 0
+       export always
+       comment "Create disassembly files for debugging"
+end
 
-       
 ###############################################
 # Mainboard options
 ###############################################
@@ -862,8 +872,8 @@ define HAVE_HARD_RESET
        comment "Have hard reset"
 end
 define HAVE_SMI_HANDLER
-       default none
-       export used
+       default 0
+       export always
        comment "Set, if the board needs an SMI handler"
 end
 define MEMORY_HOLE
@@ -973,6 +983,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
@@ -1064,6 +1081,18 @@ 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_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
@@ -1107,6 +1136,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