From a5adfed6e33c1cb43971f7fe3f5cfc90e4f42846 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 12 Jun 2013 17:18:03 -0700 Subject: [PATCH] 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 Change-Id: I96cab5e406132a9f7dc30d48ff99f524773a1a14 Reviewed-on: https://gerrit.chromium.org/gerrit/58473 Reviewed-by: Stefan Reinauer Tested-by: Stefan Reinauer Commit-Queue: Stefan Reinauer Reviewed-on: http://review.coreboot.org/4257 Reviewed-by: Ronald G. Minnich Tested-by: build bot (Jenkins) --- src/mainboard/emulation/qemu-armv7/Kconfig | 4 ---- .../emulation/qemu-armv7/bootblock.c | 23 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 src/mainboard/emulation/qemu-armv7/bootblock.c 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 - -void bootblock_mainboard_init(void); -void bootblock_mainboard_init(void) -{ - console_init(); - printk(BIOS_INFO, "\n\n\n%s: ARMv7 Emulation Started.\n", __func__); -}