Author: hailfinger Date: 2008-07-20 23:05:25 +0200 (Sun, 20 Jul 2008) New Revision: 697
Modified: coreboot-v3/arch/x86/coreboot_table.c 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: Rename mainboard_part_number to mainboard_name in various places. This is the logical continuation of r416 which happened a year ago.
As an added bonus, we now have consistent naming again, making grepping the source for dts properties possible.
Build tested on all targets. Patch attached for Gmail users.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net Acked-by: Ronald G. Minnich rminnich@gmail.com
Modified: coreboot-v3/arch/x86/coreboot_table.c =================================================================== --- coreboot-v3/arch/x86/coreboot_table.c 2008-07-14 23:04:48 UTC (rev 696) +++ coreboot-v3/arch/x86/coreboot_table.c 2008-07-20 21:05:25 UTC (rev 697) @@ -142,14 +142,14 @@ { struct lb_record *rec; struct lb_mainboard *mainboard; - extern char *mainboard_vendor, *mainboard_part_number; + extern char *mainboard_vendor, *mainboard_name; rec = lb_new_record(header); mainboard = (struct lb_mainboard *)rec; mainboard->tag = LB_TAG_MAINBOARD;
mainboard->size = (sizeof(*mainboard) + strlen(mainboard_vendor) + 1 + - strlen(mainboard_part_number) + 1 + + strlen(mainboard_name) + 1 + 3) & ~3;
mainboard->vendor_idx = 0; @@ -158,7 +158,7 @@ memcpy(mainboard->strings + mainboard->vendor_idx, mainboard_vendor, strlen(mainboard_vendor) + 1); memcpy(mainboard->strings + mainboard->part_number_idx, - mainboard_part_number, strlen(mainboard_part_number) + 1); + mainboard_name, strlen(mainboard_name) + 1);
return mainboard; }
Modified: coreboot-v3/mainboard/adl/msm800sev/dts =================================================================== --- coreboot-v3/mainboard/adl/msm800sev/dts 2008-07-14 23:04:48 UTC (rev 696) +++ coreboot-v3/mainboard/adl/msm800sev/dts 2008-07-20 21:05:25 UTC (rev 697) @@ -22,7 +22,7 @@
/{ mainboard_vendor = "Advanced Digital Logic"; - mainboard-name = "MSM800SEV"; + mainboard_name = "MSM800SEV"; mainboard_pci_subsystem_vendor = "0x1022"; mainboard_pci_subsystem_device = "0x2323"; cpus { };
Modified: coreboot-v3/mainboard/amd/db800/dts =================================================================== --- coreboot-v3/mainboard/amd/db800/dts 2008-07-14 23:04:48 UTC (rev 696) +++ coreboot-v3/mainboard/amd/db800/dts 2008-07-20 21:05:25 UTC (rev 697) @@ -20,7 +20,7 @@
/{ mainboard_vendor = "AMD"; - mainboard-name = "DB800"; + mainboard_name = "DB800"; mainboard_pci_subsystem_vendor = "0x1022"; mainboard_pci_subsystem_device = "0x2323"; cpus { };
Modified: coreboot-v3/mainboard/amd/norwich/dts =================================================================== --- coreboot-v3/mainboard/amd/norwich/dts 2008-07-14 23:04:48 UTC (rev 696) +++ coreboot-v3/mainboard/amd/norwich/dts 2008-07-20 21:05:25 UTC (rev 697) @@ -20,7 +20,7 @@
/{ mainboard_vendor = "AMD"; - mainboard-name = "NORWICH"; + mainboard_name = "NORWICH"; mainboard_pci_subsystem_vendor = "0x1022"; mainboard_pci_subsystem_device = "0x2323"; cpus { };
Modified: coreboot-v3/mainboard/artecgroup/dbe61/dts =================================================================== --- coreboot-v3/mainboard/artecgroup/dbe61/dts 2008-07-14 23:04:48 UTC (rev 696) +++ coreboot-v3/mainboard/artecgroup/dbe61/dts 2008-07-20 21:05:25 UTC (rev 697) @@ -74,7 +74,7 @@
/{ mainboard_vendor = "Artec Group"; - mainboard-name = "DBE61"; + mainboard_name = "DBE61"; mainboard_pci_subsystem_vendor = "0x1022"; mainboard_pci_subsystem_device = "0x2323"; cpus { };
Modified: coreboot-v3/mainboard/artecgroup/dbe62/dts =================================================================== --- coreboot-v3/mainboard/artecgroup/dbe62/dts 2008-07-14 23:04:48 UTC (rev 696) +++ coreboot-v3/mainboard/artecgroup/dbe62/dts 2008-07-20 21:05:25 UTC (rev 697) @@ -20,7 +20,7 @@
/{ mainboard_vendor = "Artec"; - mainboard-name = "DBE62"; + mainboard_name = "DBE62"; cpus { }; apic@0 { /config/("northbridge/amd/geodelx/apic");
Modified: coreboot-v3/mainboard/emulation/qemu-x86/dts =================================================================== --- coreboot-v3/mainboard/emulation/qemu-x86/dts 2008-07-14 23:04:48 UTC (rev 696) +++ coreboot-v3/mainboard/emulation/qemu-x86/dts 2008-07-20 21:05:25 UTC (rev 697) @@ -20,7 +20,7 @@
/{ mainboard_vendor = "Emulation"; - mainboard-name = "QEMU x86"; + mainboard_name = "QEMU x86"; mainboard_pci_subsystem_vendor = "0x15ad"; mainboard_pci_subsystem_device = "0x1976"; device_operations = "qemuvga_pci_ops_dev";
Modified: coreboot-v3/mainboard/pcengines/alix1c/dts =================================================================== --- coreboot-v3/mainboard/pcengines/alix1c/dts 2008-07-14 23:04:48 UTC (rev 696) +++ coreboot-v3/mainboard/pcengines/alix1c/dts 2008-07-20 21:05:25 UTC (rev 697) @@ -20,7 +20,7 @@
/{ mainboard_vendor = "PC Engines"; - mainboard-name = "ALIX1.C"; + mainboard_name = "ALIX1.C"; cpus { }; apic@0 { /config/("northbridge/amd/geodelx/apic");
Modified: coreboot-v3/mainboard/pcengines/alix2c3/dts =================================================================== --- coreboot-v3/mainboard/pcengines/alix2c3/dts 2008-07-14 23:04:48 UTC (rev 696) +++ coreboot-v3/mainboard/pcengines/alix2c3/dts 2008-07-20 21:05:25 UTC (rev 697) @@ -20,7 +20,7 @@
/{ mainboard_vendor = "PC Engines"; - mainboard-name = "ALIX.2C3"; + mainboard_name = "ALIX.2C3"; cpus { }; apic@0 { /config/("northbridge/amd/geodelx/apic");
Modified: coreboot-v3/util/dtc/flattree.c =================================================================== --- coreboot-v3/util/dtc/flattree.c 2008-07-14 23:04:48 UTC (rev 696) +++ coreboot-v3/util/dtc/flattree.c 2008-07-20 21:05:25 UTC (rev 697) @@ -1328,7 +1328,7 @@ extern char *code; struct node *next; extern struct node *first_node; - int found_mainboard_vendor = 0, found_mainboard_partnumber = 0, found_mainboard_subsys = 0; + int found_mainboard_vendor = 0, found_mainboard_name = 0, found_mainboard_subsys = 0;
labeltree(bi->dt);
@@ -1357,9 +1357,9 @@ found_mainboard_vendor = 1; fprintf(f, "const char *mainboard_vendor = "%s";\n", prop->val.val); } - if (streq(prop->name, "mainboard-name")){ - found_mainboard_partnumber = 1; - fprintf(f, "const char *mainboard_part_number = "%s";\n", prop->val.val); + if (streq(prop->name, "mainboard_name")){ + found_mainboard_name = 1; + fprintf(f, "const char *mainboard_name = "%s";\n", prop->val.val); } if (streq(prop->name, "mainboard_pci_subsystem_vendor")){ found_mainboard_subsys++; @@ -1373,11 +1373,11 @@
if (! found_mainboard_vendor){ die("There is no mainboard_vendor property in the root. Please add one." - "(and make sure there is a mainboard-name property too"); + "(and make sure there is a mainboard_name property too"); }
- if (! found_mainboard_partnumber){ - die("There is no mainboard-name property in the root. " + if (! found_mainboard_name){ + die("There is no mainboard_name property in the root. " "Please add one." "(and make sure there is a mainboard_vendor property too"); } @@ -1436,7 +1436,7 @@ fix_next(bi->dt); /* emit any includes that we need -- TODO: ONLY ONCE PER TYPE*/ fprintf(f, "#include <device/device.h>\n#include <device/pci.h>\n"); - fprintf(f, "extern const char *mainboard_vendor, *mainboard_part_number;\n"); + fprintf(f, "extern const char *mainboard_vendor, *mainboard_name;\n");
for_each_property(bi->dt, prop) { if (streq(prop->name, "mainboard_pci_subsystem_vendor")){