[coreboot-gerrit] New patch to review for coreboot: e2ae7a8 arm/ti/am335x: 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/7189

-gerrit

commit e2ae7a83bf8ca9e3533d68db580661d61e1692c0
Author: Alexander Couzens <lynxis at fe80.eu>
Date:   Fri Oct 24 23:52:56 2014 +0200

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

diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig
index 1de871f..fae527d 100644
--- a/src/cpu/ti/am335x/Kconfig
+++ b/src/cpu/ti/am335x/Kconfig
@@ -5,19 +5,12 @@ config CPU_TI_AM335X
 	select HAVE_MONOTONIC_TIMER
 	select HAVE_UART_SPECIAL
 	select BOOTBLOCK_CONSOLE
+	select CPU_HAS_BOOTBLOCK_INIT
 	bool
 	default n
 
 if CPU_TI_AM335X
 
-config BOOTBLOCK_CPU_INIT
-	string
-	default "cpu/ti/am335x/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.
-
 config BOOTBLOCK_BASE
 	hex
 	default 0x402f0400
diff --git a/src/cpu/ti/am335x/Makefile.inc b/src/cpu/ti/am335x/Makefile.inc
index 032b1f4..24d2594 100644
--- a/src/cpu/ti/am335x/Makefile.inc
+++ b/src/cpu/ti/am335x/Makefile.inc
@@ -1,5 +1,6 @@
-bootblock-y	+= dmtimer.c
+bootblock-y	+= bootblock.c
 bootblock-y	+= bootblock_media.c
+bootblock-y	+= dmtimer.c
 bootblock-y	+= pinmux.c
 
 romstage-y	+= nand.c
diff --git a/src/cpu/ti/am335x/bootblock.c b/src/cpu/ti/am335x/bootblock.c
index e9434a1..04c9304 100644
--- a/src/cpu/ti/am335x/bootblock.c
+++ b/src/cpu/ti/am335x/bootblock.c
@@ -20,8 +20,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;