diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-10-03 16:24:58 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-10-03 16:24:58 +0000 |
| commit | 6768f39a4b5a5d6d1c2318f632f801fe1c8084cd (patch) | |
| tree | 70ed41597c9cd4d19bec099a8ba403d48cdf4208 /src/boot/hardwaremain.c | |
| parent | 8f3ec7b1a3771a317c2415e2366fa719582f29d1 (diff) | |
| download | coreboot-6768f39a4b5a5d6d1c2318f632f801fe1c8084cd.tar.xz | |
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
Diffstat (limited to 'src/boot/hardwaremain.c')
| -rw-r--r-- | src/boot/hardwaremain.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index a0543401ed..5ab14fb09a 100644 --- a/src/boot/hardwaremain.c +++ b/src/boot/hardwaremain.c @@ -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 - 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 + cbfs_load_payload(lb_mem, "normal/payload"); #endif printk(BIOS_ERR, "Boot failed.\n"); } |