diff options
Diffstat (limited to 'src/arch/riscv')
| -rw-r--r-- | src/arch/riscv/Kconfig | 7 | ||||
| -rw-r--r-- | src/arch/riscv/bootblock_simple.c | 1 | ||||
| -rw-r--r-- | src/arch/riscv/include/bootblock_common.h | 16 |
3 files changed, 1 insertions, 23 deletions
diff --git a/src/arch/riscv/Kconfig b/src/arch/riscv/Kconfig index 9618c63577..1849335386 100644 --- a/src/arch/riscv/Kconfig +++ b/src/arch/riscv/Kconfig @@ -6,6 +6,7 @@ config ARCH_BOOTBLOCK_RISCV bool default n select ARCH_RISCV + select BOOTBLOCK_CUSTOM config ARCH_VERSTAGE_RISCV bool @@ -18,9 +19,3 @@ config ARCH_ROMSTAGE_RISCV config ARCH_RAMSTAGE_RISCV bool default n - -# If a custom bootblock is necessary, this option should be "select"-ed by -# the thing that needs it, probably the CPU. -config RISCV_BOOTBLOCK_CUSTOM - bool - default n diff --git a/src/arch/riscv/bootblock_simple.c b/src/arch/riscv/bootblock_simple.c index 3214035bc3..db45ab202a 100644 --- a/src/arch/riscv/bootblock_simple.c +++ b/src/arch/riscv/bootblock_simple.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <bootblock_common.h> #include <arch/cache.h> #include <arch/hlt.h> #include <arch/stages.h> diff --git a/src/arch/riscv/include/bootblock_common.h b/src/arch/riscv/include/bootblock_common.h deleted file mode 100644 index fe2c982dec..0000000000 --- a/src/arch/riscv/include/bootblock_common.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifdef CONFIG_BOOTBLOCK_CPU_INIT -#include CONFIG_BOOTBLOCK_CPU_INIT -#endif - -// I'm disappointed that we let this kind of thing creep in. -// we null out functions with this kind of stuff, AND weak symbols, -// AND empty cpp function defines. What's next? Ouija boards? -#if 0 -#ifdef CONFIG_BOOTBLOCK_MAINBOARD_INIT -#include CONFIG_BOOTBLOCK_MAINBOARD_INIT -#else -static void bootblock_mainboard_init(void) -{ -} -#endif -#endif |