diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-04-03 12:52:43 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-04-03 12:52:43 +0000 |
| commit | aed1f925a65a231ed008902f1946b3680227f098 (patch) | |
| tree | 26f108d9094c9f31ad41ba507d9740b8e23df881 /src | |
| parent | 73ad3264525c7d076ef2aafab63841685bf53679 (diff) | |
the attached patch is the last infrastructure change necessary for
romfs.
Everything else to make a target romfs aware happens in the targets.
What the patch does:
1. missing romfs.h include
2. special handling while creating coreboot.rom
While the romfs code path in the makefile doesn't actually use the file,
it's possible that the build of coreboot.rom fails in a romfs setup,
because the individual buildrom image is too small to host both coreboot
and payloads (as the payloads aren't supposed to be there). Thus, a
special case to replace the payload with /dev/null in case of a romfs
build.
There would be cleaner ways, but they're not easily encoded in the
Config.lb format.
3. config.g is changed to create rules for a romfs build
Targets should still build (they do for me)
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4049 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/i386/Config.lb | 4 | ||||
| -rw-r--r-- | src/boot/hardwaremain.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/arch/i386/Config.lb b/src/arch/i386/Config.lb index ec1dd1ee0d..4c0241d69c 100644 --- a/src/arch/i386/Config.lb +++ b/src/arch/i386/Config.lb @@ -79,8 +79,8 @@ if USE_FAILOVER_IMAGE end else makerule coreboot.rom - depends "coreboot.strip buildrom $(PAYLOAD-1)" - action "./buildrom $< $@ $(PAYLOAD-1) $(ROM_IMAGE_SIZE) $(ROM_SECTION_SIZE)" + depends "coreboot.strip buildrom $(PAYLOAD-1)" + action "PAYLOAD=$(PAYLOAD-1); if [ $(CONFIG_ROMFS) -eq 1 ]; then PAYLOAD=/dev/null; fi; ./buildrom $< $@ $$PAYLOAD $(ROM_IMAGE_SIZE) $(ROM_SECTION_SIZE)" end end diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index bf2853a4b9..74f3dfcd97 100644 --- a/src/boot/hardwaremain.c +++ b/src/boot/hardwaremain.c @@ -36,6 +36,7 @@ it with the version available from LANL. #include <part/hard_reset.h> #include <part/init_timer.h> #include <boot/elf.h> +#include <romfs.h> /** * @brief Main function of the DRAM part of coreboot. |