summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2013-06-12 17:18:03 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-12-03 19:21:50 +0100
commita5adfed6e33c1cb43971f7fe3f5cfc90e4f42846 (patch)
treea368c94a91476c1669f0bd42d50989779fc3cda6
parent46957056c0cf56ff08b9c841bbde444cb51baacd (diff)
downloadcoreboot-a5adfed6e33c1cb43971f7fe3f5cfc90e4f42846.tar.xz
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> Reviewed-on: http://review.coreboot.org/4257 Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Tested-by: build bot (Jenkins)
-rw-r--r--src/mainboard/emulation/qemu-armv7/Kconfig4
-rw-r--r--src/mainboard/emulation/qemu-armv7/bootblock.c23
2 files changed, 0 insertions, 27 deletions
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig
index 9bee946730..e4327d6fa6 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 56546672c7..0000000000
--- 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__);
-}