Get mptable OEM/product ID from kconfig variables.

We currently use "COREBOOT" unconditionally as the "OEM ID" in our
mptable.c files, and hardcode the mainboard name in mptable.c like this:

  mptable_init(mc, "DK8-HTX     ", LAPIC_ADDR);

However, the spec says

  "OEM ID: A string that identifies the manufacturer of the system hardware."
  (Table 4-2, page 42)

so "COREBOOT" doesn't match the spec, we should use the hardware vendor name.

Thus, use CONFIG_MAINBOARD_VENDOR which we have already as the "OEM ID"
(truncate/fill it to 8 characters as per spec).

Also, use CONFIG_MAINBOARD_PART_NUMBER (the board name) as "product ID",
and truncate/fill it to 12 characters as per spec, if needed.

Abuild-tested.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coreboot.org>



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

src/arch/x86/boot/mpspec.c

@@ -8,20 +8,17 @@
 #include <cpu/x86/lapic.h>
 
 /* Initialize the specified "mc" struct with initial values. */
-void mptable_init(struct mp_config_table *mc, const char *productid,
+void mptable_init(struct mp_config_table *mc, u32 lapic_addr)
-		  u32 lapic_addr)
 {
-	/* Error out if 'product_id' length doesn't match exactly. */
+	int i;
-	if (strlen(productid) != 12)
-		die("ERROR: 'productid' must be 12 bytes long!");
 
 	memset(mc, 0, sizeof(*mc));
+
 	memcpy(mc->mpc_signature, MPC_SIGNATURE, 4);
+
 	mc->mpc_length = sizeof(*mc);	/* Initially just the header size. */
 	mc->mpc_spec = 0x04;		/* MultiProcessor specification 1.4 */
 	mc->mpc_checksum = 0;		/* Not yet computed. */
-	memcpy(mc->mpc_oem, "COREBOOT", 8);
-	memcpy(mc->mpc_productid, productid, 12);
 	mc->mpc_oemptr = 0;
 	mc->mpc_oemsize = 0;
 	mc->mpc_entry_count = 0;	/* No entries yet... */
@@ -29,6 +26,18 @@ void mptable_init(struct mp_config_table *mc, const char *productid,
 	mc->mpe_length = 0;
 	mc->mpe_checksum = 0;
 	mc->reserved = 0;
+
+	strncpy(mc->mpc_oem, CONFIG_MAINBOARD_VENDOR, 8);
+	strncpy(mc->mpc_productid, CONFIG_MAINBOARD_PART_NUMBER, 12);
+
+	/*
+	 * The oem/productid fields are exactly 8/12 bytes long. If the resp.
+	 * entry is shorter, the remaining bytes are filled with spaces.
+	 */
+	for (i = MIN(strlen(CONFIG_MAINBOARD_VENDOR), 8); i < 8; i++)
+		mc->mpc_oem[i] = ' ';
+	for (i = MIN(strlen(CONFIG_MAINBOARD_PART_NUMBER), 12); i < 12; i++)
+		mc->mpc_productid[i] = ' ';
 }
 
 unsigned char smp_compute_checksum(void *v, int len)

src/arch/x86/include/arch/smp/mpspec.h

@@ -232,8 +232,7 @@ struct mp_exten_compatibility_address_space {
 /* Default local apic addr */
 #define LAPIC_ADDR 0xFEE00000
 
-void mptable_init(struct mp_config_table *mc, const char *productid,
+void mptable_init(struct mp_config_table *mc, u32 lapic_addr);
-		  u32 lapic_addr);
 
 void *smp_next_mpc_entry(struct mp_config_table *mc);
 void *smp_next_mpe_entry(struct mp_config_table *mc);

src/mainboard/amd/dbm690t/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "DBM690T     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/amd/mahogany/mptable.c

@@ -41,7 +41,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "MAHOGANY    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/amd/mahogany_fam10/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "MAHOGANY    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/amd/pistachio/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "PISTACHIO   ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/amd/serengeti_cheetah/mptable.c

@@ -18,7 +18,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "SERENGETI   ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/amd/serengeti_cheetah_fam10/mptable.c

@@ -37,7 +37,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "SERENGETI   ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/amd/tilapia_fam10/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "TILAPIA     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/arima/hdama/mptable.c

@@ -123,7 +123,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "HDAMA       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors_inorder(mc);
 

src/mainboard/asrock/939a785gmh/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "939A785GMH  ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/asus/a8n_e/mptable.c

@@ -39,7 +39,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "A8N-E       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/asus/a8v-e_deluxe/mptable.c

@@ -31,7 +31,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "A8V-E Deluxe", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/asus/a8v-e_se/mptable.c

@@ -31,7 +31,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "A8V-E SE    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/asus/m2n-e/mptable.c

@@ -43,7 +43,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "M2N-E       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/asus/m2v/mptable.c

@@ -42,7 +42,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void*)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "M2V         ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 	mptable_write_buses(mc, NULL, &bus_isa);

src/mainboard/asus/m4a78-em/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "M4A78-EM    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/asus/m4a785-m/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "M4A785-M    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/asus/p2b-d/mptable.c

@@ -32,7 +32,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "P2B-D       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/asus/p2b-ds/mptable.c

@@ -32,7 +32,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "P2B-DS      ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/broadcom/blast/mptable.c

@@ -24,7 +24,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "BLAST       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/dell/s1850/mptable.c

@@ -17,7 +17,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S1850       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/getac/p470/mptable.c

@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "P470        ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/gigabyte/ga_2761gxdk/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "GA-2761GXDK ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/gigabyte/m57sli/mptable.c

@@ -39,7 +39,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "GA-M57SLI-S4", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/gigabyte/ma785gmt/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "MA785GMT    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/gigabyte/ma78gm/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "MA78GM-US2H ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/hp/dl145_g1/mptable.c

@@ -24,7 +24,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "DL145 G1    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/hp/dl145_g3/mptable.c

@@ -47,7 +47,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "TREX        ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/hp/dl165_g6_fam10/mptable.c

@@ -48,7 +48,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "DL165 G6    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/ibase/mb899/mptable.c

@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "MB899       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/ibm/e325/mptable.c

@@ -17,7 +17,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "E325        ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/ibm/e326/mptable.c

@@ -17,7 +17,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "E326        ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/iei/kino-780am2-fam10/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "KINO-780AM2 ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/intel/d945gclf/mptable.c

@@ -32,7 +32,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "D945GCLF    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/intel/eagleheights/mptable.c

@@ -78,7 +78,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "EagleHeights", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/intel/jarrell/mptable.c

@@ -19,7 +19,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "SE7520JR20  ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/intel/mtarvon/mptable.c

@@ -35,7 +35,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "Mt. Arvon   ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/intel/truxton/mptable.c

@@ -35,7 +35,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "Truxton     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/intel/xe7501devkit/mptable.c

@@ -123,7 +123,7 @@ static void *smp_write_config_table(void* v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "XE7501DEVKIT", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/iwill/dk8_htx/mptable.c

@@ -18,7 +18,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "DK8-HTX     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/iwill/dk8s2/mptable.c

@@ -15,7 +15,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "DK8S2       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/iwill/dk8x/mptable.c

@@ -15,7 +15,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "DK8X        ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/jetway/pa78vm5/mptable.c

@@ -41,7 +41,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "PA78VM5     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/kontron/986lcd-m/mptable.c

@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "986LCD-M    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/kontron/kt690/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "KT690       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/msi/ms7135/mptable.c

@@ -43,7 +43,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "MS-7135     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 	mptable_write_buses(mc, NULL, &bus_isa);

src/mainboard/msi/ms7260/mptable.c

@@ -37,7 +37,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "MS-7260     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/msi/ms9185/mptable.c

@@ -45,7 +45,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "MS-9185     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/msi/ms9282/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "MS-9282     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/msi/ms9652_fam10/mptable.c

@@ -37,7 +37,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "K9ND MS-9652", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/newisys/khepri/mptable.c

@@ -15,7 +15,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "KHEPRI      ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/nvidia/l1_2pvv/mptable.c

@@ -37,7 +37,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "L1_2PVV     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/roda/rk886ex/mptable.c

@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "RK886EX     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/sunw/ultra40/mptable.c

@@ -39,7 +39,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "Ultra40     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/supermicro/h8dme/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "H8DME-2     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/supermicro/h8dmr/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "H8DMR       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/supermicro/h8dmr_fam10/mptable.c

@@ -36,7 +36,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "H8DMR       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/supermicro/h8qme_fam10/mptable.c

@@ -38,7 +38,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "H8QME-2+    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/supermicro/x6dai_g/mptable.c

@@ -13,7 +13,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "X6DAI-G     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/supermicro/x6dhe_g/mptable.c

@@ -16,7 +16,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "X6DHE-G     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/supermicro/x6dhe_g2/mptable.c

@@ -16,7 +16,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "X6DHE-G2    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/supermicro/x6dhr_ig/mptable.c

@@ -17,7 +17,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "X6DHR-iG    ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/supermicro/x6dhr_ig2/mptable.c

@@ -17,7 +17,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "X6DHR-iG2   ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/technexion/tim5690/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "TIM5690     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/technexion/tim8690/mptable.c

@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "TIM8690     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/tyan/s2735/mptable.c

@@ -12,7 +12,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S2735       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 	mptable_write_buses(mc, NULL, &isa_bus);

src/mainboard/tyan/s2850/mptable.c

@@ -53,7 +53,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S2850       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
         {

src/mainboard/tyan/s2875/mptable.c

@@ -54,7 +54,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S2875       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/tyan/s2880/mptable.c

@@ -57,7 +57,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S2880       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/tyan/s2881/mptable.c

@@ -24,7 +24,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S2881       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/tyan/s2882/mptable.c

@@ -58,7 +58,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S2882       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
         {

src/mainboard/tyan/s2885/mptable.c

@@ -27,7 +27,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S2885       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/tyan/s2891/mptable.c

@@ -28,7 +28,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S2891       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/tyan/s2892/mptable.c

@@ -28,7 +28,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S2892       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/tyan/s2895/mptable.c

@@ -36,7 +36,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S2895       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/tyan/s2912/mptable.c

@@ -36,7 +36,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S2912       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/tyan/s2912_fam10/mptable.c

@@ -36,7 +36,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S2895       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 

src/mainboard/tyan/s4880/mptable.c

@@ -57,7 +57,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S4880       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/tyan/s4882/mptable.c

@@ -57,7 +57,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "S4882       ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
 

src/mainboard/via/epia-n/mptable.c

@@ -14,7 +14,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "EPIA-N      ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
         mptable_write_buses(mc, NULL, &isa_bus);

src/mainboard/via/pc2500e/mptable.c

@@ -37,7 +37,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "pc2500e     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 	mptable_write_buses(mc, NULL, &isa_bus);

src/mainboard/via/vt8454c/mptable.c

@@ -35,7 +35,7 @@ static void *smp_write_config_table(void *v)
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-	mptable_init(mc, "VT8454c     ", LAPIC_ADDR);
+	mptable_init(mc, LAPIC_ADDR);
 
 	smp_write_processors(mc);
 	mptable_write_buses(mc, NULL, &isa_bus);