arch/x86: Mark prepare_and_run_postcar noreturn

This moves the die() statement to a common place.

Change-Id: I24c9f00bfee169b4ca57b469c089188ec62ddada
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65812
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Arthur Heymans 2022-07-13 07:20:47 +02:00 committed by Felix Held
parent 84b2f9f5b8
commit efd2720e47
5 changed files with 3 additions and 5 deletions

View File

@ -43,7 +43,7 @@ void fill_postcar_frame(struct postcar_frame *pcf);
* prepare_and_run_postcar() determines the stack to use after * prepare_and_run_postcar() determines the stack to use after
* cache-as-ram is torn down as well as the MTRR settings to use. * cache-as-ram is torn down as well as the MTRR settings to use.
*/ */
void prepare_and_run_postcar(void); void __noreturn prepare_and_run_postcar(void);
/* /*
* Systems without a native coreboot cache-as-ram teardown may implement * Systems without a native coreboot cache-as-ram teardown may implement

View File

@ -63,7 +63,7 @@ static void run_postcar_phase(struct postcar_frame *pcf);
/* prepare_and_run_postcar() determines the stack to use after /* prepare_and_run_postcar() determines the stack to use after
* cache-as-ram is torn down as well as the MTRR settings to use. */ * cache-as-ram is torn down as well as the MTRR settings to use. */
void prepare_and_run_postcar(void) void __noreturn prepare_and_run_postcar(void)
{ {
struct postcar_frame pcf; struct postcar_frame pcf;
@ -76,6 +76,7 @@ void prepare_and_run_postcar(void)
run_postcar_phase(&pcf); run_postcar_phase(&pcf);
/* We do not return here. */ /* We do not return here. */
die("Failed to load postcar\n!");
} }
static void finalize_load(uintptr_t *reloc_params, uintptr_t mtrr_frame_ptr) static void finalize_load(uintptr_t *reloc_params, uintptr_t mtrr_frame_ptr)

View File

@ -54,5 +54,4 @@ void __noreturn romstage_main(void)
prepare_and_run_postcar(); prepare_and_run_postcar();
/* We do not return here. */ /* We do not return here. */
die("failed to load postcar\n");
} }

View File

@ -76,7 +76,6 @@ void __noreturn romstage_main(void)
prepare_and_run_postcar(); prepare_and_run_postcar();
/* We do not return. */ /* We do not return. */
die("failed to load postcar\n");
} }
static void ap_romstage_main(void) static void ap_romstage_main(void)

View File

@ -119,7 +119,6 @@ void __noreturn romstage_main(void)
post_code(0x44); post_code(0x44);
prepare_and_run_postcar(); prepare_and_run_postcar();
die("failed to load postcar\n");
} }
void fill_postcar_frame(struct postcar_frame *pcf) void fill_postcar_frame(struct postcar_frame *pcf)