From 86fc11d0c9b799f916d69ced72dc8a26a07591a2 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 9 Oct 2015 13:37:58 -0700 Subject: arm/arm64: Generalize bootblock C entry point When we first added ARM support to coreboot, it was clear that the bootblock would need to do vastly different tasks than on x86, so we moved its main logic under arch/. Now that we have several more architectures, it turns out (as with so many things lately) that x86 is really the odd one out, and all the others are trying to do pretty much the same thing. This has already caused maintenance issues as the ARM32 bootblock developed and less-mature architectures were left behind with old cruft. This patch tries to address that problem by centralizing that logic under lib/ for use by all architectures/SoCs that don't explicitly opt-out (with the slightly adapted existing BOOTBLOCK_CUSTOM option). This works great out of the box for ARM32 and ARM64. It could probably be easily applied to MIPS and RISCV as well, but I don't have any of those boards to test so I'll mark them as BOOTBLOCK_CUSTOM for now and leave that for later cleanup. BRANCH=None BUG=None TEST=Built Jerry and Falco, booted Oak. Change-Id: Ibbf727ad93651e388aef20e76f03f5567f9860cb Signed-off-by: Julius Werner Reviewed-on: http://review.coreboot.org/12076 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/arch/mips/Kconfig | 1 + src/arch/mips/bootblock_simple.c | 2 +- src/arch/mips/include/arch/bootblock_common.h | 26 ++++++++++++++++++++++++++ src/arch/mips/include/bootblock_common.h | 26 -------------------------- 4 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 src/arch/mips/include/arch/bootblock_common.h delete mode 100644 src/arch/mips/include/bootblock_common.h (limited to 'src/arch/mips') diff --git a/src/arch/mips/Kconfig b/src/arch/mips/Kconfig index b67fa29584..d0489ace4b 100644 --- a/src/arch/mips/Kconfig +++ b/src/arch/mips/Kconfig @@ -22,6 +22,7 @@ config ARCH_BOOTBLOCK_MIPS bool default n select ARCH_MIPS + select BOOTBLOCK_CUSTOM config ARCH_VERSTAGE_MIPS bool diff --git a/src/arch/mips/bootblock_simple.c b/src/arch/mips/bootblock_simple.c index c37e40ce7f..c3bd82dbee 100644 --- a/src/arch/mips/bootblock_simple.c +++ b/src/arch/mips/bootblock_simple.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. */ -#include +#include #include #include #include diff --git a/src/arch/mips/include/arch/bootblock_common.h b/src/arch/mips/include/arch/bootblock_common.h new file mode 100644 index 0000000000..f5c11ba9c5 --- /dev/null +++ b/src/arch/mips/include/arch/bootblock_common.h @@ -0,0 +1,26 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Imagination Technologies + * + * 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. + */ + +#ifdef CONFIG_BOOTBLOCK_CPU_INIT +#include CONFIG_BOOTBLOCK_CPU_INIT +#endif + +#ifdef CONFIG_BOOTBLOCK_MAINBOARD_INIT +#include CONFIG_BOOTBLOCK_MAINBOARD_INIT +#else +static void bootblock_mainboard_init(void) +{ +} +#endif diff --git a/src/arch/mips/include/bootblock_common.h b/src/arch/mips/include/bootblock_common.h deleted file mode 100644 index f5c11ba9c5..0000000000 --- a/src/arch/mips/include/bootblock_common.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Imagination Technologies - * - * 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. - */ - -#ifdef CONFIG_BOOTBLOCK_CPU_INIT -#include CONFIG_BOOTBLOCK_CPU_INIT -#endif - -#ifdef CONFIG_BOOTBLOCK_MAINBOARD_INIT -#include CONFIG_BOOTBLOCK_MAINBOARD_INIT -#else -static void bootblock_mainboard_init(void) -{ -} -#endif -- cgit v1.2.3