diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2013-03-22 19:48:39 -0500 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-03-23 19:36:49 +0100 |
| commit | c875e2aaabb1226b0ecbf98df6112ef8ce28dd41 (patch) | |
| tree | 63709d7a10c8546610f047c907d1e72c24d85d2e | |
| parent | 1989b4bd560045b524fad2f5d189907e4a8abe26 (diff) | |
| download | coreboot-c875e2aaabb1226b0ecbf98df6112ef8ce28dd41.tar.xz | |
vboot module: fix compilation issues
There were 3 things stopping the vboot module from being
compiled:
1. The vboot_reference code removed in the firmware/arch/$(ARCH)/include
directory. This caused romcc to fail because romcc fails if -I<dir>
points to non-existent directory.
2. The rmodule API does not have the no-clearing-of-bss variant of the
load function.
3. cbfs API changes.
Change-Id: I1e1296c71c5831d56fc9acfaa578c84a948b4ced
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/2881
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | src/vendorcode/google/chromeos/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/vboot_loader.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index abcd429297..230523c968 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -41,7 +41,6 @@ VB_SOURCE := vboot_reference # Add the vboot include paths. VB_INCLUDES += -I$(VB_SOURCE)/firmware/include -VB_INCLUDES += -I$(VB_SOURCE)/firmware/arch/$(VB_FIRMWARE_ARCH)/include INCLUDES += $(VB_INCLUDES) VBOOT_STUB_ELF = $(obj)/vendorcode/google/chromeos/vbootstub.elf @@ -57,7 +56,6 @@ VBOOT_STUB_DEPS += $(VB_LIB) # vboot_reference can get to coreboot's include files. VBOOT_CFLAGS += $(patsubst -I%,-I../%,$(filter-out -include $(src)/include/kconfig.h, $(CFLAGS))) VBOOT_CFLAGS += -DVBOOT_DEBUG -$(warning $(VBOOT_CFLAGS)) $(VBOOT_STUB_DOTO): $(VBOOT_STUB_DEPS) $(CC) $(LDFLAGS) -nostdlib -r -o $@ $^ diff --git a/src/vendorcode/google/chromeos/vboot_loader.c b/src/vendorcode/google/chromeos/vboot_loader.c index a1a4586d5c..10fa52d698 100644 --- a/src/vendorcode/google/chromeos/vboot_loader.c +++ b/src/vendorcode/google/chromeos/vboot_loader.c @@ -46,7 +46,9 @@ static void vboot_run_stub(struct vboot_context *context) char *vboot_region; void (*entry)(struct vboot_context *context); - stage = cbfs_find_file(CONFIG_CBFS_PREFIX "/vboot", CBFS_TYPE_STAGE); + stage = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, + CONFIG_CBFS_PREFIX "/vboot", + CBFS_TYPE_STAGE); if (stage == NULL) return; @@ -226,8 +228,7 @@ static void vboot_load_ramstage(struct vboot_handoff *vboot_handoff, if (rmodule_parse(&ramstage_region[rmodule_offset], &ramstage)) return; - /* The ramstage is responsible for clearing its own bss. */ - if (rmodule_load_no_clear_bss(&ramstage_region[load_offset], &ramstage)) + if (rmodule_load(&ramstage_region[load_offset], &ramstage)) return; entry_point = rmodule_entry(&ramstage); |