- First pass through with with device tree enhancement merge. Most of the mechanisms should

  be in place but don't expect anything to quite work yet.


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1662 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

3 files changed, 36 insertions, 8 deletions

diff --git a/src/config/Config.lb b/src/config/Config.lb
index f6026d4950..70b3dc9630 100644
--- a/src/config/Config.lb
+++ b/src/config/Config.lb
@@ -2,7 +2,7 @@
 
 uses HAVE_OPTION_TABLE
 
-makedefine CPP:= $(CC) -no-gcc -x assembler-with-cpp -DASSEMBLY -E
+makedefine CPP:= $(CC) -x assembler-with-cpp -DASSEMBLY -E
 makedefine LIBGCC_FILE_NAME := $(shell $(CC) -print-libgcc-file-name)
 makedefine GCC_INC_DIR := $(shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
 
diff --git a/src/config/Options.lb b/src/config/Options.lb
index db00c51b84..bf9fed8dee 100644
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -81,6 +81,11 @@ define i686
 	export used
 	comment "We're a 686"
 end
+define i786
+	default none
+	export used
+	comment "We're a 786"
+end
 define CPU_FIXUP
 	default none
 	export used
@@ -119,52 +124,62 @@ end
 define LINUXBIOS_VERSION
 	default "1.1.6"
 	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 +474,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 +528,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
diff --git a/src/config/linuxbios_c.ld b/src/config/linuxbios_c.ld
index c05a4c995e..6fa311fc0e 100644
--- a/src/config/linuxbios_c.ld
+++ b/src/config/linuxbios_c.ld
@@ -48,6 +48,9 @@ SECTIONS
 		pci_drivers = . ;
 		*(.rodata.pci_driver)
 		epci_drivers = . ;
+		cpu_drivers = . ;
+		*(.rodata.cpu_driver)
+		ecpu_drivers = . ;
 		*(.rodata)
 		*(.rodata.*)
 		/*
@@ -84,10 +87,11 @@ SECTIONS
 	}
 	_ebss = .;
 	_end = .;
+	. = ALIGN(STACK_SIZE);
 	_stack = .;
 	.stack . : {
-		/* Reserve a stack for each possible cpu, +1 extra */
-		. = ((CONFIG_MAX_CPUS * STACK_SIZE) + STACK_SIZE) ; 
+		/* Reserve a stack for each possible cpu */
+		. = (CONFIG_MAX_CPUS * STACK_SIZE) ;
 	}
 	_estack = .;
 	_heap = .;
@@ -105,5 +109,6 @@ SECTIONS
 	/DISCARD/ : {
 		*(.comment)
 		*(.note)
+		*(.note.*)
 	}
 }