These files will support the whole at91sam9x5 family when done,

so rename them now before they get copied further afield...

sys/arm/at91/at91sam9x5.c

@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <arm/at91/at91reg.h>
 #include <arm/at91/at91soc.h>
 #include <arm/at91/at91_aicreg.h>
-#include <arm/at91/at91sam9x25reg.h>
+#include <arm/at91/at91sam9x5reg.h>
 #include <arm/at91/at91_pitreg.h>
 #include <arm/at91/at91_pmcreg.h>
 #include <arm/at91/at91_pmcvar.h>

sys/arm/at91/at91sam9x5reg.h

@@ -27,8 +27,8 @@
 
 /* $FreeBSD$ */
 
-#ifndef AT91SAM9X25REG_H_
-#define AT91SAM9X25REG_H_
+#ifndef AT91SAM9X5REG_H_
+#define AT91SAM9X5REG_H_
 
 #ifndef AT91SAM9X25_MASTER_CLOCK
 #define AT91SAM9X25_MASTER_CLOCK ((18432000 * 43)/6)
@@ -312,5 +312,4 @@
 #define AT91SAM9X25_SDRAMC_ISR	0x20
 #define AT91SAM9X25_SDRAMC_MDR	0x24
 
-#endif /* AT91SAM9X25REG_H_*/
-
+#endif /* AT91SAM9X5REG_H_*/

sys/arm/at91/files.at91

@@ -33,7 +33,7 @@ arm/at91/at91rm9200_devices.c	optional	at91rm9200
 arm/at91/at91sam9260.c		optional	at91sam9260
 arm/at91/at91sam9g20.c		optional	at91sam9g20
 arm/at91/at91sam9g45.c		optional	at91sam9g45
-arm/at91/at91sam9x25.c		optional	at91sam9x25
+arm/at91/at91sam9x5.c		optional	at91sam9x5
 #
 # All the boards we support
 #

sys/arm/at91/std.atmel

@@ -10,7 +10,7 @@ device		at91rm9200
 device		at91sam9260
 device		at91sam9g20
 device		at91sam9g45
-device		at91sam9x25
+device		at91sam9x5
 
 # bring in the sam specific timers and such
 device		at91sam9

sys/arm/at91/std.sam9x25ek

@@ -8,4 +8,4 @@ options		KERNPHYSADDR=0x20000000
 options		KERNVIRTADDR=0xc0000000
 
 device		at91_board_sam9x25ek
-device		at91sam9x25
+device		at91sam9x5