diff options
-rw-r--r-- | src/arch/x86/include/arch/romstage.h | 17 | ||||
-rw-r--r-- | src/arch/x86/postcar_loader.c | 6 |
2 files changed, 4 insertions, 19 deletions
diff --git a/src/arch/x86/include/arch/romstage.h b/src/arch/x86/include/arch/romstage.h index 7a2a41773b..5951766a3c 100644 --- a/src/arch/x86/include/arch/romstage.h +++ b/src/arch/x86/include/arch/romstage.h @@ -21,12 +21,6 @@ struct postcar_frame { }; /* - * Initialize postcar_frame object. - * Returns 0 on success, < 0 on error. - */ -int postcar_frame_init(struct postcar_frame *pcf); - -/* * Add variable MTRR covering the provided range with MTRR type. */ void postcar_frame_add_mtrr(struct postcar_frame *pcf, @@ -52,17 +46,6 @@ void fill_postcar_frame(struct postcar_frame *pcf); void prepare_and_run_postcar(struct postcar_frame *pcf); /* - * Load and run a program that takes control of execution that - * tears down CAR and loads ramstage. The postcar_frame object - * indicates how to set up the frame. If caching is enabled at - * the time of the call it is up to the platform code to handle - * coherency with dirty lines in the cache using some mechanism - * such as platform_prog_run() because run_postcar_phase() - * utilizes prog_run() internally. - */ -void run_postcar_phase(struct postcar_frame *pcf); - -/* * Systems without a native coreboot cache-as-ram teardown may implement * this to use an alternate method. */ diff --git a/src/arch/x86/postcar_loader.c b/src/arch/x86/postcar_loader.c index d46bf3c495..b5bfe3e6c9 100644 --- a/src/arch/x86/postcar_loader.c +++ b/src/arch/x86/postcar_loader.c @@ -19,7 +19,7 @@ static size_t var_mtrr_ctx_size(void) return sizeof(struct var_mtrr_context) + mtrr_count * 2 * sizeof(msr_t); } -int postcar_frame_init(struct postcar_frame *pcf) +static int postcar_frame_init(struct postcar_frame *pcf) { struct var_mtrr_context *ctx; @@ -57,6 +57,8 @@ static void postcar_frame_common_mtrrs(struct postcar_frame *pcf) postcar_frame_add_romcache(pcf, MTRR_TYPE_WRPROT); } +static void run_postcar_phase(struct postcar_frame *pcf); + /* prepare_and_run_postcar() determines the stack to use after * cache-as-ram is torn down as well as the MTRR settings to use. */ void prepare_and_run_postcar(struct postcar_frame *pcf) @@ -129,7 +131,7 @@ static void postcar_cache_invalid(void) board_reset(); } -void run_postcar_phase(struct postcar_frame *pcf) +static void run_postcar_phase(struct postcar_frame *pcf) { struct prog prog = PROG_INIT(PROG_POSTCAR, CONFIG_CBFS_PREFIX "/postcar"); |