diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-12-03 07:30:26 +0200 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-12-14 14:08:57 +0000 |
commit | de640781020b10e72dd6a5cda26cab10932e94fe (patch) | |
tree | f3e43318b33a10918c906458e6b03b2a2194d7ee /src/cpu | |
parent | 91c47c0deac054d5b949d1bf1be7c0e7cbf7d545 (diff) |
bootblock: Provide some common prototypes
The split of bootblock initialisation to cpu, northbridge and
southbridge is not specific to intel at all, create new header
<arch/bootblock.h> as AMD will want some of these too.
Change-Id: I702cc6bad4afee4f61acf58b9155608b28eb417e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37429
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/cpu')
-rw-r--r-- | src/cpu/intel/car/bootblock.c | 2 | ||||
-rw-r--r-- | src/cpu/intel/car/bootblock.h | 21 | ||||
-rw-r--r-- | src/cpu/intel/haswell/bootblock.c | 2 | ||||
-rw-r--r-- | src/cpu/intel/model_206ax/bootblock.c | 2 |
4 files changed, 3 insertions, 24 deletions
diff --git a/src/cpu/intel/car/bootblock.c b/src/cpu/intel/car/bootblock.c index 664c2b5074..e60a65a7b2 100644 --- a/src/cpu/intel/car/bootblock.c +++ b/src/cpu/intel/car/bootblock.c @@ -12,7 +12,7 @@ */ #include <bootblock_common.h> -#include <cpu/intel/car/bootblock.h> +#include <arch/bootblock.h> #include <cpu/x86/bist.h> static uint32_t saved_bist; diff --git a/src/cpu/intel/car/bootblock.h b/src/cpu/intel/car/bootblock.h deleted file mode 100644 index 5adfd8711d..0000000000 --- a/src/cpu/intel/car/bootblock.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * 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. - */ - -#ifndef _CPU_INTEL_CAR_BOOTBLOCK_H -#define _CPU_INTEL_CAR_BOOTBLOCK_H - -void bootblock_early_cpu_init(void); -void bootblock_early_northbridge_init(void); -void bootblock_early_southbridge_init(void); - -#endif diff --git a/src/cpu/intel/haswell/bootblock.c b/src/cpu/intel/haswell/bootblock.c index 94e5d36e18..70a4682175 100644 --- a/src/cpu/intel/haswell/bootblock.c +++ b/src/cpu/intel/haswell/bootblock.c @@ -13,6 +13,7 @@ #include <stdint.h> #include <arch/cpu.h> +#include <arch/bootblock.h> #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> #include <arch/io.h> @@ -21,7 +22,6 @@ #include "haswell.h" #include <southbridge/intel/lynxpoint/pch.h> -#include <cpu/intel/car/bootblock.h> static void set_flex_ratio_to_tdp_nominal(void) { diff --git a/src/cpu/intel/model_206ax/bootblock.c b/src/cpu/intel/model_206ax/bootblock.c index da0333f4bc..a504480bca 100644 --- a/src/cpu/intel/model_206ax/bootblock.c +++ b/src/cpu/intel/model_206ax/bootblock.c @@ -12,11 +12,11 @@ */ #include <stdint.h> +#include <arch/bootblock.h> #include <arch/cpu.h> #include <cpu/x86/msr.h> #include <arch/io.h> #include <halt.h> -#include <cpu/intel/car/bootblock.h> #include "model_206ax.h" |