diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2014-10-24 23:53:55 +0200 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2014-12-19 19:37:37 +0100 |
| commit | 69b4e3f85747aa949802beb83f033062af8dcfa9 (patch) | |
| tree | b25ccff4e2e256a5eb25ddea17823c558a017fb2 | |
| parent | 8c53b751f53b88978864130e9b0f508faf986837 (diff) | |
beaglebone: use new arm bootblock infrastructure
8b685398 change config flags for cpu and mainboard
bootblock initialization.
Tested on beaglebone black.
Change-Id: Ifac4a18a2e380c3472f51aaa7cc7842b01a2553e
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
Reviewed-on: http://review.coreboot.org/7190
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
| -rw-r--r-- | src/mainboard/ti/beaglebone/Kconfig | 5 | ||||
| -rw-r--r-- | src/mainboard/ti/beaglebone/Makefile.inc | 1 | ||||
| -rw-r--r-- | 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 fd465fa8b1..57ed9bcf4d 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 c76cb3772a..71d749df2b 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 6cc7a8c25d..2b22227fb2 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; |