- To reduce confuse rename the parts of linuxbios bios that run from

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

diff --git a/src/config/Options.lb b/src/config/Options.lb
index db00c51b8479e524cabb3f4dc73382617c15609b..eb6736f5deeb59d472898768cbb5669f0b0b315b 100644 (file)
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -61,30 +61,10 @@ define ARCH
        export always
        comment "Default architecture is i386, options are alpha and ppc"
 end
-define k7
-       default none
-       export used
-       comment "We're a k7"
-end
-define k8
-       default none
-       export used
-       comment "We're a k8"
-end
-define i586
-       default none
-       export used
-       comment "We're a 586"
-end
-define i686
-       default none
-       export used
-       comment "We're a 686"
-end
-define CPU_FIXUP
-       default none
-       export used
-       comment "Do CPU fixups"
+define HAVE_MOVNTI
+       default 0
+       export always
+       comment "This cpu supports the MOVNTI directive"
 end
 
 ###############################################
@@ -117,54 +97,64 @@ define OBJCOPY
        comment "Objcopy command"
 end
 define LINUXBIOS_VERSION
-       default "1.1.6"
+       default "1.1.7"
        export always
+       format "\"%s\""
        comment "LinuxBIOS version"
 end
 define LINUXBIOS_EXTRA_VERSION
         default ""
         export used
+       format "\"%s\""
         comment "LinuxBIOS extra version"
 end
 define LINUXBIOS_BUILD
        default "$(shell date)"
        export always
+       format "\"%s\""
        comment "Build date"
 end
 define LINUXBIOS_COMPILE_TIME
        default "$(shell date +%T)"
        export always
+       format "\"%s\""
        comment "Build time"
 end
 define LINUXBIOS_COMPILE_BY
        default "$(shell whoami)"
        export always
+       format "\"%s\""
        comment "Who build this image"
 end
 define LINUXBIOS_COMPILE_HOST
        default "$(shell hostname)"
        export always
+       format "\"%s\""
        comment "Build host"
 end
 
 define LINUXBIOS_COMPILE_DOMAIN
        default "$(shell dnsdomainname)"
        export always
+       format "\"%s\""
        comment "Build domain name"
 end
 define LINUXBIOS_COMPILER
        default "$(shell $(CC) $(CFLAGS) -v 2>&1 | tail -n 1)"
        export always
+       format "\"%s\""
        comment "Build compiler"
 end
 define LINUXBIOS_LINKER
        default "$(shell  $(CC) -Wl,-v 2>&1 | grep version | tail -n 1)"
        export always
+       format "\"%s\""
        comment "Build linker"
 end
 define LINUXBIOS_ASSEMBLER
        default "$(shell  touch dummy.s ; $(CC) -c -Wa,-v dummy.s 2>&1; rm -f dummy.s dummy.o )"
        export always
+       format "\"%s\""
        comment "Build assembler"
 end
 define CONFIG_CHIP_CONFIGURE
@@ -459,13 +449,26 @@ end
 define MAINBOARD_PART_NUMBER
        default "Part_number_not_set"
        export always
+       format "\"%s\""
        comment "Part number of mainboard"
 end
 define MAINBOARD_VENDOR
        default "Vendor_not_set"
        export always
+       format "\"%s\""
        comment "Vendor of mainboard"
 end
+define MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+       default 0
+       export always
+       comment "PCI Vendor ID of mainboard manufacturer"
+end
+define MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+       default 0
+       format "0x%x"
+       export always
+       comment "PCI susbsystem device id assigned my mainboard manufacturer"
+end
 define MAINBOARD_POWER_ON_AFTER_POWER_FAIL
        default none
        export used
@@ -500,11 +503,6 @@ define CONFIG_MAX_CPUS
         export always
         comment "Maximum CPU count for this machine"
 end
-define CONFIG_MAX_PHYSICAL_CPUS
-       default {CONFIG_MAX_CPUS}
-       export always
-       comment "Physical CPU count for this machine"
-end
 define CONFIG_LOGICAL_CPUS
        default 0
        export always
@@ -679,6 +677,17 @@ end
 # Misc options
 ###############################################
 
+define CONFIG_GDB_STUB
+       default 0
+       export used
+       comment "Compile in gdb stub support?"
+end
+
+define HAVE_INIT_TIMER
+       default 0
+       export always
+       comment "Have a init_timer function"
+end
 define HAVE_HARD_RESET
        default none
        export used