3 files changed, 3 insertions, 5 deletions
diff --git a/src/mainboard/cubietech/cubieboard/Kconfig b/src/mainboard/cubietech/cubieboard/Kconfig
index c12732959c90..68145c39d776 100644
--- a/src/mainboard/cubietech/cubieboard/Kconfig
+++ b/src/mainboard/cubietech/cubieboard/Kconfig
@@ -5,6 +5,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select CPU_ALLWINNER_A10
 	select BOARD_ROMSIZE_KB_4096
 	select DRIVER_XPOWERS_AXP209
+	select MAINBOARD_HAS_BOOTBLOCK_INIT
 
 config MAINBOARD_DIR
 	string
@@ -18,10 +19,6 @@ config MAX_CPUS
 	int
 	default 1
 
-config BOOTBLOCK_MAINBOARD_INIT
-	string
-	default "mainboard/cubietech/cubieboard/bootblock.c"
-
 config DRAM_SIZE_MB
 	int
 	default 1024
diff --git a/src/mainboard/cubietech/cubieboard/Makefile.inc b/src/mainboard/cubietech/cubieboard/Makefile.inc
index 29763fb4f6bb..9bd017393cbf 100644
--- a/src/mainboard/cubietech/cubieboard/Makefile.inc
+++ b/src/mainboard/cubietech/cubieboard/Makefile.inc
@@ -1 +1,2 @@
+bootblock-y += bootblock.c
 romstage-y += romstage.c
diff --git a/src/mainboard/cubietech/cubieboard/bootblock.c b/src/mainboard/cubietech/cubieboard/bootblock.c
index 9f6db93fdd15..360f914aa7c0 100644
--- a/src/mainboard/cubietech/cubieboard/bootblock.c
+++ b/src/mainboard/cubietech/cubieboard/bootblock.c
@@ -7,6 +7,7 @@
  */
 
 #include <arch/io.h>
+#include <bootblock_common.h>
 #include <console/uart.h>
 #include <console/console.h>
 #include <delay.h>
@@ -126,7 +127,6 @@ static void cubieboard_raminit(void)
 	////ram_check((u32)test_base, (u32)test_base + 0x1000);
 }
 
-void bootblock_mainboard_init(void);
 void bootblock_mainboard_init(void)
 {
 	/* A10 Timer init uses the 24MHz clock, not PLLs, so we can init it very