From 9b79731dd4e6f27cd7cec53e06237f723225449b Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Fri, 24 Oct 2014 23:34:39 +0200 Subject: arm/allwinner/a10: use new arm bootblock infrastructure commit 8b685398 (ARM: Overhaul the ARM Makefile.) changes config flags for cpu and mainboard bootblock initialization. Tested on a20/cubieboard2. Change-Id: I753aa60ff66de9a3352a3a0759e4d0be9d8ae1c7 Signed-off-by: Alexander Couzens Reviewed-on: http://review.coreboot.org/7187 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Alexandru Gagniuc --- 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 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 #include +#include -void bootblock_cpu_init(void); void bootblock_cpu_init(void) { uint32_t sctlr; -- cgit v1.2.3