Allow building images with different prefixes (ie. normal/romstage,
helloWorld/romstage, ...). It defaults to fallback/, so there's no user visible change now. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5102 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
@ -7,21 +7,13 @@ void cbfs_and_run_core(const char*, unsigned ebp);
|
||||
|
||||
static void copy_and_run(void)
|
||||
{
|
||||
#if CONFIG_USE_FALLBACK_IMAGE == 1
|
||||
cbfs_and_run_core("fallback/coreboot_ram", 0);
|
||||
#else
|
||||
cbfs_and_run_core("normal/coreboot_ram", 0);
|
||||
#endif
|
||||
cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram", 0);
|
||||
}
|
||||
|
||||
#if CONFIG_AP_CODE_IN_CAR == 1
|
||||
|
||||
static void copy_and_run_ap_code_in_car(unsigned ret_addr)
|
||||
{
|
||||
# if CONFIG_USE_FALLBACK_IMAGE == 1
|
||||
cbfs_and_run_core("fallback/coreboot_apc", ret_addr);
|
||||
# else
|
||||
cbfs_and_run_core("normal/coreboot_apc", ret_addr);
|
||||
# endif
|
||||
cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_apc", ret_addr);
|
||||
}
|
||||
#endif
|
||||
|
@ -278,8 +278,5 @@ str_pre_main: .string "Jumping to coreboot.\r\n"
|
||||
.previous
|
||||
|
||||
#endif /* ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG */
|
||||
#if CONFIG_USE_FALLBACK_IMAGE == 1
|
||||
str_coreboot_ram_name: .string "fallback/coreboot_ram"
|
||||
#else
|
||||
str_coreboot_ram_name: .string "normal/coreboot_ram"
|
||||
#endif
|
||||
str_coreboot_ram_name: .ascii CONFIG_CBFS_PREFIX
|
||||
.string "/coreboot_ram"
|
||||
|
Reference in New Issue
Block a user