Alexander Couzens (lynxis@fe80.eu) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7188
-gerrit
commit 0e2419da59c79c4955eb59ec08d735b85312c76d Author: Alexander Couzens lynxis@fe80.eu Date: Fri Oct 24 23:53:23 2014 +0200
cubieboard: use new arm bootblock infrastructure
8b685398 change config flags for cpu and mainboard bootblock initialization.
Change-Id: I2a1019c2881bc7aada15322841204992d0106453 Signed-off-by: Alexander Couzens lynxis@fe80.eu --- src/mainboard/cubietech/cubieboard/Kconfig | 5 +---- src/mainboard/cubietech/cubieboard/Makefile.inc | 1 + src/mainboard/cubietech/cubieboard/bootblock.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/mainboard/cubietech/cubieboard/Kconfig b/src/mainboard/cubietech/cubieboard/Kconfig index c127329..68145c3 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 29763fb..9bd0173 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 9f6db93..360f914 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