Alexander Couzens (lynxis@fe80.eu) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7190
-gerrit
commit 5716d0ebeadfd317d9e629098bd6ef96ea97b87a Author: Alexander Couzens lynxis@fe80.eu Date: Fri Oct 24 23:53:55 2014 +0200
beaglebone: use new arm bootblock infrastructure
8b685398 change config flags for cpu and mainboard bootblock initialization.
Change-Id: Ifac4a18a2e380c3472f51aaa7cc7842b01a2553e Signed-off-by: Alexander Couzens lynxis@fe80.eu --- src/mainboard/ti/beaglebone/Kconfig | 5 +---- src/mainboard/ti/beaglebone/Makefile.inc | 1 + src/mainboard/ti/beaglebone/bootblock.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig index fd465fa..57ed9bc 100644 --- a/src/mainboard/ti/beaglebone/Kconfig +++ b/src/mainboard/ti/beaglebone/Kconfig @@ -23,6 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select CPU_TI_AM335X select BOARD_ROMSIZE_KB_4096 + select MAINBOARD_HAS_BOOTBLOCK_INIT
config MAINBOARD_DIR string @@ -40,10 +41,6 @@ config MAINBOARD_VENDOR string default "TI"
-config BOOTBLOCK_MAINBOARD_INIT - string - default "mainboard/ti/beaglebone/bootblock.c" - config DRAM_SIZE_MB int default 256 diff --git a/src/mainboard/ti/beaglebone/Makefile.inc b/src/mainboard/ti/beaglebone/Makefile.inc index c76cb37..71d749d 100644 --- a/src/mainboard/ti/beaglebone/Makefile.inc +++ b/src/mainboard/ti/beaglebone/Makefile.inc @@ -17,6 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ##
+bootblock-y += bootblock.c romstage-y += romstage.c
#ramstage-y += ramstage.c diff --git a/src/mainboard/ti/beaglebone/bootblock.c b/src/mainboard/ti/beaglebone/bootblock.c index 6cc7a8c..2b22227 100644 --- a/src/mainboard/ti/beaglebone/bootblock.c +++ b/src/mainboard/ti/beaglebone/bootblock.c @@ -19,11 +19,11 @@
#include <arch/io.h> #include <types.h> +#include <bootblock_common.h> #include <console/uart.h> #include <console/console.h> #include <cpu/ti/am335x/pinmux.h>
-void bootblock_mainboard_init(void); void bootblock_mainboard_init(void) { void *uart_clock_ctrl = NULL;