Merge pull request #1110 from richardg867/master

I2C/SMBus overhaul

src/cpu/cpu.c

@@ -151,6 +151,7 @@ uint32_t smbase = 0x30000;
 
 cpu_family_t	*cpu_f;
 CPU		*cpu_s;
+int		cpu_override;
 int		cpu_effective;
 int		cpu_multi;
 double		cpu_dmulti;
@@ -331,6 +332,9 @@ cpu_get_family(const char *internal_name)
 uint8_t
 cpu_is_eligible(const cpu_family_t *cpu_family, int cpu, int machine)
 {
+	if (cpu_override > 1) /* full override */
+		return 1;
+
 	/* Get machine. */
 	const machine_t *machine_s = &machines[machine];
 
@@ -344,6 +348,9 @@ cpu_is_eligible(const cpu_family_t *cpu_family, int cpu, int machine)
 	if (!(cpu_family->package & packages)) /* package type */
 		return 0;
 
+	if (cpu_override) /* partial override */
+		return 1;
+
 	const CPU *cpu_s = &cpu_family->cpus[cpu];
 
 	if (machine_s->cpu_block & cpu_s->cpu_type) /* CPU type blocklist */

src/cpu/cpu.h

@@ -375,6 +375,7 @@ extern const cpu_family_t cpu_families[];
 extern const cpu_legacy_machine_t cpu_legacy_table[];
 extern cpu_family_t *cpu_f;
 extern CPU	*cpu_s;
+extern int	cpu_override;
 
 extern int	cpu_isintel;
 extern int	cpu_iscyrix;

src/cpu/cpu_table.c

@@ -976,9 +976,9 @@ static const cpu_legacy_table_t cpus_pcjr[] = {
 };
 
 static const cpu_legacy_table_t cpus_europc[] = {
-    {"8088", 4772728, 1},
-    {"8088", 7159092, 1},
-    {"8088", 9545456, 1},
+    {"8088_europc", 4772728, 1},
+    {"8088_europc", 7159092, 1},
+    {"8088_europc", 9545456, 1},
     {NULL, 0, 0}
 };