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:
@@ -96,21 +96,10 @@ void hardwaremain(int boot_complete)
|
||||
* write our configuration tables.
|
||||
*/
|
||||
lb_mem = write_tables();
|
||||
#if CONFIG_CBFS == 1
|
||||
# if CONFIG_USE_FALLBACK_IMAGE == 1
|
||||
#if CONFIG_USE_FALLBACK_IMAGE == 1
|
||||
cbfs_load_payload(lb_mem, "fallback/payload");
|
||||
# else
|
||||
#else
|
||||
cbfs_load_payload(lb_mem, "normal/payload");
|
||||
# endif
|
||||
#else
|
||||
|
||||
#if CONFIG_FS_PAYLOAD == 1
|
||||
#warning "CONFIG_FS_PAYLOAD is deprecated."
|
||||
filo(lb_mem);
|
||||
#else
|
||||
#warning "elfboot will soon be deprecated."
|
||||
elfboot(lb_mem);
|
||||
#endif
|
||||
#endif
|
||||
printk(BIOS_ERR, "Boot failed.\n");
|
||||
}
|
||||
|
Reference in New Issue
Block a user