Conditionally exclude chipset detection for irrelevant chipsets

6 files changed, 466 insertions, 357 deletions

diff --git a/src/arm/linux/chipset.c b/src/arm/linux/chipset.c
index b8e5ac2..ed19fb0 100644
--- a/src/arm/linux/chipset.c
+++ b/src/arm/linux/chipset.c
@@ -1136,6 +1136,7 @@ struct sunxi_map_entry {
 };
 
 static const struct sunxi_map_entry sunxi_map_entries[] = {
+#if CPUINFO_ARCH_ARM
 	{
 		/* ("sun4i", 1) -> "A10" */
 		.sunxi = 4,
@@ -1186,6 +1187,7 @@ static const struct sunxi_map_entry sunxi_map_entries[] = {
 		.cores = 8,
 		.model = 80,
 	},
+#endif /* CPUINFO_ARCH_ARM */
 	{
 		/* ("sun50i", 4) -> "A64" */
 		.sunxi = 50,
@@ -1662,6 +1664,7 @@ struct special_map_entry {
 };
 
 static const struct special_map_entry special_hardware_map_entries[] = {
+#if CPUINFO_ARCH_ARM
 	{
 		/* "k3v2oem1" -> HiSilicon K3V2 */
 		.platform = "k3v2oem1",
@@ -1675,6 +1678,7 @@ static const struct special_map_entry special_hardware_map_entries[] = {
 		.model = 910,
 		.suffix = 'T'
 	},
+#endif /* CPUINFO_ARCH_ARM */
 	{
 		/* "hi6250" -> HiSilicon Kirin 650 */
 		.platform = "hi6250",
@@ -1693,18 +1697,21 @@ static const struct special_map_entry special_hardware_map_entries[] = {
 		.series = cpuinfo_arm_chipset_series_hisilicon_hi,
 		.model = 3751,
 	},
+#if CPUINFO_ARCH_ARM
 	{
 		/* "hi3630" -> HiSilicon Kirin 920 */
 		.platform = "hi3630",
 		.series = cpuinfo_arm_chipset_series_hisilicon_kirin,
 		.model = 920,
 	},
+#endif /* CPUINFO_ARCH_ARM */
 	{
 		/* "hi3635" -> HiSilicon Kirin 930 */
 		.platform = "hi3635",
 		.series = cpuinfo_arm_chipset_series_hisilicon_kirin,
 		.model = 930,
 	},
+#if CPUINFO_ARCH_ARM
 	{
 		/* "gs702a" -> Actions ATM7029 (Cortex-A5 + GC1000) */
 		.platform = "gs702a",
@@ -1780,9 +1787,11 @@ static const struct special_map_entry special_hardware_map_entries[] = {
 		.series = cpuinfo_arm_chipset_series_mstar_6a,
 		.model = 338,
 	},
+#endif /* CPUINFO_ARCH_ARM */
 };
 
 static const struct special_map_entry tegra_hardware_map_entries[] = {
+#if CPUINFO_ARCH_ARM
 	{
 		/* "cardhu" (Nvidia Cardhu developer tablet) -> Tegra T30 */
 		.platform = "cardhu",
@@ -1865,24 +1874,6 @@ static const struct special_map_entry tegra_hardware_map_entries[] = {
 		.model = 114,
 	},
 	{
-		/* "foster_e" (Nvidia Shield TV, Flash) -> Tegra T210 */
-		.platform = "foster_e",
-		.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
-		.model = 210,
-	},
-	{
-		/* "foster_e_hdd" (Nvidia Shield TV, HDD) -> Tegra T210 */
-		.platform = "foster_e_hdd",
-		.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
-		.model = 210,
-	},
-	{
-		/* "darcy" (Nvidia Shield TV 2017) -> Tegra T210 */
-		.platform = "darcy",
-		.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
-		.model = 210,
-	},
-	{
 		/* "pisces" (Xiaomi Mi 3) -> Tegra T114 */
 		.platform = "pisces",
 		.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
@@ -2104,6 +2095,25 @@ static const struct special_map_entry tegra_hardware_map_entries[] = {
 		.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
 		.model = 114,
 	},
+#endif /* CPUINFO_ARCH_ARM */
+	{
+		/* "foster_e" (Nvidia Shield TV, Flash) -> Tegra T210 */
+		.platform = "foster_e",
+		.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
+		.model = 210,
+	},
+	{
+		/* "foster_e_hdd" (Nvidia Shield TV, HDD) -> Tegra T210 */
+		.platform = "foster_e_hdd",
+		.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
+		.model = 210,
+	},
+	{
+		/* "darcy" (Nvidia Shield TV 2017) -> Tegra T210 */
+		.platform = "darcy",
+		.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
+		.model = 210,
+	},
 };
 
 /*
@@ -2225,13 +2235,15 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			return chipset;
 		}
 
-		/* Match /SMDK(4410|4x12)$/ */
-		if (match_and_parse_smdk(hardware, hardware_end, cores, &chipset)) {
-			cpuinfo_log_debug(
-				"matched SMDK (Samsung Exynos) signature in /proc/cpuinfo Hardware string \"%.*s\"",
-				(int) hardware_length, hardware);
-			return chipset;
-		}
+		#if CPUINFO_ARCH_ARM
+			/* Match /SMDK(4410|4x12)$/ */
+			if (match_and_parse_smdk(hardware, hardware_end, cores, &chipset)) {
+				cpuinfo_log_debug(
+					"matched SMDK (Samsung Exynos) signature in /proc/cpuinfo Hardware string \"%.*s\"",
+					(int) hardware_length, hardware);
+				return chipset;
+			}
+		#endif
 
 		/* Check Spreadtrum SC signature */
 		if (match_sc(hardware, hardware_end, &chipset)) {
@@ -2241,13 +2253,15 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			return chipset;
 		}
 
-		/* Check Marvell PXA signature */
-		if (match_pxa(hardware, hardware_end, &chipset)) {
-			cpuinfo_log_debug(
-				"matched Marvell PXA signature in /proc/cpuinfo Hardware string \"%.*s\"",
-				(int) hardware_length, hardware);
-			return chipset;
-		}
+		#if CPUINFO_ARCH_ARM
+			/* Check Marvell PXA signature */
+			if (match_pxa(hardware, hardware_end, &chipset)) {
+				cpuinfo_log_debug(
+					"matched Marvell PXA signature in /proc/cpuinfo Hardware string \"%.*s\"",
+					(int) hardware_length, hardware);
+				return chipset;
+			}
+		#endif
 
 		/* Match /sun\d+i/ signature and map to Allwinner chipset name */
 		if (match_and_parse_sunxi(hardware, hardware_end, cores, &chipset)) {
@@ -2257,21 +2271,24 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			return chipset;
 		}
 
-		/* Check Texas Instruments OMAP signature */
-		if (match_omap(hardware, hardware_end, &chipset)) {
-			cpuinfo_log_debug(
-				"matched Texas Instruments OMAP signature in /proc/cpuinfo Hardware string \"%.*s\"",
-				(int) hardware_length, hardware);
-			return chipset;
-		}
+		#if CPUINFO_ARCH_ARM
+			/* Check Texas Instruments OMAP signature */
+			if (match_omap(hardware, hardware_end, &chipset)) {
+				cpuinfo_log_debug(
+					"matched Texas Instruments OMAP signature in /proc/cpuinfo Hardware string \"%.*s\"",
+					(int) hardware_length, hardware);
+				return chipset;
+			}
 
-		/* Check WonderMedia WMT signature and decode chipset from frequency and number of cores  */
-		if (match_and_parse_wmt(hardware, hardware_end, cores, max_cpu_freq_max, &chipset)) {
-			cpuinfo_log_debug(
-				"matched WonderMedia WMT signature in /proc/cpuinfo Hardware string \"%.*s\"",
-				(int) hardware_length, hardware);
-			return chipset;
-		}
+			/* Check WonderMedia WMT signature and decode chipset from frequency and number of cores  */
+			if (match_and_parse_wmt(hardware, hardware_end, cores, max_cpu_freq_max, &chipset)) {
+				cpuinfo_log_debug(
+					"matched WonderMedia WMT signature in /proc/cpuinfo Hardware string \"%.*s\"",
+					(int) hardware_length, hardware);
+				return chipset;
+			}
+
+		#endif
 
 		/* Check Telechips TCC signature */
 		if (match_tcc(hardware, hardware_end, &chipset)) {
@@ -2322,12 +2339,14 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			.series = cpuinfo_arm_chipset_series_hisilicon_kirin,
 			.model = 620,
 		},
+#if CPUINFO_ARCH_ARM
 		{
 			/* "hi3630" -> HiSilicon Kirin 920 */
 			.platform = "hi3630",
 			.series = cpuinfo_arm_chipset_series_hisilicon_kirin,
 			.model = 920,
 		},
+#endif /* CPUINFO_ARCH_ARM */
 		{
 			/* "hi3635" -> HiSilicon Kirin 930 */
 			.platform = "hi3635",
@@ -2346,18 +2365,21 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			.series = cpuinfo_arm_chipset_series_hisilicon_kirin,
 			.model = 960,
 		},
+#if CPUINFO_ARCH_ARM
 		{
 			/* "mp523x" -> Renesas MP5232 */
 			.platform = "mp523x",
 			.series = cpuinfo_arm_chipset_series_renesas_mp,
 			.model = 5232,
 		},
+#endif /* CPUINFO_ARCH_ARM */
 		{
 			/* "BEETHOVEN" (Huawei MadiaPad M3) -> HiSilicon Kirin 950 */
 			.platform = "BEETHOVEN",
 			.series = cpuinfo_arm_chipset_series_hisilicon_kirin,
 			.model = 950,
 		},
+#if CPUINFO_ARCH_ARM
 		{
 			/* "hws7701u" (Huawei MediaPad 7 Youth) -> Rockchip RK3168 */
 			.platform = "hws7701u",
@@ -2396,6 +2418,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			.model = 30,
 			.suffix = 'L',
 		},
+#endif /* CPUINFO_ARCH_ARM */
 		{
 			/* "flounder" (HTC Nexus 9) -> Nvidia Tegra T132 */
 			.platform = "flounder",
@@ -2459,13 +2482,15 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			return chipset;
 		}
 
-		/* Check SMDK (Samsung Exynos) signature */
-		if (match_and_parse_smdk(board, board_end, cores, &chipset)) {
-			cpuinfo_log_debug(
-				"matched SMDK (Samsung Exynos) signature in ro.product.board string \"%.*s\"",
-				(int) board_length, board);
-			return chipset;
-		}
+		#if CPUINFO_ARCH_ARM
+			/* Check SMDK (Samsung Exynos) signature */
+			if (match_and_parse_smdk(board, board_end, cores, &chipset)) {
+				cpuinfo_log_debug(
+					"matched SMDK (Samsung Exynos) signature in ro.product.board string \"%.*s\"",
+					(int) board_length, board);
+				return chipset;
+			}
+		#endif
 
 		/* Check MediaTek MT signature */
 		if (match_mt(board, board_end, true, &chipset)) {
@@ -2483,32 +2508,34 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			return chipset;
 		}
 
-		/* Check Marvell PXA signature */
-		if (match_pxa(board, board_end, &chipset)) {
-			cpuinfo_log_debug(
-				"matched Marvell PXA signature in ro.product.board string \"%.*s\"",
-				(int) board_length, board);
-			return chipset;
-		}
+		#if CPUINFO_ARCH_ARM
+			/* Check Marvell PXA signature */
+			if (match_pxa(board, board_end, &chipset)) {
+				cpuinfo_log_debug(
+					"matched Marvell PXA signature in ro.product.board string \"%.*s\"",
+					(int) board_length, board);
+				return chipset;
+			}
 
-		/* Check Leadcore LCxxxx signature */
-		if (match_lc(board, board_end, &chipset)) {
-			cpuinfo_log_debug(
-				"matched Leadcore LC signature in ro.product.board string \"%.*s\"",
-				(int) board_length, board);
-			return chipset;
-		}
+			/* Check Leadcore LCxxxx signature */
+			if (match_lc(board, board_end, &chipset)) {
+				cpuinfo_log_debug(
+					"matched Leadcore LC signature in ro.product.board string \"%.*s\"",
+					(int) board_length, board);
+				return chipset;
+			}
 
-		/*
-		 * Compare to tabulated ro.product.board values for Broadcom chipsets and decode chipset from frequency and
-		 * number of cores.
-		 */
-		if (match_and_parse_broadcom(board, board_end, cores, max_cpu_freq_max, &chipset)) {
-			cpuinfo_log_debug(
-				"found ro.product.board string \"%.*s\" in Broadcom chipset table",
-				(int) board_length, board);
-			return chipset;
-		}
+			/*
+			 * Compare to tabulated ro.product.board values for Broadcom chipsets and decode chipset from frequency and
+			 * number of cores.
+			 */
+			if (match_and_parse_broadcom(board, board_end, cores, max_cpu_freq_max, &chipset)) {
+				cpuinfo_log_debug(
+					"found ro.product.board string \"%.*s\" in Broadcom chipset table",
+					(int) board_length, board);
+				return chipset;
+			}
+		#endif
 
 		/* Compare to tabulated ro.product.board values for Huawei devices which don't report chipset elsewhere */
 		if (match_and_parse_huawei(board, board_end, &chipset)) {
@@ -2555,6 +2582,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 	};
 
 	static const struct amlogic_map_entry amlogic_map_entries[] = {
+#if CPUINFO_ARCH_ARM
 		{
 			/* "meson3" -> Amlogic AML8726-M */
 			.ro_board_platform = "meson3",
@@ -2575,6 +2603,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			.series = cpuinfo_arm_chipset_series_amlogic_s,
 			.model = 805,
 		},
+#endif /* CPUINFO_ARCH_ARM */
 		{
 			/* "gxbaby" -> Amlogic S905 */
 			.ro_board_platform = "gxbaby",
@@ -2597,6 +2626,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 	};
 
 	static const struct special_map_entry special_platform_map_entries[] = {
+#if CPUINFO_ARCH_ARM
 		{
 			/* "hi6620oem" -> HiSilicon Kirin 910T */
 			.platform = "hi6620oem",
@@ -2604,6 +2634,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			.model = 910,
 			.suffix = 'T',
 		},
+#endif /* CPUINFO_ARCH_ARM */
 		{
 			/* "hi6250" -> HiSilicon Kirin 650 */
 			.platform = "hi6250",
@@ -2616,12 +2647,14 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			.series = cpuinfo_arm_chipset_series_hisilicon_kirin,
 			.model = 620,
 		},
+#if CPUINFO_ARCH_ARM
 		{
 			/* "hi3630" -> HiSilicon Kirin 920 */
 			.platform = "hi3630",
 			.series = cpuinfo_arm_chipset_series_hisilicon_kirin,
 			.model = 920,
 		},
+#endif /* CPUINFO_ARCH_ARM */
 		{
 			/* "hi3635" -> HiSilicon Kirin 930 */
 			.platform = "hi3635",
@@ -2640,6 +2673,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			.series = cpuinfo_arm_chipset_series_hisilicon_kirin,
 			.model = 960,
 		},
+#if CPUINFO_ARCH_ARM
 		{
 			/* "k3v2oem1" -> HiSilicon K3V2 */
 			.platform = "k3v2oem1",
@@ -2658,18 +2692,21 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			.series = cpuinfo_arm_chipset_series_novathor_u,
 			.model = 8500,
 		},
+#endif /* CPUINFO_ARCH_ARM */
 		{
 			/* "song" -> Pinecone Surge S1 */
 			.platform = "song",
 			.series = cpuinfo_arm_chipset_series_pinecone_surge_s,
 			.model = 1,
 		},
+#if CPUINFO_ARCH_ARM
 		{
 			/* "rk322x" -> RockChip RK3229 */
 			.platform = "rk322x",
 			.series = cpuinfo_arm_chipset_series_rockchip_rk,
 			.model = 3229,
 		},
+#endif /* CPUINFO_ARCH_ARM */
 		{
 			/* "tegra132" -> Nvidia Tegra T132 */
 			.platform = "tegra132",
@@ -2682,6 +2719,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
 			.model = 210,
 		},
+#if CPUINFO_ARCH_ARM
 		{
 			/* "tegra4" -> Nvidia Tegra T114 */
 			.platform = "tegra4",
@@ -2694,6 +2732,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			.series = cpuinfo_arm_chipset_series_samsung_exynos,
 			.model = 3110,
 		},
+#endif /* CPUINFO_ARCH_ARM */
 	};
 
 	/*
@@ -2759,12 +2798,14 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			return chipset;
 		}
 
-		/* Check Leadcore LCxxxx signature */
-		if (match_lc(platform, platform_end, &chipset)) {
-			cpuinfo_log_debug(
-				"matched Leadcore LC signature in ro.board.platform string \"%.*s\"", (int) platform_length, platform);
-			return chipset;
-		}
+		#if CPUINFO_ARCH_ARM
+			/* Check Leadcore LCxxxx signature */
+			if (match_lc(platform, platform_end, &chipset)) {
+				cpuinfo_log_debug(
+					"matched Leadcore LC signature in ro.board.platform string \"%.*s\"", (int) platform_length, platform);
+				return chipset;
+			}
+		#endif
 
 		/* Compare to tabulated ro.board.platform values for Huawei devices which don't report chipset elsewhere */
 		if (match_and_parse_huawei(platform, platform_end, &chipset)) {
@@ -2774,32 +2815,34 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			return chipset;
 		}
 
-		/*
-		 * Compare to known ro.board.platform values for Broadcom devices and
-		 * detect chipset from frequency and number of cores
-		 */
-		if (match_and_parse_broadcom(platform, platform_end, cores, max_cpu_freq_max, &chipset)) {
-			cpuinfo_log_debug(
-				"found ro.board.platform string \"%.*s\" in Broadcom chipset table",
-				(int) platform_length, platform);
-			return chipset;
-		}
+		#if CPUINFO_ARCH_ARM
+			/*
+			 * Compare to known ro.board.platform values for Broadcom devices and
+			 * detect chipset from frequency and number of cores
+			 */
+			if (match_and_parse_broadcom(platform, platform_end, cores, max_cpu_freq_max, &chipset)) {
+				cpuinfo_log_debug(
+					"found ro.board.platform string \"%.*s\" in Broadcom chipset table",
+					(int) platform_length, platform);
+				return chipset;
+			}
 
-		/*
-		 * Compare to ro.board.platform value ("omap4") for OMAP4xxx chipsets.
-		 * Upon successful match, detect OMAP4430 from frequency and number of cores.
-		 */
-		if (platform_length == 5 && cores == 2 && max_cpu_freq_max == 1008000 && memcmp(platform, "omap4", 5) == 0) {
-			cpuinfo_log_debug(
-				"matched Texas Instruments OMAP4 signature in ro.board.platform string \"%.*s\"",
-				(int) platform_length, platform);
+			/*
+			 * Compare to ro.board.platform value ("omap4") for OMAP4xxx chipsets.
+			 * Upon successful match, detect OMAP4430 from frequency and number of cores.
+			 */
+			if (platform_length == 5 && cores == 2 && max_cpu_freq_max == 1008000 && memcmp(platform, "omap4", 5) == 0) {
+				cpuinfo_log_debug(
+					"matched Texas Instruments OMAP4 signature in ro.board.platform string \"%.*s\"",
+					(int) platform_length, platform);
 
-			return (struct cpuinfo_arm_chipset) {
-				.vendor = cpuinfo_arm_chipset_vendor_texas_instruments,
-				.series = cpuinfo_arm_chipset_series_texas_instruments_omap,
-				.model = 4430,
-			};
-		}
+				return (struct cpuinfo_arm_chipset) {
+					.vendor = cpuinfo_arm_chipset_vendor_texas_instruments,
+					.series = cpuinfo_arm_chipset_series_texas_instruments_omap,
+					.model = 4430,
+				};
+			}
+		#endif
 
 		/*
 		 * Compare to tabulated ro.board.platform values for Amlogic chipsets/devices which can't be otherwise detected.
@@ -2962,26 +3005,28 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
 			return chipset;
 		}
 
-		/* Check Marvell PXA signature */
-		if (match_pxa(chipname, chipname_end, &chipset)) {
-			cpuinfo_log_debug(
-				"matched Marvell PXA signature in ro.chipname string \"%.*s\"",
-				(int) chipname_length, chipname);
-			return chipset;
-		}
+		#if CPUINFO_ARCH_ARM
+			/* Check Marvell PXA signature */
+			if (match_pxa(chipname, chipname_end, &chipset)) {
+				cpuinfo_log_debug(
+					"matched Marvell PXA signature in ro.chipname string \"%.*s\"",
+					(int) chipname_length, chipname);
+				return chipset;
+			}
 
-		/* Compare to ro.chipname value ("mp523x") for Renesas MP5232 which can't be otherwise detected */
-		if (chipname_length == 6 && memcmp(chipname, "mp523x", 6) == 0) {
-			cpuinfo_log_debug(
-				"matched Renesas MP5232 signature in ro.chipname string \"%.*s\"",
-				(int) chipname_length, chipname);
+			/* Compare to ro.chipname value ("mp523x") for Renesas MP5232 which can't be otherwise detected */
+			if (chipname_length == 6 && memcmp(chipname, "mp523x", 6) == 0) {
+				cpuinfo_log_debug(
+					"matched Renesas MP5232 signature in ro.chipname string \"%.*s\"",
+					(int) chipname_length, chipname);
 
-			return (struct cpuinfo_arm_chipset) {
-				.vendor = cpuinfo_arm_chipset_vendor_renesas,
-				.series = cpuinfo_arm_chipset_series_renesas_mp,
-				.model = 5232,
-			};
-		}
+				return (struct cpuinfo_arm_chipset) {
+					.vendor = cpuinfo_arm_chipset_vendor_renesas,
+					.series = cpuinfo_arm_chipset_series_renesas_mp,
+					.model = 5232,
+				};
+			}
+		#endif
 
 		return (struct cpuinfo_arm_chipset) {
 			.vendor = cpuinfo_arm_chipset_vendor_unknown,
@@ -3072,6 +3117,7 @@ void cpuinfo_arm_fixup_chipset(
 								chipset->model = 0;
 						}
 						break;
+#if CPUINFO_ARCH_ARM
 					case 8610:
 						/* Common bug: MSM8612 (Quad-core) reported as MSM8610 (Dual-core) */
 						switch (cores) {
@@ -3087,6 +3133,7 @@ void cpuinfo_arm_fixup_chipset(
 								chipset->model = 0;
 						}
 						break;
+#endif /* CPUINFO_ARCH_ARM */
 				}
 			} else {
 				/* Suffix may need correction */
@@ -3144,6 +3191,7 @@ void cpuinfo_arm_fixup_chipset(
 			break;
 		case cpuinfo_arm_chipset_series_samsung_exynos:
 			switch (chipset->model) {
+#if CPUINFO_ARCH_ARM
 				case 4410:
 					/* Exynos 4410 was renamed to Exynos 4412 */
 					chipset->model = 4412;
@@ -3162,6 +3210,7 @@ void cpuinfo_arm_fixup_chipset(
 							chipset->model = 0;
 					}
 					break;
+#endif /* CPUINFO_ARCH_ARM */
 				case 7580:
 					/* Common bug: Exynos 7578 (Quad-core) reported as Exynos 7580 (Octa-core) */
 					switch (cores) {
diff --git a/test/name/android-properties.cc b/test/name/android-properties.cc
index f9062b3..945e707 100644
--- a/test/name/android-properties.cc
+++ b/test/name/android-properties.cc
@@ -38,16 +38,20 @@ inline std::string parse_chipset(
 }
 
 TEST(ANDROID_PROPERTIES, disambiguate_chipset) {
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("Amlogic S812",
 		parse_chipset("Amlogic Meson8", "n200C", "meson8", "", "", ""));
 	EXPECT_EQ("HiSilicon Kirin 925",
 		parse_chipset("Kirin925", "MT7-L09", "hi3630", "", "", ""));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("HiSilicon Kirin 955",
 		parse_chipset("Hisilicon Kirin 955", "EVA-L09", "hi3650", "", "", ""));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("Marvell PXA986",
 		parse_chipset("PXA988", "PXA986", "mrvl", "", "", ""));
 	EXPECT_EQ("Marvell PXA986",
 		parse_chipset("PXA988", "PXA986", "mrvl", "", "", "PXA986"));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("MediaTek MT6735P",
 		parse_chipset("MT6735P", "MT6735P", "mt6735m", "MT6735", "", ""));
 	EXPECT_EQ("MediaTek MT8382",
@@ -81,8 +85,10 @@ TEST(ANDROID_PROPERTIES, ambiguous_vendors) {
 		parse_chipset("", "universal5410", "msm8974", "", "", ""));
 	EXPECT_EQ("",
 		parse_chipset("MT6580", "universal8895", "mt6580", "MT6580", "", ""));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("",
 		parse_chipset("", "smdk4x12", "msm8974", "", "", "", 2));
+#endif /* CPUINFO_ARCH_ARM */
 }
 
 TEST(ANDROID_PROPERTIES, unambiguous_chipset) {
@@ -90,8 +96,10 @@ TEST(ANDROID_PROPERTIES, unambiguous_chipset) {
 		parse_chipset("UNIVERSAL_GARDA", "universal_garda", "exynos3", "", "exynos3470", "exynos3470"));
 	EXPECT_EQ("MediaTek MT6582",
 		parse_chipset("APPLE A8", "APPLE A8", "", "MT6582", "", ""));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("NovaThor U8500",
 		parse_chipset("SAMSUNG GOLDEN", "DB8520H", "montblanc", "", "", ""));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("MediaTek MT6580",
 		parse_chipset("Qualcomm", "unknown", "mt6580", "MT6580", "", ""));
 	EXPECT_EQ("HiSilicon Kirin 650",
@@ -106,8 +114,10 @@ TEST(ANDROID_PROPERTIES, unambiguous_chipset) {
 		parse_chipset("SAMSUNG JF", "MSM8960", "msm8960", "", "", "apq8064", 4));
 	EXPECT_EQ("MediaTek MT6795",
 		parse_chipset("", "mt6795", "mt6795", "MT6795", "", ""));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("Marvell PXA1908",
 		parse_chipset("PXA1908", "PXA19xx", "mrvl", "", "", "PXA19xx"));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("Spreadtrum SC7715A",
 		parse_chipset("scx15", "SM-G928G", "scx15", "", "", "SC7715A"));
 	EXPECT_EQ("MediaTek MT6592",
@@ -118,8 +128,10 @@ TEST(ANDROID_PROPERTIES, unambiguous_chipset) {
 		parse_chipset("PANTECH APQ8064 EF52L", "VEGA", "msm8960", "", "", "apq8064", 4));
 	EXPECT_EQ("MediaTek MT6580M",
 		parse_chipset("MT6580M", "unknown", "mt6580", "MT6580", "", ""));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("Samsung Exynos 4412",
 		parse_chipset("SMDK4x12", "smdk4x12", "exynos4", "", "", "smdk4x12", 4));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("Samsung Exynos 7420",
 		parse_chipset("SAMSUNG Exynos7420", "universal7420", "exynos5", "", "exynos7420", "exynos7420"));
 	EXPECT_EQ("MediaTek MT6582",
diff --git a/test/name/proc-cpuinfo-hardware.cc b/test/name/proc-cpuinfo-hardware.cc
index cf7ebf2..3076ea2 100644
--- a/test/name/proc-cpuinfo-hardware.cc
+++ b/test/name/proc-cpuinfo-hardware.cc
@@ -76,10 +76,12 @@ TEST(PROC_CPUINFO_HARDWARE, qualcomm_msm) {
 		parse_proc_cpuinfo_hardware("Qualcomm MSM 8610 (Flattened Device Tree)", 2));
 	EXPECT_EQ("Qualcomm MSM8610",
 		parse_proc_cpuinfo_hardware("Qualcomm MSM8610", 2));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("Qualcomm MSM8612",
 		parse_proc_cpuinfo_hardware("Qualcomm MSM 8610 (Flattened Device Tree)", 4));
 	EXPECT_EQ("Qualcomm MSM8612",
 		parse_proc_cpuinfo_hardware("Qualcomm MSM 8612 (Flattened Device Tree)"));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("Qualcomm MSM8625",
 		parse_proc_cpuinfo_hardware("LG MSM8625 V7"));
 	EXPECT_EQ("Qualcomm MSM8625",
@@ -525,21 +527,24 @@ TEST(PROC_CPUINFO_HARDWARE, samsung_universal) {
 		parse_proc_cpuinfo_hardware("UNIVERSAL5430"));
 }
 
-TEST(PROC_CPUINFO_HARDWARE, samsung_smdk) {
-	EXPECT_EQ("Samsung Exynos 4210",
-		parse_proc_cpuinfo_hardware("SMDK4210"));
-	EXPECT_EQ("Samsung Exynos 4212",
-		parse_proc_cpuinfo_hardware("SMDK4x12", 2));
-	EXPECT_EQ("Samsung Exynos 4412",
-		parse_proc_cpuinfo_hardware("SMDK4x12", 4));
-}
+#if CPUINFO_ARCH_ARM
+	TEST(PROC_CPUINFO_HARDWARE, samsung_smdk) {
+		EXPECT_EQ("Samsung Exynos 4210",
+			parse_proc_cpuinfo_hardware("SMDK4210"));
+		EXPECT_EQ("Samsung Exynos 4212",
+			parse_proc_cpuinfo_hardware("SMDK4x12", 2));
+		EXPECT_EQ("Samsung Exynos 4412",
+			parse_proc_cpuinfo_hardware("SMDK4x12", 4));
+	}
 
-TEST(PROC_CPUINFO_HARDWARE, samsung_special) {
-	EXPECT_EQ("Samsung Exynos 5250",
-		parse_proc_cpuinfo_hardware("Manta"));
-}
+	TEST(PROC_CPUINFO_HARDWARE, samsung_special) {
+		EXPECT_EQ("Samsung Exynos 5250",
+			parse_proc_cpuinfo_hardware("Manta"));
+	}
+#endif /* CPUINFO_ARCH_ARM */
 
 TEST(PROC_CPUINFO_HARDWARE, hisilicon_kirin) {
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("HiSilicon Kirin 920",
 		parse_proc_cpuinfo_hardware("Hisilicon Kirin 920"));
 	EXPECT_EQ("HiSilicon Kirin 920",
@@ -548,6 +553,7 @@ TEST(PROC_CPUINFO_HARDWARE, hisilicon_kirin) {
 		parse_proc_cpuinfo_hardware("Hisilicon Kirin 925"));
 	EXPECT_EQ("HiSilicon Kirin 925",
 		parse_proc_cpuinfo_hardware("Kirin925"));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("HiSilicon Kirin 930",
 		parse_proc_cpuinfo_hardware("Hisilicon Kirin 930"));
 	EXPECT_EQ("HiSilicon Kirin 935",
@@ -561,26 +567,33 @@ TEST(PROC_CPUINFO_HARDWARE, hisilicon_kirin) {
 TEST(PROC_CPUINFO_HARDWARE, hisilicon_special) {
 	EXPECT_EQ("HiSilicon Hi3751",
 		parse_proc_cpuinfo_hardware("hi3751"));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("HiSilicon K3V2",
 		parse_proc_cpuinfo_hardware("k3v2oem1"));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("HiSilicon Kirin 620",
 		parse_proc_cpuinfo_hardware("hi6210sft"));
 	EXPECT_EQ("HiSilicon Kirin 650",
 		parse_proc_cpuinfo_hardware("hi6250"));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("HiSilicon Kirin 910T",
 		parse_proc_cpuinfo_hardware("hi6620oem"));
+#endif /* CPUINFO_ARCH_ARM */
 }
 
-TEST(PROC_CPUINFO_HARDWARE, actions) {
-	EXPECT_EQ("Actions ATM7029",
-		parse_proc_cpuinfo_hardware("gs702a"));
-	EXPECT_EQ("Actions ATM7029B",
-		parse_proc_cpuinfo_hardware("gs702c"));
-	EXPECT_EQ("Actions ATM7059A",
-		parse_proc_cpuinfo_hardware("gs705a"));
-}
+#if CPUINFO_ARCH_ARM
+	TEST(PROC_CPUINFO_HARDWARE, actions) {
+		EXPECT_EQ("Actions ATM7029",
+			parse_proc_cpuinfo_hardware("gs702a"));
+		EXPECT_EQ("Actions ATM7029B",
+			parse_proc_cpuinfo_hardware("gs702c"));
+		EXPECT_EQ("Actions ATM7059A",
+			parse_proc_cpuinfo_hardware("gs705a"));
+	}
+#endif /* CPUINFO_ARCH_ARM */
 
 TEST(PROC_CPUINFO_HARDWARE, allwinner_sunxi) {
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("Allwinner A10",
 		parse_proc_cpuinfo_hardware("sun4i", 1));
 	EXPECT_EQ("Allwinner A13",
@@ -593,106 +606,111 @@ TEST(PROC_CPUINFO_HARDWARE, allwinner_sunxi) {
 		parse_proc_cpuinfo_hardware("sun6i", 4));
 	EXPECT_EQ("Allwinner A33",
 		parse_proc_cpuinfo_hardware("sun8i", 4));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("Allwinner A64",
 		parse_proc_cpuinfo_hardware("sun50iw1", 4));
 	EXPECT_EQ("Allwinner A64",
 		parse_proc_cpuinfo_hardware("sun50iw1p1", 4));
 	EXPECT_EQ("Allwinner A64",
 		parse_proc_cpuinfo_hardware("sun50iw2", 4));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("Allwinner A80",
 		parse_proc_cpuinfo_hardware("sun9i", 8));
 	EXPECT_EQ("Allwinner A83T",
 		parse_proc_cpuinfo_hardware("sun8i", 8));
+#endif /* CPUINFO_ARCH_ARM */
 }
 
-TEST(PROC_CPUINFO_HARDWARE, amlogic) {
-	EXPECT_EQ("Amlogic S805",
-		parse_proc_cpuinfo_hardware("Amlogic Meson8B"));
-	EXPECT_EQ("Amlogic S812",
-		parse_proc_cpuinfo_hardware("Amlogic Meson8"));
-}
+#if CPUINFO_ARCH_ARM
+	TEST(PROC_CPUINFO_HARDWARE, amlogic) {
+		EXPECT_EQ("Amlogic S805",
+			parse_proc_cpuinfo_hardware("Amlogic Meson8B"));
+		EXPECT_EQ("Amlogic S812",
+			parse_proc_cpuinfo_hardware("Amlogic Meson8"));
+	}
 
-TEST(PROC_CPUINFO_HARDWARE, lg) {
-	EXPECT_EQ("LG Nuclun 7111",
-		parse_proc_cpuinfo_hardware("Odin"));
-}
+	TEST(PROC_CPUINFO_HARDWARE, lg) {
+		EXPECT_EQ("LG Nuclun 7111",
+			parse_proc_cpuinfo_hardware("Odin"));
+	}
 
-TEST(PROC_CPUINFO_HARDWARE, marvell_pxa) {
-	EXPECT_EQ("Marvell PXA1088",
-		parse_proc_cpuinfo_hardware("PXA1088"));
-	EXPECT_EQ("Marvell PXA1088",
-		parse_proc_cpuinfo_hardware("PXA1L88"));
-	EXPECT_EQ("Marvell PXA1908",
-		parse_proc_cpuinfo_hardware("PXA1908"));
-	EXPECT_EQ("Marvell PXA1928",
-		parse_proc_cpuinfo_hardware("PXA1928"));
-	EXPECT_EQ("Marvell PXA988",
-		parse_proc_cpuinfo_hardware("PXA988"));
-}
+	TEST(PROC_CPUINFO_HARDWARE, marvell_pxa) {
+		EXPECT_EQ("Marvell PXA1088",
+			parse_proc_cpuinfo_hardware("PXA1088"));
+		EXPECT_EQ("Marvell PXA1088",
+			parse_proc_cpuinfo_hardware("PXA1L88"));
+		EXPECT_EQ("Marvell PXA1908",
+			parse_proc_cpuinfo_hardware("PXA1908"));
+		EXPECT_EQ("Marvell PXA1928",
+			parse_proc_cpuinfo_hardware("PXA1928"));
+		EXPECT_EQ("Marvell PXA988",
+			parse_proc_cpuinfo_hardware("PXA988"));
+	}
 
-TEST(PROC_CPUINFO_HARDWARE, mstar) {
-	EXPECT_EQ("MStar 6A338",
-		parse_proc_cpuinfo_hardware("Madison"));
-}
+	TEST(PROC_CPUINFO_HARDWARE, mstar) {
+		EXPECT_EQ("MStar 6A338",
+			parse_proc_cpuinfo_hardware("Madison"));
+	}
 
-TEST(PROC_CPUINFO_HARDWARE, nvidia) {
-	EXPECT_EQ("Nvidia Tegra AP20H",
-		parse_proc_cpuinfo_hardware_tegra("picasso"));
-	EXPECT_EQ("Nvidia Tegra AP20H",
-		parse_proc_cpuinfo_hardware_tegra("picasso_e"));
-	EXPECT_EQ("Nvidia Tegra AP20H",
-		parse_proc_cpuinfo_hardware_tegra("stingray"));
-	EXPECT_EQ("Nvidia Tegra AP33",
-		parse_proc_cpuinfo_hardware_tegra("endeavoru"));
-	EXPECT_EQ("Nvidia Tegra AP33",
-		parse_proc_cpuinfo_hardware_tegra("x3"));
-	EXPECT_EQ("Nvidia Tegra SL460N",
-		parse_proc_cpuinfo_hardware_tegra("Ceres"));
-	EXPECT_EQ("Nvidia Tegra T114",
-		parse_proc_cpuinfo_hardware_tegra("macallan"));
-	EXPECT_EQ("Nvidia Tegra T114",
-		parse_proc_cpuinfo_hardware_tegra("mozart"));
-	EXPECT_EQ("Nvidia Tegra T114",
-		parse_proc_cpuinfo_hardware_tegra("tostab12BA"));
-	EXPECT_EQ("Nvidia Tegra T124",
-		parse_proc_cpuinfo_hardware_tegra("mocha"));
-	EXPECT_EQ("Nvidia Tegra T124",
-		parse_proc_cpuinfo_hardware_tegra("tn8"));
-	EXPECT_EQ("Nvidia Tegra T20",
-		parse_proc_cpuinfo_hardware_tegra("nbx03"));
-	EXPECT_EQ("Nvidia Tegra T20",
-		parse_proc_cpuinfo_hardware_tegra("p3"));
-	EXPECT_EQ("Nvidia Tegra T20",
-		parse_proc_cpuinfo_hardware_tegra("ventana"));
-	EXPECT_EQ("Nvidia Tegra T30",
-		parse_proc_cpuinfo_hardware_tegra("cardhu"));
-	EXPECT_EQ("Nvidia Tegra T30",
-		parse_proc_cpuinfo_hardware_tegra("chagall"));
-	EXPECT_EQ("Nvidia Tegra T30",
-		parse_proc_cpuinfo_hardware_tegra("picasso_m"));
-	EXPECT_EQ("Nvidia Tegra T30",
-		parse_proc_cpuinfo_hardware_tegra("picasso_mf"));
-	EXPECT_EQ("Nvidia Tegra T30L",
-		parse_proc_cpuinfo_hardware_tegra("BIRCH"));
-	EXPECT_EQ("Nvidia Tegra T30L",
-		parse_proc_cpuinfo_hardware_tegra("NS_14T004"));
-	EXPECT_EQ("Nvidia Tegra T30L",
-		parse_proc_cpuinfo_hardware_tegra("avalon"));
-	EXPECT_EQ("Nvidia Tegra T30L",
-		parse_proc_cpuinfo_hardware_tegra("picasso_e2"));
-	EXPECT_EQ("Nvidia Tegra T30L",
-		parse_proc_cpuinfo_hardware_tegra("tostab12BL"));
-	EXPECT_EQ("Nvidia Tegra T30L",
-		parse_proc_cpuinfo_hardware_tegra("txs03"));
-	EXPECT_EQ("Nvidia Tegra T33",
-		parse_proc_cpuinfo_hardware_tegra("bobsleigh"));
-	EXPECT_EQ("Nvidia Tegra T33",
-		parse_proc_cpuinfo_hardware_tegra("enrc2b"));
-	EXPECT_EQ("Nvidia Tegra T33",
-		parse_proc_cpuinfo_hardware_tegra("evitareul"));
-	EXPECT_EQ("Nvidia Tegra T33",
-		parse_proc_cpuinfo_hardware_tegra("tegra_fjdev103"));
-}
+	TEST(PROC_CPUINFO_HARDWARE, nvidia) {
+		EXPECT_EQ("Nvidia Tegra AP20H",
+			parse_proc_cpuinfo_hardware_tegra("picasso"));
+		EXPECT_EQ("Nvidia Tegra AP20H",
+			parse_proc_cpuinfo_hardware_tegra("picasso_e"));
+		EXPECT_EQ("Nvidia Tegra AP20H",
+			parse_proc_cpuinfo_hardware_tegra("stingray"));
+		EXPECT_EQ("Nvidia Tegra AP33",
+			parse_proc_cpuinfo_hardware_tegra("endeavoru"));
+		EXPECT_EQ("Nvidia Tegra AP33",
+			parse_proc_cpuinfo_hardware_tegra("x3"));
+		EXPECT_EQ("Nvidia Tegra SL460N",
+			parse_proc_cpuinfo_hardware_tegra("Ceres"));
+		EXPECT_EQ("Nvidia Tegra T114",
+			parse_proc_cpuinfo_hardware_tegra("macallan"));
+		EXPECT_EQ("Nvidia Tegra T114",
+			parse_proc_cpuinfo_hardware_tegra("mozart"));
+		EXPECT_EQ("Nvidia Tegra T114",
+			parse_proc_cpuinfo_hardware_tegra("tostab12BA"));
+		EXPECT_EQ("Nvidia Tegra T124",
+			parse_proc_cpuinfo_hardware_tegra("mocha"));
+		EXPECT_EQ("Nvidia Tegra T124",
+			parse_proc_cpuinfo_hardware_tegra("tn8"));
+		EXPECT_EQ("Nvidia Tegra T20",
+			parse_proc_cpuinfo_hardware_tegra("nbx03"));
+		EXPECT_EQ("Nvidia Tegra T20",
+			parse_proc_cpuinfo_hardware_tegra("p3"));
+		EXPECT_EQ("Nvidia Tegra T20",
+			parse_proc_cpuinfo_hardware_tegra("ventana"));
+		EXPECT_EQ("Nvidia Tegra T30",
+			parse_proc_cpuinfo_hardware_tegra("cardhu"));
+		EXPECT_EQ("Nvidia Tegra T30",
+			parse_proc_cpuinfo_hardware_tegra("chagall"));
+		EXPECT_EQ("Nvidia Tegra T30",
+			parse_proc_cpuinfo_hardware_tegra("picasso_m"));
+		EXPECT_EQ("Nvidia Tegra T30",
+			parse_proc_cpuinfo_hardware_tegra("picasso_mf"));
+		EXPECT_EQ("Nvidia Tegra T30L",
+			parse_proc_cpuinfo_hardware_tegra("BIRCH"));
+		EXPECT_EQ("Nvidia Tegra T30L",
+			parse_proc_cpuinfo_hardware_tegra("NS_14T004"));
+		EXPECT_EQ("Nvidia Tegra T30L",
+			parse_proc_cpuinfo_hardware_tegra("avalon"));
+		EXPECT_EQ("Nvidia Tegra T30L",
+			parse_proc_cpuinfo_hardware_tegra("picasso_e2"));
+		EXPECT_EQ("Nvidia Tegra T30L",
+			parse_proc_cpuinfo_hardware_tegra("tostab12BL"));
+		EXPECT_EQ("Nvidia Tegra T30L",
+			parse_proc_cpuinfo_hardware_tegra("txs03"));
+		EXPECT_EQ("Nvidia Tegra T33",
+			parse_proc_cpuinfo_hardware_tegra("bobsleigh"));
+		EXPECT_EQ("Nvidia Tegra T33",
+			parse_proc_cpuinfo_hardware_tegra("enrc2b"));
+		EXPECT_EQ("Nvidia Tegra T33",
+			parse_proc_cpuinfo_hardware_tegra("evitareul"));
+		EXPECT_EQ("Nvidia Tegra T33",
+			parse_proc_cpuinfo_hardware_tegra("tegra_fjdev103"));
+	}
+#endif /* CPUINFO_ARCH_ARM */
 
 TEST(PROC_CPUINFO_HARDWARE, rockchip_rk) {
 	EXPECT_EQ("Rockchip RK3126",
@@ -745,25 +763,27 @@ TEST(PROC_CPUINFO_HARDWARE, telechips) {
 		parse_proc_cpuinfo_hardware("tcc893x"));
 }
 
-TEST(PROC_CPUINFO_HARDWARE, texas_instruments_omap) {
-	EXPECT_EQ("Texas Instruments OMAP4430",
-		parse_proc_cpuinfo_hardware("OMAP4430"));
-	EXPECT_EQ("Texas Instruments OMAP4460",
-		parse_proc_cpuinfo_hardware("OMAP4460"));
-}
+#if CPUINFO_ARCH_ARM
+	TEST(PROC_CPUINFO_HARDWARE, texas_instruments_omap) {
+		EXPECT_EQ("Texas Instruments OMAP4430",
+			parse_proc_cpuinfo_hardware("OMAP4430"));
+		EXPECT_EQ("Texas Instruments OMAP4460",
+			parse_proc_cpuinfo_hardware("OMAP4460"));
+	}
 
-TEST(PROC_CPUINFO_HARDWARE, texas_instruments_special) {
-	EXPECT_EQ("Texas Instruments OMAP4430",
-		parse_proc_cpuinfo_hardware("mapphone_CDMA"));
-	EXPECT_EQ("Texas Instruments OMAP4460",
-		parse_proc_cpuinfo_hardware("Tuna"));
-}
+	TEST(PROC_CPUINFO_HARDWARE, texas_instruments_special) {
+		EXPECT_EQ("Texas Instruments OMAP4430",
+			parse_proc_cpuinfo_hardware("mapphone_CDMA"));
+		EXPECT_EQ("Texas Instruments OMAP4460",
+			parse_proc_cpuinfo_hardware("Tuna"));
+	}
 
-TEST(PROC_CPUINFO_HARDWARE, wondermedia) {
-	EXPECT_EQ("WonderMedia WM8850",
-		parse_proc_cpuinfo_hardware("WMT", 1, 1200000));
-	EXPECT_EQ("WonderMedia WM8880",
-		parse_proc_cpuinfo_hardware("WMT", 2, 1500000));
-	EXPECT_EQ("WonderMedia WM8950",
-		parse_proc_cpuinfo_hardware("WMT", 1, 1008000));
-}
+	TEST(PROC_CPUINFO_HARDWARE, wondermedia) {
+		EXPECT_EQ("WonderMedia WM8850",
+			parse_proc_cpuinfo_hardware("WMT", 1, 1200000));
+		EXPECT_EQ("WonderMedia WM8880",
+			parse_proc_cpuinfo_hardware("WMT", 2, 1500000));
+		EXPECT_EQ("WonderMedia WM8950",
+			parse_proc_cpuinfo_hardware("WMT", 1, 1008000));
+	}
+#endif
diff --git a/test/name/ro-board-platform.cc b/test/name/ro-board-platform.cc
index 2125454..51d73c3 100644
--- a/test/name/ro-board-platform.cc
+++ b/test/name/ro-board-platform.cc
@@ -34,10 +34,12 @@ TEST(RO_BOARD_PLATFORM, qualcomm_msm) {
 		parse_ro_board_platform("msm8084"));
 	EXPECT_EQ("Qualcomm MSM8226",
 		parse_ro_board_platform("msm8226"));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("Qualcomm MSM8610",
 		parse_ro_board_platform("msm8610", 2));
 	EXPECT_EQ("Qualcomm MSM8612",
 		parse_ro_board_platform("msm8610", 4));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("Qualcomm MSM8612",
 		parse_ro_board_platform("MSM8612"));
 	EXPECT_EQ("Qualcomm MSM8660",
@@ -168,18 +170,22 @@ TEST(RO_BOARD_PLATFORM, samsung) {
 }
 
 TEST(RO_BOARD_PLATFORM, hisilicon) {
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("HiSilicon K3V2",
 		parse_ro_board_platform("k3v200"));
 	EXPECT_EQ("HiSilicon K3V2",
 		parse_ro_board_platform("k3v2oem1"));
+#endif
 	EXPECT_EQ("HiSilicon Kirin 620",
 		parse_ro_board_platform("hi6210sft"));
 	EXPECT_EQ("HiSilicon Kirin 650",
 		parse_ro_board_platform("hi6250"));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("HiSilicon Kirin 910T",
 		parse_ro_board_platform("hi6620oem"));
 	EXPECT_EQ("HiSilicon Kirin 920",
 		parse_ro_board_platform("hi3630"));
+#endif
 	EXPECT_EQ("HiSilicon Kirin 930",
 		parse_ro_board_platform("hi3635"));
 	EXPECT_EQ("HiSilicon Kirin 950",
@@ -191,12 +197,14 @@ TEST(RO_BOARD_PLATFORM, hisilicon) {
 }
 
 TEST(RO_BOARD_PLATFORM, amlogic) {
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("Amlogic AML8726-M",
 		parse_ro_board_platform("meson3"));
 	EXPECT_EQ("Amlogic AML8726-MX",
 		parse_ro_board_platform("meson6"));
 	EXPECT_EQ("Amlogic S805",
 		parse_ro_board_platform("meson8"));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("Amlogic S905",
 		parse_ro_board_platform("gxbaby"));
 	EXPECT_EQ("Amlogic S905X",
@@ -205,38 +213,42 @@ TEST(RO_BOARD_PLATFORM, amlogic) {
 		parse_ro_board_platform("gxm"));
 }
 
-TEST(RO_BOARD_PLATFORM, broadcom) {
-	EXPECT_EQ("Broadcom BCM21654",
-		parse_ro_board_platform("rhea", 1, 849999));
-	EXPECT_EQ("Broadcom BCM21654G",
-		parse_ro_board_platform("rhea", 1, 999999));
-	EXPECT_EQ("Broadcom BCM21663",
-		parse_ro_board_platform("hawaii", 1, 999999));
-	EXPECT_EQ("Broadcom BCM21664",
-		parse_ro_board_platform("hawaii", 2, 999999));
-	EXPECT_EQ("Broadcom BCM21664T",
-		parse_ro_board_platform("hawaii", 2, 1200000));
-	EXPECT_EQ("Broadcom BCM23550",
-		parse_ro_board_platform("java", 4, 1200000));
-	EXPECT_EQ("Broadcom BCM28155",
-		parse_ro_board_platform("capri", 2, 1200000));
-	EXPECT_EQ("Broadcom BCM28155",
-		parse_ro_board_platform("capri", 2, 1399999));
-}
+#if CPUINFO_ARCH_ARM
+	TEST(RO_BOARD_PLATFORM, broadcom) {
+		EXPECT_EQ("Broadcom BCM21654",
+			parse_ro_board_platform("rhea", 1, 849999));
+		EXPECT_EQ("Broadcom BCM21654G",
+			parse_ro_board_platform("rhea", 1, 999999));
+		EXPECT_EQ("Broadcom BCM21663",
+			parse_ro_board_platform("hawaii", 1, 999999));
+		EXPECT_EQ("Broadcom BCM21664",
+			parse_ro_board_platform("hawaii", 2, 999999));
+		EXPECT_EQ("Broadcom BCM21664T",
+			parse_ro_board_platform("hawaii", 2, 1200000));
+		EXPECT_EQ("Broadcom BCM23550",
+			parse_ro_board_platform("java", 4, 1200000));
+		EXPECT_EQ("Broadcom BCM28155",
+			parse_ro_board_platform("capri", 2, 1200000));
+		EXPECT_EQ("Broadcom BCM28155",
+			parse_ro_board_platform("capri", 2, 1399999));
+	}
 
-TEST(RO_BOARD_PLATFORM, leadcore) {
-	EXPECT_EQ("Leadcore LC1860",
-		parse_ro_board_platform("lc1860"));
-}
+	TEST(RO_BOARD_PLATFORM, leadcore) {
+		EXPECT_EQ("Leadcore LC1860",
+			parse_ro_board_platform("lc1860"));
+	}
 
-TEST(RO_BOARD_PLATFORM, novathor) {
-	EXPECT_EQ("NovaThor U8500",
-		parse_ro_board_platform("montblanc"));
-}
+	TEST(RO_BOARD_PLATFORM, novathor) {
+		EXPECT_EQ("NovaThor U8500",
+			parse_ro_board_platform("montblanc"));
+	}
+#endif /* CPUINFO_ARCH_ARM */
 
 TEST(RO_BOARD_PLATFORM, nvidia) {
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("Nvidia Tegra T114",
 		parse_ro_board_platform("tegra4"));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("Nvidia Tegra T132",
 		parse_ro_board_platform("tegra132"));
 	EXPECT_EQ("Nvidia Tegra T210",
@@ -259,8 +271,10 @@ TEST(RO_BOARD_PLATFORM, rockchip_rk) {
 		parse_ro_board_platform("rk3188"));
 	EXPECT_EQ("Rockchip RK3228",
 		parse_ro_board_platform("rk3228"));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("Rockchip RK3229",
 		parse_ro_board_platform("rk322x"));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("Rockchip RK3288",
 		parse_ro_board_platform("rk3288", 4));
 	EXPECT_EQ("Rockchip RK3399",
@@ -290,7 +304,9 @@ TEST(RO_BOARD_PLATFORM, spreadtrum_sc) {
 		parse_ro_board_platform("sc8830"));
 }
 
-TEST(RO_BOARD_PLATFORM, texas_instruments_omap) {
-	EXPECT_EQ("Texas Instruments OMAP4430",
-		parse_ro_board_platform("omap4", 2, 1008000));
-}
+#if CPUINFO_ARCH_ARM
+	TEST(RO_BOARD_PLATFORM, texas_instruments_omap) {
+		EXPECT_EQ("Texas Instruments OMAP4430",
+			parse_ro_board_platform("omap4", 2, 1008000));
+	}
+#endif /* CPUINFO_ARCH_ARM */
diff --git a/test/name/ro-chipname.cc b/test/name/ro-chipname.cc
index 7f82ade..d1230ee 100644
--- a/test/name/ro-chipname.cc
+++ b/test/name/ro-chipname.cc
@@ -153,17 +153,19 @@ TEST(RO_CHIPNAME, samsung_exynos) {
 		parse_ro_chipname("exynos8895"));
 }
 
-TEST(RO_CHIPNAME, marvell_pxa) {
-	EXPECT_EQ("Marvell PXA1088",
-		parse_ro_chipname("PXA1088"));
-	EXPECT_EQ("Marvell PXA986",
-		parse_ro_chipname("PXA986"));
-}
+#if CPUINFO_ARCH_ARM
+	TEST(RO_CHIPNAME, marvell_pxa) {
+		EXPECT_EQ("Marvell PXA1088",
+			parse_ro_chipname("PXA1088"));
+		EXPECT_EQ("Marvell PXA986",
+			parse_ro_chipname("PXA986"));
+	}
 
-TEST(RO_CHIPNAME, renesas) {
-	EXPECT_EQ("Renesas MP5232",
-		parse_ro_chipname("mp523x"));
-}
+	TEST(RO_CHIPNAME, renesas) {
+		EXPECT_EQ("Renesas MP5232",
+			parse_ro_chipname("mp523x"));
+	}
+#endif /* CPUINFO_ARCH_ARM */
 
 TEST(RO_CHIPNAME, spreadtrum) {
 	EXPECT_EQ("Spreadtrum SC6815AS",
diff --git a/test/name/ro-product-board.cc b/test/name/ro-product-board.cc
index 3c99acf..48a2d72 100644
--- a/test/name/ro-product-board.cc
+++ b/test/name/ro-product-board.cc
@@ -50,10 +50,12 @@ TEST(RO_PRODUCT_BOARD, qualcomm_msm) {
 		parse_ro_product_board("MSM8260A"));
 	EXPECT_EQ("Qualcomm MSM8274",
 		parse_ro_product_board("MSM8274"));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("Qualcomm MSM8610",
 		parse_ro_product_board("MSM8610", 2));
 	EXPECT_EQ("Qualcomm MSM8612",
 		parse_ro_product_board("MSM8610", 4));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("Qualcomm MSM8612",
 		parse_ro_product_board("MSM8612"));
 	EXPECT_EQ("Qualcomm MSM8625",
@@ -300,12 +302,14 @@ TEST(RO_PRODUCT_BOARD, samsung_universal) {
 		parse_ro_product_board("universal8895"));
 }
 
-TEST(RO_PRODUCT_BOARD, samsung_smdk) {
-	EXPECT_EQ("Samsung Exynos 4212",
-		parse_ro_product_board("smdk4x12", 2));
-	EXPECT_EQ("Samsung Exynos 4412",
-		parse_ro_product_board("smdk4x12", 4));
-}
+#if CPUINFO_ARCH_ARM
+	TEST(RO_PRODUCT_BOARD, samsung_smdk) {
+		EXPECT_EQ("Samsung Exynos 4212",
+			parse_ro_product_board("smdk4x12", 2));
+		EXPECT_EQ("Samsung Exynos 4412",
+			parse_ro_product_board("smdk4x12", 4));
+	}
+#endif
 
 TEST(RO_PRODUCT_BOARD, hisilicon_huawei) {
 	EXPECT_EQ("HiSilicon Kirin 659",
@@ -353,8 +357,10 @@ TEST(RO_PRODUCT_BOARD, hisilicon_special) {
 		parse_ro_product_board("hi6210sft"));
 	EXPECT_EQ("HiSilicon Kirin 650",
 		parse_ro_product_board("hi6250"));
+#if CPUINFO_ARCH_ARM
 	EXPECT_EQ("HiSilicon Kirin 920",
 		parse_ro_product_board("hi3630"));
+#endif /* CPUINFO_ARCH_ARM */
 	EXPECT_EQ("HiSilicon Kirin 930",
 		parse_ro_product_board("hi3635"));
 	EXPECT_EQ("HiSilicon Kirin 950",
@@ -365,69 +371,71 @@ TEST(RO_PRODUCT_BOARD, hisilicon_special) {
 		parse_ro_product_board("BEETHOVEN"));
 }
 
-TEST(RO_PRODUCT_BOARD, broadcom) {
-	EXPECT_EQ("Broadcom BCM28155",
-		parse_ro_product_board("capri", 2, 1200000));
-	EXPECT_EQ("Broadcom BCM28155",
-		parse_ro_product_board("capri", 2, 1300000));
-	EXPECT_EQ("Broadcom BCM28155",
-		parse_ro_product_board("capri", 2, 1399999));
-	EXPECT_EQ("Broadcom BCM28155",
-		parse_ro_product_board("capri", 2, 1399999));
-	EXPECT_EQ("Broadcom BCM23550",
-		parse_ro_product_board("java", 4, 1200000));
-	EXPECT_EQ("Broadcom BCM23550",
-		parse_ro_product_board("java", 4, 1300000));
-	EXPECT_EQ("Broadcom BCM21654",
-		parse_ro_product_board("rhea", 1, 849999));
-	EXPECT_EQ("Broadcom BCM21654G",
-		parse_ro_product_board("rhea", 1, 999999));
-	EXPECT_EQ("Broadcom BCM21663",
-		parse_ro_product_board("hawaii", 1, 999999));
-	EXPECT_EQ("Broadcom BCM21664",
-		parse_ro_product_board("hawaii", 2, 999999));
-	EXPECT_EQ("Broadcom BCM21664T",
-		parse_ro_product_board("hawaii", 2, 1200000));
-}
+#if CPUINFO_ARCH_ARM
+	TEST(RO_PRODUCT_BOARD, broadcom) {
+		EXPECT_EQ("Broadcom BCM28155",
+			parse_ro_product_board("capri", 2, 1200000));
+		EXPECT_EQ("Broadcom BCM28155",
+			parse_ro_product_board("capri", 2, 1300000));
+		EXPECT_EQ("Broadcom BCM28155",
+			parse_ro_product_board("capri", 2, 1399999));
+		EXPECT_EQ("Broadcom BCM28155",
+			parse_ro_product_board("capri", 2, 1399999));
+		EXPECT_EQ("Broadcom BCM23550",
+			parse_ro_product_board("java", 4, 1200000));
+		EXPECT_EQ("Broadcom BCM23550",
+			parse_ro_product_board("java", 4, 1300000));
+		EXPECT_EQ("Broadcom BCM21654",
+			parse_ro_product_board("rhea", 1, 849999));
+		EXPECT_EQ("Broadcom BCM21654G",
+			parse_ro_product_board("rhea", 1, 999999));
+		EXPECT_EQ("Broadcom BCM21663",
+			parse_ro_product_board("hawaii", 1, 999999));
+		EXPECT_EQ("Broadcom BCM21664",
+			parse_ro_product_board("hawaii", 2, 999999));
+		EXPECT_EQ("Broadcom BCM21664T",
+			parse_ro_product_board("hawaii", 2, 1200000));
+	}
 
-TEST(RO_PRODUCT_BOARD, leadcore_lc) {
-	EXPECT_EQ("Leadcore LC1810",
-		parse_ro_product_board("lc1810"));
-}
+	TEST(RO_PRODUCT_BOARD, leadcore_lc) {
+		EXPECT_EQ("Leadcore LC1810",
+			parse_ro_product_board("lc1810"));
+	}
 
-TEST(RO_PRODUCT_BOARD, marvell_pxa) {
-	EXPECT_EQ("Marvell PXA1088",
-		parse_ro_product_board("PXA1088"));
-	EXPECT_EQ("Marvell PXA986",
-		parse_ro_product_board("PXA986"));
-	EXPECT_EQ("Marvell PXA988",
-		parse_ro_product_board("PXA988"));
-}
+	TEST(RO_PRODUCT_BOARD, marvell_pxa) {
+		EXPECT_EQ("Marvell PXA1088",
+			parse_ro_product_board("PXA1088"));
+		EXPECT_EQ("Marvell PXA986",
+			parse_ro_product_board("PXA986"));
+		EXPECT_EQ("Marvell PXA988",
+			parse_ro_product_board("PXA988"));
+	}
 
-TEST(RO_PRODUCT_BOARD, nvidia) {
-	EXPECT_EQ("Nvidia Tegra SL460N",
-		parse_ro_product_board("g2mv"));
-	EXPECT_EQ("Nvidia Tegra T132",
-		parse_ro_product_board("flounder"));
-	EXPECT_EQ("Nvidia Tegra T210",
-		parse_ro_product_board("dragon"));
-	EXPECT_EQ("Nvidia Tegra T30L",
-		parse_ro_product_board("grouper"));
-}
+	TEST(RO_PRODUCT_BOARD, nvidia) {
+		EXPECT_EQ("Nvidia Tegra SL460N",
+			parse_ro_product_board("g2mv"));
+		EXPECT_EQ("Nvidia Tegra T132",
+			parse_ro_product_board("flounder"));
+		EXPECT_EQ("Nvidia Tegra T210",
+			parse_ro_product_board("dragon"));
+		EXPECT_EQ("Nvidia Tegra T30L",
+			parse_ro_product_board("grouper"));
+	}
 
-TEST(RO_PRODUCT_BOARD, renesas) {
-	EXPECT_EQ("Renesas MP5232",
-		parse_ro_product_board("mp523x"));
-}
+	TEST(RO_PRODUCT_BOARD, renesas) {
+		EXPECT_EQ("Renesas MP5232",
+			parse_ro_product_board("mp523x"));
+	}
 
-TEST(RO_PRODUCT_BOARD, rockchip) {
-	EXPECT_EQ("Rockchip RK3066",
-		parse_ro_product_board("T7H"));
-	EXPECT_EQ("Rockchip RK3168",
-		parse_ro_product_board("hws7701u"));
-	EXPECT_EQ("Rockchip RK3188",
-		parse_ro_product_board("K00F"));
-}
+	TEST(RO_PRODUCT_BOARD, rockchip) {
+		EXPECT_EQ("Rockchip RK3066",
+			parse_ro_product_board("T7H"));
+		EXPECT_EQ("Rockchip RK3168",
+			parse_ro_product_board("hws7701u"));
+		EXPECT_EQ("Rockchip RK3188",
+			parse_ro_product_board("K00F"));
+	}
+#endif
 
 TEST(RO_PRODUCT_BOARD, spreadtrum) {
 	EXPECT_EQ("Spreadtrum SC6815AS",
@@ -464,7 +472,9 @@ TEST(RO_PRODUCT_BOARD, spreadtrum) {
 		parse_ro_product_board("SC9830I"));
 }
 
-TEST(RO_PRODUCT_BOARD, texas_instruments) {
-	EXPECT_EQ("Texas Instruments OMAP4460",
-		parse_ro_product_board("tuna"));
-}
+#if CPUINFO_ARCH_ARM
+	TEST(RO_PRODUCT_BOARD, texas_instruments) {
+		EXPECT_EQ("Texas Instruments OMAP4460",
+			parse_ro_product_board("tuna"));
+	}
+#endif /* CPUINFO_ARCH_ARM */