[coreboot-gerrit] Patch set updated for coreboot: c52f0f2 arm/allwinner/a10: use new arm bootblock infrastructure

[Alexander Couzens (lynxis@fe80.eu)]

Alexander Couzens (lynxis at fe80.eu) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7187

-gerrit

commit c52f0f274ca115e7832d516f676a6f5765a99e6c
Author: Alexander Couzens <lynxis at fe80.eu>
Date:   Fri Oct 24 23:34:39 2014 +0200

    arm/allwinner/a10: use new arm bootblock infrastructure
    
    commit 8b685398 change config flags for cpu and mainboard
    bootblock initialization.
    
    Change-Id: I753aa60ff66de9a3352a3a0759e4d0be9d8ae1c7
    Signed-off-by: Alexander Couzens <lynxis at fe80.eu>
---
 src/cpu/allwinner/a10/Kconfig      | 9 +--------
 src/cpu/allwinner/a10/Makefile.inc | 1 +
 src/cpu/allwinner/a10/bootblock.c  | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/cpu/allwinner/a10/Kconfig b/src/cpu/allwinner/a10/Kconfig
index 387964f..2bf32ec 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 716e463..152d765 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 38fe953..d470755 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;