Index: sys/arch/arm/cortex/armperiph.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/cortex/armperiph.c,v
retrieving revision 1.15
diff -u -p -r1.15 armperiph.c
--- sys/arch/arm/cortex/armperiph.c	25 Sep 2018 20:55:34 -0000	1.15
+++ sys/arch/arm/cortex/armperiph.c	27 Sep 2018 19:31:35 -0000
@@ -230,15 +230,11 @@ armperiph_attach(device_t parent, device
 			.mpcaa_off1 = cfg->cfg_devices[i].pi_off1,
 			.mpcaa_off2 = cfg->cfg_devices[i].pi_off2,
 		};
-#if defined(CPU_CORTEXA9) || defined(CPU_CORTEXA5)
 		if (strcmp(mpcaa.mpcaa_name, "arma9tmr") == 0)
 			mpcaa.mpcaa_irq = IRQ_A9TMR_PPI_GTIMER;
-#endif
-#if defined(CPU_CORTEXA7) || defined(CPU_CORTEXA15) || defined(CPU_CORTEXA57)
-		if (strcmp(mpcaa.mpcaa_name, "armgtmr") == 0) {
+		else if (strcmp(mpcaa.mpcaa_name, "armgtmr") == 0) {
 			mpcaa.mpcaa_irq = IRQ_GTMR_PPI_VTIMER;
 		}
-#endif
 
 		config_found(self, &mpcaa, NULL);
 	}