Move the CBFS payload setup to later in the boot.

Don't try to register payloads until after malloc has been setup.

diff --git a/src/coreboot.c b/src/coreboot.c
index c9ee0823e7e4043b1f77782c1b8136277113a8a7..f62753134e85e78267d50ab980e8b34ce0c6ed56 100644 (file)
--- a/src/coreboot.c
+++ b/src/coreboot.c
@@ -595,8 +595,8 @@ cbfs_run_payload(struct cbfs_file *file)
 }
 
 // Register payloads in "img/" directory with boot system.
-static void
-register_cbfs_payload(void)
+void
+cbfs_payload_setup(void)
 {
     struct cbfs_file *file = NULL;
     for (;;) {
@@ -614,5 +614,4 @@ coreboot_setup(void)
 {
     coreboot_fill_map();
     cbfs_setup();
-    register_cbfs_payload();
 }

diff --git a/src/post.c b/src/post.c
index ff6813cd0c44505e9eefdda5faf6cf9dbdcaf3c7..efcfc85df39d8a683d9fb3ed648d482809b96861 100644 (file)
--- a/src/post.c
+++ b/src/post.c
@@ -180,6 +180,7 @@ init_hw(void)
     floppy_setup();
     ata_setup();
     ahci_setup();
+    cbfs_payload_setup();
     ramdisk_setup();
     virtio_blk_setup();
 }

diff --git a/src/util.h b/src/util.h
index 17fc54a5eed54872a9bef6069525748141078f0a..2160b37e38537cd099bbea204f2707bde97f73ae 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -402,6 +402,7 @@ const char *cbfs_filename(struct cbfs_file *file);
 int cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen);
 void cbfs_run_payload(struct cbfs_file *file);
 void coreboot_copy_biostable(void);
+void cbfs_payload_setup(void);
 void coreboot_setup(void);
 
 // vgahooks.c