summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2014-10-24 23:53:23 +0200
committerPatrick Georgi <pgeorgi@google.com>2014-12-02 14:18:35 +0100
commit890073915fa6c6a3672e64590b2edffce7331b65 (patch)
tree94a1a88f548170e784afc6585504e6e6dcb561b8 /src
parent9b79731dd4e6f27cd7cec53e06237f723225449b (diff)
cubieboard: use new arm bootblock infrastructure
commit 8b685398 (ARM: Overhaul the ARM Makefile.) change config flags for cpu and mainboard bootblock initialization. Tested on a20/cubieboard2. Change-Id: I2a1019c2881bc7aada15322841204992d0106453 Signed-off-by: Alexander Couzens <lynxis@fe80.eu> Reviewed-on: http://review.coreboot.org/7188 Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com> Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/cubietech/cubieboard/Kconfig5
-rw-r--r--src/mainboard/cubietech/cubieboard/Makefile.inc1
-rw-r--r--src/mainboard/cubietech/cubieboard/bootblock.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/src/mainboard/cubietech/cubieboard/Kconfig b/src/mainboard/cubietech/cubieboard/Kconfig
index c12732959c..68145c39d7 100644
--- a/src/mainboard/cubietech/cubieboard/Kconfig
+++ b/src/mainboard/cubietech/cubieboard/Kconfig
@@ -5,6 +5,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select CPU_ALLWINNER_A10
select BOARD_ROMSIZE_KB_4096
select DRIVER_XPOWERS_AXP209
+ select MAINBOARD_HAS_BOOTBLOCK_INIT
config MAINBOARD_DIR
string
@@ -18,10 +19,6 @@ config MAX_CPUS
int
default 1
-config BOOTBLOCK_MAINBOARD_INIT
- string
- default "mainboard/cubietech/cubieboard/bootblock.c"
-
config DRAM_SIZE_MB
int
default 1024
diff --git a/src/mainboard/cubietech/cubieboard/Makefile.inc b/src/mainboard/cubietech/cubieboard/Makefile.inc
index 29763fb4f6..9bd017393c 100644
--- a/src/mainboard/cubietech/cubieboard/Makefile.inc
+++ b/src/mainboard/cubietech/cubieboard/Makefile.inc
@@ -1 +1,2 @@
+bootblock-y += bootblock.c
romstage-y += romstage.c
diff --git a/src/mainboard/cubietech/cubieboard/bootblock.c b/src/mainboard/cubietech/cubieboard/bootblock.c
index 9f6db93fdd..360f914aa7 100644
--- a/src/mainboard/cubietech/cubieboard/bootblock.c
+++ b/src/mainboard/cubietech/cubieboard/bootblock.c
@@ -7,6 +7,7 @@
*/
#include <arch/io.h>
+#include <bootblock_common.h>
#include <console/uart.h>
#include <console/console.h>
#include <delay.h>
@@ -126,7 +127,6 @@ static void cubieboard_raminit(void)
////ram_check((u32)test_base, (u32)test_base + 0x1000);
}
-void bootblock_mainboard_init(void);
void bootblock_mainboard_init(void)
{
/* A10 Timer init uses the 24MHz clock, not PLLs, so we can init it very