diff --git a/mainboard/adl/msm800sev/dts b/mainboard/adl/msm800sev/dts index 490fbf1733..e52ff53917 100644 --- a/mainboard/adl/msm800sev/dts +++ b/mainboard/adl/msm800sev/dts @@ -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"; diff --git a/mainboard/amd/db800/dts b/mainboard/amd/db800/dts index 5ef63f0db2..1541e7589c 100644 --- a/mainboard/amd/db800/dts +++ b/mainboard/amd/db800/dts @@ -19,7 +19,7 @@ */ /{ - mainboard-vendor = "AMD"; + mainboard_vendor = "AMD"; mainboard-name = "DB800"; mainboard_pci_subsystem_vendor = "0x1022"; mainboard_pci_subsystem_device = "0x2323"; diff --git a/mainboard/amd/norwich/dts b/mainboard/amd/norwich/dts index 230c4d223d..b4ac4a1a1d 100644 --- a/mainboard/amd/norwich/dts +++ b/mainboard/amd/norwich/dts @@ -19,7 +19,7 @@ */ /{ - mainboard-vendor = "AMD"; + mainboard_vendor = "AMD"; mainboard-name = "NORWICH"; mainboard_pci_subsystem_vendor = "0x1022"; mainboard_pci_subsystem_device = "0x2323"; diff --git a/mainboard/artecgroup/dbe61/dts b/mainboard/artecgroup/dbe61/dts index e0ca759412..41fd675cad 100644 --- a/mainboard/artecgroup/dbe61/dts +++ b/mainboard/artecgroup/dbe61/dts @@ -73,7 +73,7 @@ end */ /{ - mainboard-vendor = "Artec Group"; + mainboard_vendor = "Artec Group"; mainboard-name = "DBE61"; mainboard_pci_subsystem_vendor = "0x1022"; mainboard_pci_subsystem_device = "0x2323"; diff --git a/mainboard/artecgroup/dbe62/dts b/mainboard/artecgroup/dbe62/dts index 3cb817c83a..91c3d247e3 100644 --- a/mainboard/artecgroup/dbe62/dts +++ b/mainboard/artecgroup/dbe62/dts @@ -19,7 +19,7 @@ */ /{ - mainboard-vendor = "Artec"; + mainboard_vendor = "Artec"; mainboard-name = "DBE62"; cpus { }; apic@0 { diff --git a/mainboard/emulation/qemu-x86/dts b/mainboard/emulation/qemu-x86/dts index 42ea56dafd..9baad5ee86 100644 --- a/mainboard/emulation/qemu-x86/dts +++ b/mainboard/emulation/qemu-x86/dts @@ -19,7 +19,7 @@ */ /{ - mainboard-vendor = "Emulation"; + mainboard_vendor = "Emulation"; mainboard-name = "QEMU x86"; mainboard_pci_subsystem_vendor = "0x15ad"; mainboard_pci_subsystem_device = "0x1976"; diff --git a/mainboard/pcengines/alix1c/dts b/mainboard/pcengines/alix1c/dts index a3eb153c2a..77ac82f6ec 100644 --- a/mainboard/pcengines/alix1c/dts +++ b/mainboard/pcengines/alix1c/dts @@ -19,7 +19,7 @@ */ /{ - mainboard-vendor = "PC Engines"; + mainboard_vendor = "PC Engines"; mainboard-name = "ALIX1.C"; cpus { }; apic@0 { diff --git a/mainboard/pcengines/alix2c3/dts b/mainboard/pcengines/alix2c3/dts index 1af2944922..d4f2713ef3 100644 --- a/mainboard/pcengines/alix2c3/dts +++ b/mainboard/pcengines/alix2c3/dts @@ -19,7 +19,7 @@ */ /{ - mainboard-vendor = "PC Engines"; + mainboard_vendor = "PC Engines"; mainboard-name = "ALIX.2C3"; cpus { }; apic@0 { diff --git a/util/dtc/flattree.c b/util/dtc/flattree.c index fd221244e5..3088fe397a 100644 --- a/util/dtc/flattree.c +++ b/util/dtc/flattree.c @@ -1353,7 +1353,7 @@ void dt_to_coreboot(FILE *f, struct boot_info *bi, int version, int boot_cpuid_p /* 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 @@ void dt_to_coreboot(FILE *f, struct boot_info *bi, int version, int boot_cpuid_p } 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) {