summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2014-10-24 23:52:56 +0200
committerStefan Reinauer <stefan.reinauer@coreboot.org>2014-12-19 19:37:14 +0100
commit8c53b751f53b88978864130e9b0f508faf986837 (patch)
tree9aead61c31fd2180c5a07688c9fecb1f5212b210
parent450335918c86cea87e53a43aa1b6658a4f273240 (diff)
downloadcoreboot-8c53b751f53b88978864130e9b0f508faf986837.tar.xz
arm/ti/am335x: use new arm bootblock infrastructure
commit 8b685398 (ARM: Overhaul the ARM Makefile.) changes config flags for cpu and mainboard bootblock initialization. Tested on beaglebone black. Change-Id: I70cbe3abad8443c5dc71c8ba76a35973a5284477 Signed-off-by: Alexander Couzens <lynxis@fe80.eu> Reviewed-on: http://review.coreboot.org/7189 Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com>
-rw-r--r--src/cpu/ti/am335x/Kconfig9
-rw-r--r--src/cpu/ti/am335x/Makefile.inc3
-rw-r--r--src/cpu/ti/am335x/bootblock.c2
3 files changed, 4 insertions, 10 deletions
diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig
index 1de871f11d..fae527d426 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 032b1f41c6..24d259420d 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 e9434a1fae..04c930426f 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;