From 954bfb8bbf22c6f0bd3d53d4a9ca3e945b9c6edf Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 27 Jul 2012 16:38:02 +0000
Subject: [PATCH] Add new at91sam9g45 support and sn9g45 board to the ATMEL
 kernel. Adapt SN9G45 board support to cope with multi-board.

---
 sys/arm/at91/board_sn9g45.c | 2 +-
 sys/arm/at91/std.atmel      | 1 +
 sys/arm/conf/ATMEL          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/arm/at91/board_sn9g45.c b/sys/arm/at91/board_sn9g45.c
index 5fbb5329b05..eb1980e00cc 100644
--- a/sys/arm/at91/board_sn9g45.c
+++ b/sys/arm/at91/board_sn9g45.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <arm/at91/at91_piovar.h>
 #include <arm/at91/at91_pio_sam9g45.h>
 
-long
+BOARD_INIT long
 board_init(void)
 {
 
diff --git a/sys/arm/at91/std.atmel b/sys/arm/at91/std.atmel
index c278cf0ca1a..276d51ce304 100644
--- a/sys/arm/at91/std.atmel
+++ b/sys/arm/at91/std.atmel
@@ -9,6 +9,7 @@ options 	PHYSADDR=0x20000000
 device		at91rm9200
 device		at91sam9260
 device		at91sam9g20
+device		at91sam9g45
 device		at91sam9x25
 
 # bring in the sam specific timers and such
diff --git a/sys/arm/conf/ATMEL b/sys/arm/conf/ATMEL
index ba98e4b91ea..3a7787c9a35 100644
--- a/sys/arm/conf/ATMEL
+++ b/sys/arm/conf/ATMEL
@@ -28,6 +28,7 @@ device		at91_board_qila9g20
 device		at91_board_sam9260ek
 device		at91_board_sam9g20ek
 device		at91_board_sam9x25ek
+device		at91_board_sn9g45
 device		at91_board_tsc4370
 
 #makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols