r694 - in coreboot-v3: mainboard/adl/msm800sev mainboard/amd/db800 mainboard/amd/norwich mainboard/artecgroup/dbe61 mainboard/artecgroup/dbe62 mainboard/emulation/qemu-x86 mainboard/pcengines/alix1c mainboard/pcengines/alix2c3 util/dtc

Author: hailfinger
Date: 2008-07-11 14:33:46 +0200 (Fri, 11 Jul 2008)
New Revision: 694

Modified:
   coreboot-v3/mainboard/adl/msm800sev/dts
   coreboot-v3/mainboard/amd/db800/dts
   coreboot-v3/mainboard/amd/norwich/dts
   coreboot-v3/mainboard/artecgroup/dbe61/dts
   coreboot-v3/mainboard/artecgroup/dbe62/dts
   coreboot-v3/mainboard/emulation/qemu-x86/dts
   coreboot-v3/mainboard/pcengines/alix1c/dts
   coreboot-v3/mainboard/pcengines/alix2c3/dts
   coreboot-v3/util/dtc/flattree.c
Log:
Makes mainboard-vendor naming more consistent.
mainboard-name naming has been postponed because it's not clear what the
real name should be.

Generated code is identical to the state before the patch.
Compile tested.

Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: Uwe Hermann

Modified: coreboot-v3/mainboard/adl/msm800sev/dts
===================================================================
--- coreboot-v3/mainboard/adl/msm800sev/dts	2008-07-09 21:21:39 UTC (rev 693)
+++ coreboot-v3/mainboard/adl/msm800sev/dts	2008-07-11 12:33:46 UTC (rev 694)
@@ -21,7 +21,7 @@
  */

/{
-	mainboard-vendor = "Advanced Digital Logic";
+	mainboard_vendor = "Advanced Digital Logic";
    mainboard-name = "MSM800SEV";
    mainboard_pci_subsystem_vendor = "0x1022";
    mainboard_pci_subsystem_device = "0x2323";

Modified: coreboot-v3/mainboard/amd/db800/dts
===================================================================
--- coreboot-v3/mainboard/amd/db800/dts	2008-07-09 21:21:39 UTC (rev 693)
+++ coreboot-v3/mainboard/amd/db800/dts	2008-07-11 12:33:46 UTC (rev 694)
@@ -19,7 +19,7 @@
  */

/{
-	mainboard-vendor = "AMD";
+	mainboard_vendor = "AMD";
    mainboard-name = "DB800";
    mainboard_pci_subsystem_vendor = "0x1022";
    mainboard_pci_subsystem_device = "0x2323";

Modified: coreboot-v3/mainboard/amd/norwich/dts
===================================================================
--- coreboot-v3/mainboard/amd/norwich/dts	2008-07-09 21:21:39 UTC (rev 693)
+++ coreboot-v3/mainboard/amd/norwich/dts	2008-07-11 12:33:46 UTC (rev 694)
@@ -19,7 +19,7 @@
  */

/{
-	mainboard-vendor = "AMD";
+	mainboard_vendor = "AMD";
    mainboard-name = "NORWICH";
    mainboard_pci_subsystem_vendor = "0x1022";
    mainboard_pci_subsystem_device = "0x2323";

Modified: coreboot-v3/mainboard/artecgroup/dbe61/dts
===================================================================
--- coreboot-v3/mainboard/artecgroup/dbe61/dts	2008-07-09 21:21:39 UTC (rev 693)
+++ coreboot-v3/mainboard/artecgroup/dbe61/dts	2008-07-11 12:33:46 UTC (rev 694)
@@ -73,7 +73,7 @@
 */

/{
-	mainboard-vendor = "Artec Group";
+	mainboard_vendor = "Artec Group";
    mainboard-name = "DBE61";
    mainboard_pci_subsystem_vendor = "0x1022";
    mainboard_pci_subsystem_device = "0x2323";

Modified: coreboot-v3/mainboard/artecgroup/dbe62/dts
===================================================================
--- coreboot-v3/mainboard/artecgroup/dbe62/dts	2008-07-09 21:21:39 UTC (rev 693)
+++ coreboot-v3/mainboard/artecgroup/dbe62/dts	2008-07-11 12:33:46 UTC (rev 694)
@@ -19,7 +19,7 @@
  */

/{
-	mainboard-vendor = "Artec";
+	mainboard_vendor = "Artec";
    mainboard-name = "DBE62";
    cpus { };
    apic@0 {

Modified: coreboot-v3/mainboard/emulation/qemu-x86/dts
===================================================================
--- coreboot-v3/mainboard/emulation/qemu-x86/dts	2008-07-09 21:21:39 UTC (rev 693)
+++ coreboot-v3/mainboard/emulation/qemu-x86/dts	2008-07-11 12:33:46 UTC (rev 694)
@@ -19,7 +19,7 @@
  */

/{
-	mainboard-vendor = "Emulation";
+	mainboard_vendor = "Emulation";
    mainboard-name = "QEMU x86";
    mainboard_pci_subsystem_vendor = "0x15ad";
    mainboard_pci_subsystem_device = "0x1976";

Modified: coreboot-v3/mainboard/pcengines/alix1c/dts
===================================================================
--- coreboot-v3/mainboard/pcengines/alix1c/dts	2008-07-09 21:21:39 UTC (rev 693)
+++ coreboot-v3/mainboard/pcengines/alix1c/dts	2008-07-11 12:33:46 UTC (rev 694)
@@ -19,7 +19,7 @@
  */

/{
-	mainboard-vendor = "PC Engines";
+	mainboard_vendor = "PC Engines";
    mainboard-name = "ALIX1.C";
    cpus { };
    apic@0 {

Modified: coreboot-v3/mainboard/pcengines/alix2c3/dts
===================================================================
--- coreboot-v3/mainboard/pcengines/alix2c3/dts	2008-07-09 21:21:39 UTC (rev 693)
+++ coreboot-v3/mainboard/pcengines/alix2c3/dts	2008-07-11 12:33:46 UTC (rev 694)
@@ -19,7 +19,7 @@
  */

/{
-	mainboard-vendor = "PC Engines";
+	mainboard_vendor = "PC Engines";
    mainboard-name = "ALIX.2C3";
    cpus { };
    apic@0 {

Modified: coreboot-v3/util/dtc/flattree.c
===================================================================
--- coreboot-v3/util/dtc/flattree.c	2008-07-09 21:21:39 UTC (rev 693)
+++ coreboot-v3/util/dtc/flattree.c	2008-07-11 12:33:46 UTC (rev 694)
@@ -1353,7 +1353,7 @@

/* special for the root. Emit the names for the mainboard vendor and part # */
    for_each_property(bi->dt, prop) {
-		if (streq(prop->name, "mainboard-vendor")){
+		if (streq(prop->name, "mainboard_vendor")){
    		found_mainboard_vendor = 1;
    		fprintf(f, "const char *mainboard_vendor = "%s";\n", prop->val.val);
    	}
@@ -1372,14 +1372,14 @@
    }

if (! 	found_mainboard_vendor){
-		die("There is no mainboard-vendor property in the root. Please add one."
+		die("There is no mainboard_vendor property in the root. Please add one."
    		"(and make sure there is a mainboard-name property too");
    }

if (! 	found_mainboard_partnumber){
    	die("There is no mainboard-name property in the root. "
    		"Please add one."
-			"(and make sure there is a mainboard-vendor property too");
+			"(and make sure there is a mainboard_vendor property too");
    }

switch (found_mainboard_subsys) {