aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cpu/allwinner/a10/Kconfig9
-rw-r--r--src/cpu/allwinner/a10/Makefile.inc1
-rw-r--r--src/cpu/allwinner/a10/bootblock.c2
3 files changed, 3 insertions, 9 deletions
diff --git a/src/cpu/allwinner/a10/Kconfig b/src/cpu/allwinner/a10/Kconfig
index 387964f607..2bf32ecfaf 100644
--- a/src/cpu/allwinner/a10/Kconfig
+++ b/src/cpu/allwinner/a10/Kconfig
@@ -12,14 +12,7 @@ config CPU_SPECIFIC_OPTIONS
select HAVE_MONOTONIC_TIMER
select HAVE_UART_SPECIAL
select BOOTBLOCK_CONSOLE
-
-config BOOTBLOCK_CPU_INIT
- string
- default "cpu/allwinner/a10/bootblock.c"
- help
- CPU/SoC-specific bootblock code. This is useful if the
- bootblock must load microcode or copy data from ROM before
- searching for the bootblock.
+ select CPU_HAS_BOOTBLOCK_INIT
# The "eGON.BT0" header takes 32 bytes
config BOOTBLOCK_BASE
diff --git a/src/cpu/allwinner/a10/Makefile.inc b/src/cpu/allwinner/a10/Makefile.inc
index 716e463e39..152d7657fb 100644
--- a/src/cpu/allwinner/a10/Makefile.inc
+++ b/src/cpu/allwinner/a10/Makefile.inc
@@ -1,3 +1,4 @@
+bootblock-y += bootblock.c
bootblock-y += bootblock_media.c
bootblock-y += clock.c
bootblock-y += gpio.c
diff --git a/src/cpu/allwinner/a10/bootblock.c b/src/cpu/allwinner/a10/bootblock.c
index 38fe95308f..d470755453 100644
--- a/src/cpu/allwinner/a10/bootblock.c
+++ b/src/cpu/allwinner/a10/bootblock.c
@@ -8,8 +8,8 @@
#include <types.h>
#include <arch/cache.h>
+#include <bootblock_common.h>
-void bootblock_cpu_init(void);
void bootblock_cpu_init(void)
{
uint32_t sctlr;