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_gus/board.h b/src/mainboard/google/veyron_gus/board.h
index 61bf2bc6ae..25d4859d92 100644
--- a/src/mainboard/google/veyron_gus/board.h
+++ b/src/mainboard/google/veyron_gus/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_GUS_BOARD_H */
diff --git a/src/mainboard/google/veyron_jaq/board.h b/src/mainboard/google/veyron_jaq/board.h
index c363a99e2f..12f4a048ec 100644
--- a/src/mainboard/google/veyron_jaq/board.h
+++ b/src/mainboard/google/veyron_jaq/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_JAQ_BOARD_H */
diff --git a/src/mainboard/google/veyron_jerry/board.h b/src/mainboard/google/veyron_jerry/board.h
index be96ce7843..6aeca22d29 100644
--- a/src/mainboard/google/veyron_jerry/board.h
+++ b/src/mainboard/google/veyron_jerry/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_JERRY_BOARD_H */
diff --git a/src/mainboard/google/veyron_mighty/board.h b/src/mainboard/google/veyron_mighty/board.h
index 249552e79d..9c2fdc7c7e 100644
--- a/src/mainboard/google/veyron_mighty/board.h
+++ b/src/mainboard/google/veyron_mighty/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_MIGHTY_BOARD_H */
diff --git a/src/mainboard/google/veyron_minnie/board.h b/src/mainboard/google/veyron_minnie/board.h
index af1e0f02a5..fad9779e2c 100644
--- a/src/mainboard/google/veyron_minnie/board.h
+++ b/src/mainboard/google/veyron_minnie/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_MINNIE_BOARD_H */
diff --git a/src/mainboard/google/veyron_pinky/board.h b/src/mainboard/google/veyron_pinky/board.h
index bf842c1cc0..ae441fb4e3 100644
--- a/src/mainboard/google/veyron_pinky/board.h
+++ b/src/mainboard/google/veyron_pinky/board.h
@@ -25,6 +25,6 @@
 
 #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_speedy/board.h b/src/mainboard/google/veyron_speedy/board.h
index 244cdfb762..3366760196 100644
--- a/src/mainboard/google/veyron_speedy/board.h
+++ b/src/mainboard/google/veyron_speedy/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_SPEEDY_BOARD_H */
diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h
index d0e1f78c73..1a3b552508 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -34,9 +34,6 @@ int get_recovery_mode_switch(void);
 int clear_recovery_mode_switch(void);
 int get_write_protect_state(void);
 
-/*for mainboard use only*/
-void setup_chromeos_gpios(void);
-
 #ifdef __ROMSTAGE__
 void __attribute__((weak)) save_chromeos_gpios(void);
 #endif