Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4257
-gerrit
commit c2e15bae2d1bb88896c08af00e350b5b9d429b51 Author: Stefan Reinauer reinauer@chromium.org Date: Wed Jun 12 17:18:03 2013 -0700
qemu-armv7: Drop additional console_init()
It's done in bootblock_simple.c just after returning from the mainboard specific bootblock function.
Signed-off-by: Stefan Reinauer reinauer@google.com
Change-Id: I96cab5e406132a9f7dc30d48ff99f524773a1a14 Reviewed-on: https://gerrit.chromium.org/gerrit/58473 Reviewed-by: Stefan Reinauer reinauer@chromium.org Tested-by: Stefan Reinauer reinauer@chromium.org Commit-Queue: Stefan Reinauer reinauer@chromium.org --- src/mainboard/emulation/qemu-armv7/Kconfig | 4 ---- src/mainboard/emulation/qemu-armv7/bootblock.c | 23 ----------------------- 2 files changed, 27 deletions(-)
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig index 9bee946..e4327d6 100644 --- a/src/mainboard/emulation/qemu-armv7/Kconfig +++ b/src/mainboard/emulation/qemu-armv7/Kconfig @@ -45,10 +45,6 @@ config MAINBOARD_VENDOR string default "ARM Ltd."
-config BOOTBLOCK_MAINBOARD_INIT - string - default "mainboard/emulation/qemu-armv7/bootblock.c" - config DRAM_SIZE_MB int default 1024 diff --git a/src/mainboard/emulation/qemu-armv7/bootblock.c b/src/mainboard/emulation/qemu-armv7/bootblock.c deleted file mode 100644 index 5654667..0000000 --- a/src/mainboard/emulation/qemu-armv7/bootblock.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2013 Google, Inc. - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <console/console.h> - -void bootblock_mainboard_init(void); -void bootblock_mainboard_init(void) -{ - console_init(); - printk(BIOS_INFO, "\n\n\n%s: ARMv7 Emulation Started.\n", __func__); -}