diff options
| author | Julius Werner <jwerner@chromium.org> | 2015-10-09 13:37:58 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2015-11-11 05:08:07 +0100 |
| commit | 86fc11d0c9b799f916d69ced72dc8a26a07591a2 (patch) | |
| tree | 3a38637eac9dc376e29eeadd7e36e71935f0c211 /src/arch/mips | |
| parent | fe4cbf1167fcb27ec332a2efe16297705ca07359 (diff) | |
| download | coreboot-86fc11d0c9b799f916d69ced72dc8a26a07591a2.tar.xz | |
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 <jwerner@chromium.org>
Reviewed-on: http://review.coreboot.org/12076
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/arch/mips')
| -rw-r--r-- | src/arch/mips/Kconfig | 1 | ||||
| -rw-r--r-- | src/arch/mips/bootblock_simple.c | 2 | ||||
| -rw-r--r-- | src/arch/mips/include/arch/bootblock_common.h (renamed from src/arch/mips/include/bootblock_common.h) | 0 |
3 files changed, 2 insertions, 1 deletions
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 <bootblock_common.h> +#include <arch/bootblock_common.h> #include <console/console.h> #include <halt.h> #include <program_loading.h> diff --git a/src/arch/mips/include/bootblock_common.h b/src/arch/mips/include/arch/bootblock_common.h index f5c11ba9c5..f5c11ba9c5 100644 --- a/src/arch/mips/include/bootblock_common.h +++ b/src/arch/mips/include/arch/bootblock_common.h |