8 files changed, 7 insertions, 10 deletions
diff --git a/src/mainboard/google/veyron_brain/board.h b/src/mainboard/google/veyron_brain/board.h
index 96159d41e8..6e6a62c834 100644
--- a/src/mainboard/google/veyron_brain/board.h
+++ b/src/mainboard/google/veyron_brain/board.h
@@ -25,6 +25,6 @@
 
 #define GPIO_RESET	GPIO(0, B, 5)
 
-/* TODO: move setup_chromeos_gpios() here once bootblock code is in mainboard */
+void setup_chromeos_gpios(void);
 
 #endif	/* __MAINBOARD_GOOGLE_VEYRON_BRAIN_BOARD_H */
diff --git a/src/mainboard/google/veyron_danger/board.h b/src/mainboard/google/veyron_danger/board.h
index bd826aafdf..4d0e8bec34 100644
--- a/src/mainboard/google/veyron_danger/board.h
+++ b/src/mainboard/google/veyron_danger/board.h
@@ -26,6 +26,6 @@
 #define GPIO_BACKLIGHT  GPIO(7, A, 3)
 #define GPIO_RESET	GPIO(0, B, 5)
 
-/* TODO: move setup_chromeos_gpios() here once bootblock code is in mainboard */
+void setup_chromeos_gpios(void);
 
 #endif	/* __MAINBOARD_GOOGLE_VEYRON_BRAIN_BOARD_H */
diff --git a/src/mainboard/google/veyron_jerry/board.h b/src/mainboard/google/veyron_jerry/board.h
index 3d567ded68..2f8a341d4f 100644
--- a/src/mainboard/google/veyron_jerry/board.h
+++ b/src/mainboard/google/veyron_jerry/board.h
@@ -26,6 +26,6 @@
 #define GPIO_BACKLIGHT	GPIO(7, A, 0)
 #define GPIO_RESET	GPIO(0, B, 5)
 
-/* TODO: move setup_chromeos_gpios() here once bootblock code is in mainboard */
+void setup_chromeos_gpios(void);
 
 #endif	/* __MAINBOARD_GOOGLE_VEYRON_JERRY_BOARD_H */
diff --git a/src/mainboard/google/veyron_mighty/board.h b/src/mainboard/google/veyron_mighty/board.h
index 280568a43f..2ca1a41392 100644
--- a/src/mainboard/google/veyron_mighty/board.h
+++ b/src/mainboard/google/veyron_mighty/board.h
@@ -26,6 +26,6 @@
 #define GPIO_BACKLIGHT	GPIO(7, A, 0)
 #define GPIO_RESET	GPIO(0, B, 5)
 
-/* TODO: move setup_chromeos_gpios() here once bootblock code is in mainboard */
+void setup_chromeos_gpios(void);
 
 #endif	/* __MAINBOARD_GOOGLE_VEYRON_MIGHTY_BOARD_H */
diff --git a/src/mainboard/google/veyron_pinky/board.h b/src/mainboard/google/veyron_pinky/board.h
index 8fe102fd26..45590e7a57 100644
--- a/src/mainboard/google/veyron_pinky/board.h
+++ b/src/mainboard/google/veyron_pinky/board.h
@@ -26,6 +26,6 @@
 #define GPIO_BACKLIGHT	GPIO(7, A, 0)
 #define GPIO_RESET	(board_id() > 0 ? GPIO(0, B, 5) : GPIO(0, B, 2))
 
-/* TODO: move setup_chromeos_gpios() here once bootblock code is in mainboard */
+void setup_chromeos_gpios(void);
 
 #endif	/* __MAINBOARD_GOOGLE_VEYRON_PINKY_BOARD_H */
diff --git a/src/mainboard/google/veyron_rialto/board.h b/src/mainboard/google/veyron_rialto/board.h
index 7cd8da69ec..7c6fa3725e 100644
--- a/src/mainboard/google/veyron_rialto/board.h
+++ b/src/mainboard/google/veyron_rialto/board.h
@@ -25,6 +25,6 @@
 
 #define GPIO_RESET	GPIO(0, B, 5)
 
-/* TODO: move setup_chromeos_gpios() here once bootblock code is in mainboard */
+void setup_chromeos_gpios(void);
 
 #endif	/* __MAINBOARD_GOOGLE_VEYRON_RIALTO_BOARD_H */
diff --git a/src/mainboard/google/veyron_speedy/board.h b/src/mainboard/google/veyron_speedy/board.h
index 817aac2981..f98854e168 100644
--- a/src/mainboard/google/veyron_speedy/board.h
+++ b/src/mainboard/google/veyron_speedy/board.h
@@ -26,6 +26,6 @@
 #define GPIO_BACKLIGHT	GPIO(7, A, 0)
 #define GPIO_RESET	GPIO(0, B, 5)
 
-/* TODO: move setup_chromeos_gpios() here once bootblock code is in mainboard */
+void setup_chromeos_gpios(void);
 
 #endif	/* __MAINBOARD_GOOGLE_VEYRON_SPEEDY_BOARD_H */
diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h
index 13a4fe3503..1184fa573e 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -26,9 +26,6 @@
 #include "vboot_common.h"
 #include "vboot2/misc.h"
 
-/*for mainboard use only*/
-void setup_chromeos_gpios(void);
-
 /* functions implemented in vbnv.c: */
 int get_recovery_mode_from_vbnv(void);
 int vboot_wants_oprom(void);