diff options
| -rw-r--r-- | src/arch/riscv/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-riscv/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-riscv/bootblock.c | 31 | ||||
| -rw-r--r-- | src/mainboard/emulation/spike-riscv/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/mainboard/emulation/spike-riscv/bootblock.c | 30 |
5 files changed, 0 insertions, 64 deletions
diff --git a/src/arch/riscv/Kconfig b/src/arch/riscv/Kconfig index 9a35cf29ff..a30cb7091b 100644 --- a/src/arch/riscv/Kconfig +++ b/src/arch/riscv/Kconfig @@ -6,7 +6,6 @@ config ARCH_BOOTBLOCK_RISCV bool default n select ARCH_RISCV - select BOOTBLOCK_CUSTOM select C_ENVIRONMENT_BOOTBLOCK config ARCH_VERSTAGE_RISCV diff --git a/src/mainboard/emulation/qemu-riscv/Makefile.inc b/src/mainboard/emulation/qemu-riscv/Makefile.inc index b8a62f79a6..4fbe401944 100644 --- a/src/mainboard/emulation/qemu-riscv/Makefile.inc +++ b/src/mainboard/emulation/qemu-riscv/Makefile.inc @@ -12,7 +12,6 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -bootblock-y += bootblock.c bootblock-y += uart.c bootblock-y += qemu_util.c bootblock-y += rom_media.c diff --git a/src/mainboard/emulation/qemu-riscv/bootblock.c b/src/mainboard/emulation/qemu-riscv/bootblock.c deleted file mode 100644 index 3e886209a4..0000000000 --- a/src/mainboard/emulation/qemu-riscv/bootblock.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2013 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * 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 <arch/exception.h> -#include <bootblock_common.h> -#include <console/console.h> -#include <program_loading.h> - -// the qemu part of all this is very, very non-hardware like. -// so it gets its own bootblock. -void main(void) -{ - if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) { - console_init(); - exception_init(); - } - - run_romstage(); -} diff --git a/src/mainboard/emulation/spike-riscv/Makefile.inc b/src/mainboard/emulation/spike-riscv/Makefile.inc index 91c136924e..e3c9481599 100644 --- a/src/mainboard/emulation/spike-riscv/Makefile.inc +++ b/src/mainboard/emulation/spike-riscv/Makefile.inc @@ -12,7 +12,6 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -bootblock-y += bootblock.c bootblock-y += uart.c bootblock-y += spike_util.c bootblock-y += rom_media.c diff --git a/src/mainboard/emulation/spike-riscv/bootblock.c b/src/mainboard/emulation/spike-riscv/bootblock.c deleted file mode 100644 index 40a7de1510..0000000000 --- a/src/mainboard/emulation/spike-riscv/bootblock.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2013 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * 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 <arch/exception.h> -#include <bootblock_common.h> -#include <console/console.h> -#include <program_loading.h> - -// the qemu part of all this is very, very non-hardware like. -// so it gets its own bootblock. -void main(void) -{ - if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) { - console_init(); - exception_init(); - } - run_romstage(); -} |