diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-04-30 07:07:22 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-04-30 07:07:22 +0000 |
| commit | 12aba82e55c02470ed80b7682efa8b4e8f702bc1 (patch) | |
| tree | f48156a0a625fdd9d7358e6a172a5cdb343ca9a7 /src/boot | |
| parent | a43ee75d9a7dc859292b186f22ac0550f149a0a3 (diff) | |
Refactor copy_and_run so that it uses a single code base instead of
3 (with one of them way too much assembler code).
On the way, I had to make some changes to the way the code is built,
which is an effort I want to expand over time.
Right now, large portions of the in-ROM part of coreboot is compiled as
a single file, with lots of .c files including other .c files.
That has its justification for pre-raminit code, but it also affects
lots of post-raminit code (memcpy doesn't really make sense before
raminit, or at least CAR)
The coreboot_apc code (AMD boards) gained some .c includes because I
don't know that part of the code enough to really rework it and only
have limited possibilities to test it. The includes should give an
identical situation for this part of the code.
This change was posted as set of 6 patches to the list, but they
were mostly split for review purposes, hence commit them all at once.
They can still be backed up using the patch files, if necessary.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4233 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/Config.lb | 3 | ||||
| -rw-r--r-- | src/boot/hardwaremain.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/boot/Config.lb b/src/boot/Config.lb index f9206bd3aa..700f19d917 100644 --- a/src/boot/Config.lb +++ b/src/boot/Config.lb @@ -1,7 +1,8 @@ -object elfboot.o object hardwaremain.o if CONFIG_CBFS object selfboot.o +else + object elfboot.o end if CONFIG_FS_PAYLOAD object filo.o diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index c22754fe28..d6e88de374 100644 --- a/src/boot/hardwaremain.c +++ b/src/boot/hardwaremain.c @@ -103,7 +103,7 @@ void hardwaremain(int boot_complete) # else void (*pl)(void) = cbfs_load_payload(lb_mem, "normal/payload"); # endif -#endif +#else #if CONFIG_FS_PAYLOAD == 1 #warning "CONFIG_FS_PAYLOAD is deprecated." @@ -112,6 +112,7 @@ void hardwaremain(int boot_complete) #warning "elfboot will soon be deprecated." elfboot(lb_mem); #endif +#endif printk_err("Boot failed.\n"); } |