Remove:
- CONFIG_CBFS - anything that's conditional on CONFIG_CBFS == 0 - files that were only included for CONFIG_CBFS == 0 In particular: - elfboot - stream boot code - mini-filo and filesystems (depends on stream boot code) After this commit, there is no way to build an image that is not using CBFS anymore. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Myles Watson <mylesgw@gmail.com> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4712 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
@ -2,7 +2,6 @@
|
||||
(Written by Patrick Georgi <patrick.georgi@coresystems.de> for coresystems GmbH
|
||||
*/
|
||||
|
||||
#if CONFIG_CBFS == 1
|
||||
void cbfs_and_run_core(char*, unsigned ebp);
|
||||
|
||||
static void copy_and_run(unsigned cpu_reset)
|
||||
@ -10,32 +9,9 @@ static void copy_and_run(unsigned cpu_reset)
|
||||
if (cpu_reset == 1) cpu_reset = -1;
|
||||
else cpu_reset = 0;
|
||||
|
||||
# if CONFIG_USE_FALLBACK_IMAGE == 1
|
||||
#if CONFIG_USE_FALLBACK_IMAGE == 1
|
||||
cbfs_and_run_core("fallback/coreboot_ram", cpu_reset);
|
||||
# else
|
||||
cbfs_and_run_core("normal/coreboot_ram", cpu_reset);
|
||||
# endif
|
||||
}
|
||||
|
||||
#else
|
||||
void copy_and_run_core(u8 *src, u8 *dst, unsigned long ilen, unsigned ebp);
|
||||
|
||||
extern u8 _liseg, _iseg, _eiseg;
|
||||
|
||||
static void copy_and_run(unsigned cpu_reset)
|
||||
{
|
||||
uint8_t *src, *dst;
|
||||
unsigned long ilen;
|
||||
|
||||
|
||||
src = &_liseg;
|
||||
dst = &_iseg;
|
||||
ilen = &_eiseg - dst;
|
||||
|
||||
if (cpu_reset == 1) cpu_reset = -1;
|
||||
else cpu_reset = 0;
|
||||
|
||||
copy_and_run_core(src, dst, ilen, cpu_reset);
|
||||
}
|
||||
cbfs_and_run_core("normal/coreboot_ram", cpu_reset);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user